From 66cefd1cc0d575072977c458a1a17b7ed037abdb Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Sun, 3 Nov 2002 20:12:00 +0000 Subject: [PATCH] Bah, and of course I broke something ... Sun Nov 3 21:26:20 2002 Kristian Rietveld Bah, and of course I broke something ... * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): fix up the mess I caused with my commit of Oct 23 fixing #50263, things should be fine now. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtktreeselection.c | 15 ++++++++------- 7 files changed, 56 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index f086b4a192..7b12733bba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sun Nov 3 21:26:20 2002 Kristian Rietveld + + Bah, and of course I broke something ... + + * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): fix + up the mess I caused with my commit of Oct 23 fixing #50263, things + should be fine now. + Sun Nov 3 13:03:29 2002 Owen Taylor * gtk/gtkfilesel.c configure.in: Remove check for diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f086b4a192..7b12733bba 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Sun Nov 3 21:26:20 2002 Kristian Rietveld + + Bah, and of course I broke something ... + + * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): fix + up the mess I caused with my commit of Oct 23 fixing #50263, things + should be fine now. + Sun Nov 3 13:03:29 2002 Owen Taylor * gtk/gtkfilesel.c configure.in: Remove check for diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f086b4a192..7b12733bba 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Sun Nov 3 21:26:20 2002 Kristian Rietveld + + Bah, and of course I broke something ... + + * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): fix + up the mess I caused with my commit of Oct 23 fixing #50263, things + should be fine now. + Sun Nov 3 13:03:29 2002 Owen Taylor * gtk/gtkfilesel.c configure.in: Remove check for diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f086b4a192..7b12733bba 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Sun Nov 3 21:26:20 2002 Kristian Rietveld + + Bah, and of course I broke something ... + + * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): fix + up the mess I caused with my commit of Oct 23 fixing #50263, things + should be fine now. + Sun Nov 3 13:03:29 2002 Owen Taylor * gtk/gtkfilesel.c configure.in: Remove check for diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f086b4a192..7b12733bba 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Sun Nov 3 21:26:20 2002 Kristian Rietveld + + Bah, and of course I broke something ... + + * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): fix + up the mess I caused with my commit of Oct 23 fixing #50263, things + should be fine now. + Sun Nov 3 13:03:29 2002 Owen Taylor * gtk/gtkfilesel.c configure.in: Remove check for diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f086b4a192..7b12733bba 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Sun Nov 3 21:26:20 2002 Kristian Rietveld + + Bah, and of course I broke something ... + + * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): fix + up the mess I caused with my commit of Oct 23 fixing #50263, things + should be fine now. + Sun Nov 3 13:03:29 2002 Owen Taylor * gtk/gtkfilesel.c configure.in: Remove check for diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c index b6b6adac80..d0239b5891 100644 --- a/gtk/gtktreeselection.c +++ b/gtk/gtktreeselection.c @@ -610,7 +610,7 @@ gtk_tree_selection_selected_foreach (GtkTreeSelection *selection, GtkTreeIter iter; guint inserted_id, deleted_id, reordered_id; - gboolean stop = FALSE, has_next = FALSE, has_parent = FALSE; + gboolean stop = FALSE, has_next = TRUE, has_parent = TRUE; g_return_if_fail (GTK_IS_TREE_SELECTION (selection)); g_return_if_fail (selection->tree_view != NULL); @@ -681,7 +681,7 @@ gtk_tree_selection_selected_foreach (GtkTreeSelection *selection, gtk_tree_path_append_index (path, 0); /* we do the sanity check at the bottom of this function */ - if (has_child) + if (!has_child) goto out; } else @@ -698,8 +698,9 @@ gtk_tree_selection_selected_foreach (GtkTreeSelection *selection, done = TRUE; gtk_tree_path_next (path); - /* Sanity Check! */ - TREE_VIEW_INTERNAL_ASSERT_VOID (has_next); + /* we do the sanity check at the bottom of this function */ + if (!has_next) + goto out; } else { @@ -720,7 +721,7 @@ gtk_tree_selection_selected_foreach (GtkTreeSelection *selection, gtk_tree_path_up (path); /* we do the sanity check at the bottom of this function */ - if (has_parent) + if (!has_parent) goto out; } } @@ -741,9 +742,9 @@ out: reordered_id); /* check if we have to spew a scary message */ - if (has_next) + if (!has_next) TREE_VIEW_INTERNAL_ASSERT_VOID (has_next); - if (has_parent) + if (!has_parent) TREE_VIEW_INTERNAL_ASSERT_VOID (has_parent); if (stop) g_warning