Don't stop the iteration up to the tag_root too early. (#109945, Dongho

2004-04-19  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktextbtree.c (_gtk_text_line_previous_could_contain_tag):
	Don't stop the iteration up to the tag_root too
	early.  (#109945, Dongho Shin)

diff --git a/ChangeLog b/ChangeLog
index dbd574a564a9756fefe854e8fb9b02502022fc59..e79f1c674fe5be60aa0d4376c5856e6435b67c3d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-19  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktextbtree.c (_gtk_text_line_previous_could_contain_tag): 
+       Don't stop the iteration up to the tag_root too 
+       early.  (#109945, Dongho Shin)
+
 Sun Apr 18 17:06:03 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gdk/x11/gdkkeys-x11.c (get_effective_keymap): Make

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index dbd574a564a9756fefe854e8fb9b02502022fc59..e79f1c674fe5be60aa0d4376c5856e6435b67c3d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-04-19  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktextbtree.c (_gtk_text_line_previous_could_contain_tag): 
+       Don't stop the iteration up to the tag_root too 
+       early.  (#109945, Dongho Shin)
+
 Sun Apr 18 17:06:03 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gdk/x11/gdkkeys-x11.c (get_effective_keymap): Make

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index dbd574a564a9756fefe854e8fb9b02502022fc59..e79f1c674fe5be60aa0d4376c5856e6435b67c3d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2004-04-19  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktextbtree.c (_gtk_text_line_previous_could_contain_tag): 
+       Don't stop the iteration up to the tag_root too 
+       early.  (#109945, Dongho Shin)
+
 Sun Apr 18 17:06:03 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gdk/x11/gdkkeys-x11.c (get_effective_keymap): Make

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index dbd574a564a9756fefe854e8fb9b02502022fc59..e79f1c674fe5be60aa0d4376c5856e6435b67c3d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-04-19  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktextbtree.c (_gtk_text_line_previous_could_contain_tag): 
+       Don't stop the iteration up to the tag_root too 
+       early.  (#109945, Dongho Shin)
+
 Sun Apr 18 17:06:03 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gdk/x11/gdkkeys-x11.c (get_effective_keymap): Make

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index dbd574a564a9756fefe854e8fb9b02502022fc59..e79f1c674fe5be60aa0d4376c5856e6435b67c3d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-04-19  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktextbtree.c (_gtk_text_line_previous_could_contain_tag): 
+       Don't stop the iteration up to the tag_root too 
+       early.  (#109945, Dongho Shin)
+
 Sun Apr 18 17:06:03 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gdk/x11/gdkkeys-x11.c (get_effective_keymap): Make

diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index b956fb49925e8f22d0f7715570e60157cad5f7db..663207e6410231c162f9889305a2b4c513c8e072 100644 (file)
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -4488,8 +4488,7 @@ _gtk_text_line_previous_could_contain_tag (GtkTextLine  *line,
       line_ancestor_parent = line->parent->parent;
 
       node = line_ancestor_parent->children.node;
-      while (node != line_ancestor &&
-             line_ancestor != info->tag_root)
+      while (node != line_ancestor || line_ancestor != info->tag_root)
         {
           GSList *child_nodes = NULL;
           GSList *tmp;
@@ -4497,8 +4496,7 @@ _gtk_text_line_previous_could_contain_tag (GtkTextLine  *line,
           /* Create reverse-order list of nodes before
            * line_ancestor
            */
-          while (node != line_ancestor
-                 && node != NULL)
+          while (node != line_ancestor && node != NULL)
             {
               child_nodes = g_slist_prepend (child_nodes, node);