diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 8 | ||||
| -rw-r--r-- | gdk/win32/gdkselection-win32.c | 8 | ||||
| -rw-r--r-- | tests/testgtkrc | 3 |
8 files changed, 52 insertions, 7 deletions
@@ -1,3 +1,11 @@ +2002-09-21 Tor Lillqvist <tml@iki.fi> + + * gdk/win32/gdkselection-win32.c (sanitize_utf8): Copy from X11 + backend. The old version mishandled consecutive newlines. + + * tests/testgtkrc: Remove obsolete mention of gtk-engines and + Pixmap theme engine on Win32. + Fri Sep 20 18:01:26 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_unrealize): Set the IM diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 03c418c254..004f42951e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2002-09-21 Tor Lillqvist <tml@iki.fi> + + * gdk/win32/gdkselection-win32.c (sanitize_utf8): Copy from X11 + backend. The old version mishandled consecutive newlines. + + * tests/testgtkrc: Remove obsolete mention of gtk-engines and + Pixmap theme engine on Win32. + Fri Sep 20 18:01:26 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_unrealize): Set the IM diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 03c418c254..004f42951e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2002-09-21 Tor Lillqvist <tml@iki.fi> + + * gdk/win32/gdkselection-win32.c (sanitize_utf8): Copy from X11 + backend. The old version mishandled consecutive newlines. + + * tests/testgtkrc: Remove obsolete mention of gtk-engines and + Pixmap theme engine on Win32. + Fri Sep 20 18:01:26 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_unrealize): Set the IM diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 03c418c254..004f42951e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2002-09-21 Tor Lillqvist <tml@iki.fi> + + * gdk/win32/gdkselection-win32.c (sanitize_utf8): Copy from X11 + backend. The old version mishandled consecutive newlines. + + * tests/testgtkrc: Remove obsolete mention of gtk-engines and + Pixmap theme engine on Win32. + Fri Sep 20 18:01:26 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_unrealize): Set the IM diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 03c418c254..004f42951e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2002-09-21 Tor Lillqvist <tml@iki.fi> + + * gdk/win32/gdkselection-win32.c (sanitize_utf8): Copy from X11 + backend. The old version mishandled consecutive newlines. + + * tests/testgtkrc: Remove obsolete mention of gtk-engines and + Pixmap theme engine on Win32. + Fri Sep 20 18:01:26 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_unrealize): Set the IM diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 03c418c254..004f42951e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2002-09-21 Tor Lillqvist <tml@iki.fi> + + * gdk/win32/gdkselection-win32.c (sanitize_utf8): Copy from X11 + backend. The old version mishandled consecutive newlines. + + * tests/testgtkrc: Remove obsolete mention of gtk-engines and + Pixmap theme engine on Win32. + Fri Sep 20 18:01:26 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_unrealize): Set the IM diff --git a/gdk/win32/gdkselection-win32.c b/gdk/win32/gdkselection-win32.c index 632706e9a4..7cc0b8b6a1 100644 --- a/gdk/win32/gdkselection-win32.c +++ b/gdk/win32/gdkselection-win32.c @@ -803,7 +803,7 @@ gdk_text_property_to_utf8_list_for_display (GdkDisplay *display, * routines for COMPOUND_TEXT only enforce this in one direction, * causing cut-and-paste of \r and \r\n separated text to fail. * This routine strips out all non-allowed C0 and C1 characters - * from the input string and also canonicalizes \r, \r\n, and \n\r to \n + * from the input string and also canonicalizes \r, and \r\n to \n */ static gchar * sanitize_utf8 (const gchar *src) @@ -814,10 +814,10 @@ sanitize_utf8 (const gchar *src) while (*p) { - if (*p == '\r' || *p == '\n') + if (*p == '\r') { p++; - if (*p == '\r' || *p == '\n') + if (*p == '\n') p++; g_string_append_c (result, '\n'); @@ -828,7 +828,7 @@ sanitize_utf8 (const gchar *src) char buf[7]; gint buflen; - if (!((ch < 0x20 && ch != '\t') || (ch >= 0x7f && ch < 0xa0))) + if (!((ch < 0x20 && ch != '\t' && ch != '\n') || (ch >= 0x7f && ch < 0xa0))) { buflen = g_unichar_to_utf8 (ch, buf); g_string_append_len (result, buf, buflen); diff --git a/tests/testgtkrc b/tests/testgtkrc index 7e540fa325..05a4f3edec 100644 --- a/tests/testgtkrc +++ b/tests/testgtkrc @@ -19,9 +19,6 @@ include "testgtkrc2" #include "/usr/local/share/themes/Notif/gtk/gtkrc" #include "/usr/local/share/themes/Default/gtk/gtkrc" -# On Windows, if you have installed gtk-engines, try this for instance: -#include "\\windows\\gtk\\themes\\Pixmap\\gtk\\gtkrc" - double-click_timeout = 42 bell-duration = 39 bell_duration = 40 |