Only use text segments when determining text direction. (#319065, Tommi

	* gtk/gtktextbtree.c (gtk_text_btree_resolve_bidi): Only use text
	segments when determining text direction.  (#319065, Tommi Komulainen)

diff --git a/ChangeLog b/ChangeLog
index 0d18698d020a54c4ab3cc3892df5bdaac2192aee..49360c333ad360ffec234e4a9580228b17bba2aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-10-26  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktextbtree.c (gtk_text_btree_resolve_bidi): Only use text
+       segments when determining text direction.  (#319065, Tommi Komulainen)
+
        * gtk/gtktreeview.c (gtk_tree_view_destroy): Don't crash
        on duplicate destroy.  (#318953, Gustavo Carneiro)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0d18698d020a54c4ab3cc3892df5bdaac2192aee..49360c333ad360ffec234e4a9580228b17bba2aa 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-10-26  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktextbtree.c (gtk_text_btree_resolve_bidi): Only use text
+       segments when determining text direction.  (#319065, Tommi Komulainen)
+
        * gtk/gtktreeview.c (gtk_tree_view_destroy): Don't crash
        on duplicate destroy.  (#318953, Gustavo Carneiro)
 

diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index 98fc15d0366986b0fb94dbe409cea9d475be1ee6..f9e1594a1dc6060d3b2902f3d00fd6d8a02e1d50 100644 (file)
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -589,7 +589,7 @@ gtk_text_btree_resolve_bidi (GtkTextIter *start,
       
       while (seg)
         {
-          if (seg->byte_count > 0)
+          if (seg->type == &gtk_text_char_type && seg->byte_count > 0)
             {
              PangoDirection pango_dir;