From e7729de280f4d2c052ece4fa851f7953d28d6223 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Thu, 1 Nov 2001 00:06:32 +0000 Subject: [PATCH] fix infinite loop noticed by yosh. Wed Oct 31 18:53:51 2001 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix infinite loop noticed by yosh. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ docs/reference/gdk/tmpl/input_devices.sgml | 10 +++++----- docs/reference/gtk/tmpl/gtkoptionmenu.sgml | 5 +++++ docs/reference/gtk/tmpl/gtkselection.sgml | 1 + gtk/gtktreemodel.c | 14 +++++++++++--- 11 files changed, 57 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index a21b7e218..3b1fddc8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Oct 31 18:53:51 2001 Jonathan Blandford + + * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix + infinite loop noticed by yosh. + 2001-11-01 Michael Meeks * gtk/gtksocket.c (gtk_socket_unrealize): unset the diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index a21b7e218..3b1fddc8d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Wed Oct 31 18:53:51 2001 Jonathan Blandford + + * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix + infinite loop noticed by yosh. + 2001-11-01 Michael Meeks * gtk/gtksocket.c (gtk_socket_unrealize): unset the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a21b7e218..3b1fddc8d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Oct 31 18:53:51 2001 Jonathan Blandford + + * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix + infinite loop noticed by yosh. + 2001-11-01 Michael Meeks * gtk/gtksocket.c (gtk_socket_unrealize): unset the diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index a21b7e218..3b1fddc8d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Wed Oct 31 18:53:51 2001 Jonathan Blandford + + * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix + infinite loop noticed by yosh. + 2001-11-01 Michael Meeks * gtk/gtksocket.c (gtk_socket_unrealize): unset the diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a21b7e218..3b1fddc8d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Wed Oct 31 18:53:51 2001 Jonathan Blandford + + * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix + infinite loop noticed by yosh. + 2001-11-01 Michael Meeks * gtk/gtksocket.c (gtk_socket_unrealize): unset the diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a21b7e218..3b1fddc8d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Wed Oct 31 18:53:51 2001 Jonathan Blandford + + * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix + infinite loop noticed by yosh. + 2001-11-01 Michael Meeks * gtk/gtksocket.c (gtk_socket_unrealize): unset the diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a21b7e218..3b1fddc8d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Oct 31 18:53:51 2001 Jonathan Blandford + + * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix + infinite loop noticed by yosh. + 2001-11-01 Michael Meeks * gtk/gtksocket.c (gtk_socket_unrealize): unset the diff --git a/docs/reference/gdk/tmpl/input_devices.sgml b/docs/reference/gdk/tmpl/input_devices.sgml index 09254c542..4bbdabeb8 100644 --- a/docs/reference/gdk/tmpl/input_devices.sgml +++ b/docs/reference/gdk/tmpl/input_devices.sgml @@ -171,7 +171,7 @@ types that GTK+ understands. @GDK_AXIS_PRESSURE: the axis is used for pressure information. @GDK_AXIS_XTILT: the axis is used for x tilt information. @GDK_AXIS_YTILT: the axis is used for x tilt information. -@GDK_AXIS_WHEEL: the axis is used for wheel information. +@GDK_AXIS_WHEEL: the axis is used for wheel information. @GDK_AXIS_LAST: a constant equal to the numerically highest axis value. @@ -180,7 +180,7 @@ Returns the list of available input devices. The list is statically allocated and should not be freed. -@Returns: a list of #GdkDevice*. +@Returns: a list of #GdkDevice*. @@ -199,7 +199,7 @@ device is active and whether the device's range is mapped to the entire screen or to a single window. -@device: a #GdkDevice. +@device: a #GdkDevice. @mode: the input mode. @Returns: %TRUE if the mode was successfully changed. @@ -211,7 +211,7 @@ is pressed. @device: a #GdkDevice. -@index: the index of the macro button to set. +@index: the index of the macro button to set. @keyval: the keyval to generate. @modifiers: the modifiers to set. @@ -221,7 +221,7 @@ is pressed. Specifies how an axis of a device is used. -@device: a #GdkDevice. +@device: a #GdkDevice. @index: the index of the axis. @use: specifies how the axis is used. diff --git a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml index 2e15eeb0c..3c5376771 100644 --- a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml +++ b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml @@ -85,3 +85,8 @@ selected value for the option menu. @optionmenu: the object which received the signal. + + + + + diff --git a/docs/reference/gtk/tmpl/gtkselection.sgml b/docs/reference/gtk/tmpl/gtkselection.sgml index eac694481..9ea4eaa26 100644 --- a/docs/reference/gtk/tmpl/gtkselection.sgml +++ b/docs/reference/gtk/tmpl/gtkselection.sgml @@ -230,6 +230,7 @@ Null terminates the stored data. @selection_data: @str: +@len: @Returns: diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index 1fdb0c84d..489d4ff26 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -1306,10 +1306,18 @@ gtk_tree_row_ref_deleted_callback (GObject *object, gint i; if (path->depth > reference->path->depth) - continue; - for (i = 0; i < path->depth - 1; i++) - if (path->indices[i] != reference->path->indices[i]) + { + tmp_list = g_slist_next (tmp_list); continue; + } + for (i = 0; i < path->depth - 1; i++) + { + if (path->indices[i] != reference->path->indices[i]) + { + tmp_list = g_slist_next (tmp_list); + continue; + } + } /* We know it affects us. */ if (path->indices[i] == reference->path->indices[i]) -- 2.43.2