fix infinite loop noticed by yosh.

Wed Oct 31 18:53:51 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix
	infinite loop noticed by yosh.

diff --git a/ChangeLog b/ChangeLog
index a21b7e218a95d6bb37b379ac124f2c973b117e9f..3b1fddc8d62fea75c5d39c402036bac72be809d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 31 18:53:51 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix
+       infinite loop noticed by yosh.
+
 2001-11-01  Michael Meeks  <michael@ximian.com>
 
        * gtk/gtksocket.c (gtk_socket_unrealize): unset the

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a21b7e218a95d6bb37b379ac124f2c973b117e9f..3b1fddc8d62fea75c5d39c402036bac72be809d2 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Wed Oct 31 18:53:51 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix
+       infinite loop noticed by yosh.
+
 2001-11-01  Michael Meeks  <michael@ximian.com>
 
        * gtk/gtksocket.c (gtk_socket_unrealize): unset the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a21b7e218a95d6bb37b379ac124f2c973b117e9f..3b1fddc8d62fea75c5d39c402036bac72be809d2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Oct 31 18:53:51 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix
+       infinite loop noticed by yosh.
+
 2001-11-01  Michael Meeks  <michael@ximian.com>
 
        * gtk/gtksocket.c (gtk_socket_unrealize): unset the

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a21b7e218a95d6bb37b379ac124f2c973b117e9f..3b1fddc8d62fea75c5d39c402036bac72be809d2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Wed Oct 31 18:53:51 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix
+       infinite loop noticed by yosh.
+
 2001-11-01  Michael Meeks  <michael@ximian.com>
 
        * gtk/gtksocket.c (gtk_socket_unrealize): unset the

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a21b7e218a95d6bb37b379ac124f2c973b117e9f..3b1fddc8d62fea75c5d39c402036bac72be809d2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Wed Oct 31 18:53:51 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix
+       infinite loop noticed by yosh.
+
 2001-11-01  Michael Meeks  <michael@ximian.com>
 
        * gtk/gtksocket.c (gtk_socket_unrealize): unset the

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a21b7e218a95d6bb37b379ac124f2c973b117e9f..3b1fddc8d62fea75c5d39c402036bac72be809d2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Oct 31 18:53:51 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix
+       infinite loop noticed by yosh.
+
 2001-11-01  Michael Meeks  <michael@ximian.com>
 
        * gtk/gtksocket.c (gtk_socket_unrealize): unset the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a21b7e218a95d6bb37b379ac124f2c973b117e9f..3b1fddc8d62fea75c5d39c402036bac72be809d2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Oct 31 18:53:51 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix
+       infinite loop noticed by yosh.
+
 2001-11-01  Michael Meeks  <michael@ximian.com>
 
        * 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 09254c542a4208f2753070534aeb4c42dd2ad798..4bbdabeb8adbc987e67709f0a7caf1b92a37ae50 100644 (file)
--- 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.
 
 <!-- ##### FUNCTION gdk_devices_list ##### -->
@@ -180,7 +180,7 @@ Returns the list of available input devices. The list is statically
 allocated and should not be freed.
 </para>
 
-@Returns: a list of #GdkDevice*. 
+@Returns: a list of #GdkDevice*.
 
 
 <!-- ##### FUNCTION gdk_device_set_source ##### -->
@@ -199,7 +199,7 @@ device is active and whether the device's range is mapped to the
 entire screen or to a single window.
 </para>
 
-@device: a #GdkDevice. 
+@device: a #GdkDevice.
 @mode: the input mode.
 @Returns: %TRUE if the mode was successfully changed.
 
@@ -211,7 +211,7 @@ is pressed.
 </para>
 
 @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.
 </para>
 
-@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 2e15eeb0c10ad1da244411a2bcf5ad3131c15848..3c537677185a33dc90f2332f5d9d2638350bc2f6 100644 (file)
--- 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.
 
+<!-- ##### ARG GtkOptionMenu:menu ##### -->
+<para>
+
+</para>
+

diff --git a/docs/reference/gtk/tmpl/gtkselection.sgml b/docs/reference/gtk/tmpl/gtkselection.sgml
index eac69448115590d52008db73896a213c713d8d7b..9ea4eaa2616156c6a8d26ce7c90db094b11ee42c 100644 (file)
--- 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 1fdb0c84d67c77040ed37d86ff90c7ef12bbe58e..489d4ff2660b7acf4dcb3a2a46a54b0a9ddc2777 100644 (file)
--- 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])