From a058e5a9a2f79e6a8ae67fa374ac09a46e7ea157 Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Wed, 14 Jan 2004 15:20:29 +0000 Subject: Allow iter to be set to NULL, based on patch by Don Allingham Fixes bug * gtk/pygtktreemodel.c (pygtk_generic_tree_model_iter_n_children): Allow iter to be set to NULL, based on patch by Don Allingham Fixes bug 125172 --- ChangeLog | 6 ++++++ gtk/pygtktreemodel.c | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7fece355..f67689f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-01-14 Johan Dahlin + + * gtk/pygtktreemodel.c (pygtk_generic_tree_model_iter_n_children): + Allow iter to be set to NULL, based on patch by Don Allingham + Fixes bug 125172 + 2003-12-24 Gustavo J. A. M. Carneiro * pygtype.c (pyg_value_as_pyobject): Add special handling for diff --git a/gtk/pygtktreemodel.c b/gtk/pygtktreemodel.c index 99168e7f..e667b83a 100644 --- a/gtk/pygtktreemodel.c +++ b/gtk/pygtktreemodel.c @@ -547,7 +547,6 @@ pygtk_generic_tree_model_iter_n_children(GtkTreeModel *tree_model, GtkTreeIter * g_return_val_if_fail(tree_model != NULL, FALSE); g_return_val_if_fail(PYGTK_IS_GENERIC_TREE_MODEL(tree_model), FALSE); - g_return_val_if_fail(iter != NULL, FALSE); pyg_block_threads(); @@ -557,9 +556,7 @@ pygtk_generic_tree_model_iter_n_children(GtkTreeModel *tree_model, GtkTreeIter * #ifdef DEBUG_TREE_MODEL g_message("iter_n_children(%p)", iter); #endif - py_iter = (PyObject *)iter->user_data; - if (py_iter == NULL) - py_iter = Py_None; + py_iter = iter != NULL ? (PyObject *)iter->user_data : Py_None; py_ret = PyObject_CallMethod(self, METHOD_PREFIX "iter_n_children", "(O)", py_iter); -- cgit v1.2.1