Don't add attributes with empty ranges. (fixes #101564 and #80637)

2002-12-22  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtktextlayout.c (add_preedit_attrs): Don't add attributes
	with empty ranges.  (fixes #101564 and #80637)

diff --git a/ChangeLog b/ChangeLog
index 4d81341c854e61069871d775c897d0c3092588b7..83bea4dce4d4341ae418cd4f5931b15a84d0e68c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-22  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktextlayout.c (add_preedit_attrs): Don't add attributes
+       with empty ranges.  (fixes #101564 and #80637)
+
 2002-12-21  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_new): Move the code that

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4d81341c854e61069871d775c897d0c3092588b7..83bea4dce4d4341ae418cd4f5931b15a84d0e68c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-12-22  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktextlayout.c (add_preedit_attrs): Don't add attributes
+       with empty ranges.  (fixes #101564 and #80637)
+
 2002-12-21  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_new): Move the code that

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4d81341c854e61069871d775c897d0c3092588b7..83bea4dce4d4341ae418cd4f5931b15a84d0e68c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-12-22  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktextlayout.c (add_preedit_attrs): Don't add attributes
+       with empty ranges.  (fixes #101564 and #80637)
+
 2002-12-21  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_new): Move the code that

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4d81341c854e61069871d775c897d0c3092588b7..83bea4dce4d4341ae418cd4f5931b15a84d0e68c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-12-22  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktextlayout.c (add_preedit_attrs): Don't add attributes
+       with empty ranges.  (fixes #101564 and #80637)
+
 2002-12-21  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_new): Move the code that

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4d81341c854e61069871d775c897d0c3092588b7..83bea4dce4d4341ae418cd4f5931b15a84d0e68c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-12-22  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktextlayout.c (add_preedit_attrs): Don't add attributes
+       with empty ranges.  (fixes #101564 and #80637)
+
 2002-12-21  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_new): Move the code that

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4d81341c854e61069871d775c897d0c3092588b7..83bea4dce4d4341ae418cd4f5931b15a84d0e68c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-12-22  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktextlayout.c (add_preedit_attrs): Don't add attributes
+       with empty ranges.  (fixes #101564 and #80637)
+
 2002-12-21  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_new): Move the code that

diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index 70125e52278b06a0a68ce4dff18fce7d590c9709..9f31aee78e522e23879d513138ec5926339dce45 100644 (file)
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -1587,6 +1587,9 @@ add_preedit_attrs (GtkTextLayout     *layout,
       if (end == G_MAXINT)
        end = layout->preedit_len;
       
+      if (end == start)
+       continue;
+
       pango_attr_iterator_get_font (iter, font_desc, &language, &extra_attrs);
       
       tmp_list = extra_attrs;