diff options
| author | Johan Dahlin <zilch@src.gnome.org> | 2004-01-14 15:20:29 +0000 |
|---|---|---|
| committer | Johan Dahlin <zilch@src.gnome.org> | 2004-01-14 15:20:29 +0000 |
| commit | a058e5a9a2f79e6a8ae67fa374ac09a46e7ea157 (patch) | |
| tree | f198c8d74a50ce87a3ca6a4c4dc7a7262ccd98bf | |
| parent | 861711d17882656c62168a8db354e4bc2c8d18c0 (diff) | |
| download | pygtk-a058e5a9a2f79e6a8ae67fa374ac09a46e7ea157.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gtk/pygtktreemodel.c | 5 |
2 files changed, 7 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2004-01-14 Johan Dahlin <johan@gnome.org> + + * 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 <gustavo@users.sourceforge.net> * 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); |