summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-25
-rw-r--r--ChangeLog.pre-2-45
-rw-r--r--ChangeLog.pre-2-65
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--gtk/gtktextlayout.c3
7 files changed, 33 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d81341c85..83bea4dce4 100644
--- 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 4d81341c85..83bea4dce4 100644
--- 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 4d81341c85..83bea4dce4 100644
--- 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 4d81341c85..83bea4dce4 100644
--- 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 4d81341c85..83bea4dce4 100644
--- 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 4d81341c85..83bea4dce4 100644
--- 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 70125e5227..9f31aee78e 100644
--- 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;