AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Bah, and of course I broke something ...

Browse Source 
Sun Nov  3 21:26:20 2002  Kristian Rietveld  <kris@gtk.org>

        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.
This commit is contained in:
Kristian Rietveld 2002-11-03 20:12:00 +00:00 committed by Kristian Rietveld
parent e6143c65eb
commit 66cefd1cc0
7 changed files with 56 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Sun Nov 3 21:26:20 2002 Kristian Rietveld <kris@gtk.org>
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 <otaylor@redhat.com> Sun Nov 3 13:03:29 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c configure.in: Remove check for * gtk/gtkfilesel.c configure.in: Remove check for

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
Sun Nov 3 21:26:20 2002 Kristian Rietveld <kris@gtk.org>
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 <otaylor@redhat.com> Sun Nov 3 13:03:29 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c configure.in: Remove check for * gtk/gtkfilesel.c configure.in: Remove check for

8
ChangeLog.pre-2-2
View File

@ -1,3 +1,11 @@
Sun Nov 3 21:26:20 2002 Kristian Rietveld <kris@gtk.org>
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 <otaylor@redhat.com> Sun Nov 3 13:03:29 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c configure.in: Remove check for * gtk/gtkfilesel.c configure.in: Remove check for

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,11 @@
Sun Nov 3 21:26:20 2002 Kristian Rietveld <kris@gtk.org>
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 <otaylor@redhat.com> Sun Nov 3 13:03:29 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c configure.in: Remove check for * gtk/gtkfilesel.c configure.in: Remove check for

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
Sun Nov 3 21:26:20 2002 Kristian Rietveld <kris@gtk.org>
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 <otaylor@redhat.com> Sun Nov 3 13:03:29 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c configure.in: Remove check for * gtk/gtkfilesel.c configure.in: Remove check for

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
Sun Nov 3 21:26:20 2002 Kristian Rietveld <kris@gtk.org>
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 <otaylor@redhat.com> Sun Nov 3 13:03:29 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c configure.in: Remove check for * gtk/gtkfilesel.c configure.in: Remove check for

15
gtk/gtktreeselection.c
View File

@ -610,7 +610,7 @@ gtk_tree_selection_selected_foreach (GtkTreeSelection *selection,
GtkTreeIter iter; GtkTreeIter iter;
guint inserted_id, deleted_id, reordered_id; 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 (GTK_IS_TREE_SELECTION (selection));
g_return_if_fail (selection->tree_view != NULL); 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); gtk_tree_path_append_index (path, 0);
/* we do the sanity check at the bottom of this function */ /* we do the sanity check at the bottom of this function */
if (has_child) if (!has_child)
goto out; goto out;
} }
else else
@ -698,8 +698,9 @@ gtk_tree_selection_selected_foreach (GtkTreeSelection *selection,
done = TRUE; done = TRUE;
gtk_tree_path_next (path); gtk_tree_path_next (path);
/* Sanity Check! */ /* we do the sanity check at the bottom of this function */
TREE_VIEW_INTERNAL_ASSERT_VOID (has_next); if (!has_next)
goto out;
} }
else else
{ {
@ -720,7 +721,7 @@ gtk_tree_selection_selected_foreach (GtkTreeSelection *selection,
gtk_tree_path_up (path); gtk_tree_path_up (path);
/* we do the sanity check at the bottom of this function */ /* we do the sanity check at the bottom of this function */
if (has_parent) if (!has_parent)
goto out; goto out;
} }
} }
@ -741,9 +742,9 @@ out:
reordered_id); reordered_id);
/* check if we have to spew a scary message */ /* check if we have to spew a scary message */
if (has_next) if (!has_next)
TREE_VIEW_INTERNAL_ASSERT_VOID (has_next); TREE_VIEW_INTERNAL_ASSERT_VOID (has_next);
if (has_parent) if (!has_parent)
TREE_VIEW_INTERNAL_ASSERT_VOID (has_parent); TREE_VIEW_INTERNAL_ASSERT_VOID (has_parent);
if (stop) if (stop)
g_warning g_warning