From d146290c53311124162dbc68a332cf2d9e8612bd Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 8 Aug 2001 07:42:21 +0000 Subject: [PATCH] gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't fail if iter is NULL. (#58347) --- ChangeLog | 7 ++++++- ChangeLog.pre-2-0 | 7 ++++++- ChangeLog.pre-2-10 | 7 ++++++- ChangeLog.pre-2-2 | 7 ++++++- ChangeLog.pre-2-4 | 7 ++++++- ChangeLog.pre-2-6 | 7 ++++++- ChangeLog.pre-2-8 | 7 ++++++- gtk/gtktreestore.c | 3 +-- 8 files changed, 43 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index b6864c0155..8081f8a585 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ -2001-08-07 +2001-08-08 Matthias Clasen + + * gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't + fail if iter is NULL. (#58347) + +2001-08-07 Matthias Clasen * gtk/gtktextdisplay.c (render_para, gtk_text_layout_draw): Fix some off-by-one issues, fixing selection of line-ends. (#50323) diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index b6864c0155..8081f8a585 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,4 +1,9 @@ -2001-08-07 +2001-08-08 Matthias Clasen + + * gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't + fail if iter is NULL. (#58347) + +2001-08-07 Matthias Clasen * gtk/gtktextdisplay.c (render_para, gtk_text_layout_draw): Fix some off-by-one issues, fixing selection of line-ends. (#50323) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b6864c0155..8081f8a585 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,4 +1,9 @@ -2001-08-07 +2001-08-08 Matthias Clasen + + * gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't + fail if iter is NULL. (#58347) + +2001-08-07 Matthias Clasen * gtk/gtktextdisplay.c (render_para, gtk_text_layout_draw): Fix some off-by-one issues, fixing selection of line-ends. (#50323) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b6864c0155..8081f8a585 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,4 +1,9 @@ -2001-08-07 +2001-08-08 Matthias Clasen + + * gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't + fail if iter is NULL. (#58347) + +2001-08-07 Matthias Clasen * gtk/gtktextdisplay.c (render_para, gtk_text_layout_draw): Fix some off-by-one issues, fixing selection of line-ends. (#50323) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b6864c0155..8081f8a585 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,4 +1,9 @@ -2001-08-07 +2001-08-08 Matthias Clasen + + * gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't + fail if iter is NULL. (#58347) + +2001-08-07 Matthias Clasen * gtk/gtktextdisplay.c (render_para, gtk_text_layout_draw): Fix some off-by-one issues, fixing selection of line-ends. (#50323) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b6864c0155..8081f8a585 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,4 +1,9 @@ -2001-08-07 +2001-08-08 Matthias Clasen + + * gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't + fail if iter is NULL. (#58347) + +2001-08-07 Matthias Clasen * gtk/gtktextdisplay.c (render_para, gtk_text_layout_draw): Fix some off-by-one issues, fixing selection of line-ends. (#50323) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b6864c0155..8081f8a585 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,4 +1,9 @@ -2001-08-07 +2001-08-08 Matthias Clasen + + * gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't + fail if iter is NULL. (#58347) + +2001-08-07 Matthias Clasen * gtk/gtktextdisplay.c (render_para, gtk_text_layout_draw): Fix some off-by-one issues, fixing selection of line-ends. (#50323) diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index 598391a819..a017a655e2 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -609,8 +609,7 @@ gtk_tree_store_iter_n_children (GtkTreeModel *tree_model, gint i = 0; g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), 0); - g_return_val_if_fail (iter != NULL, FALSE); - g_return_val_if_fail (iter->user_data != NULL, FALSE); + g_return_val_if_fail (iter == NULL || iter->user_data != NULL, FALSE); if (iter == NULL) node = G_NODE (GTK_TREE_STORE (tree_model)->root)->children;