Copy from X11 backend. The old version mishandled consecutive newlines.

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.

ChangeLog

@@ -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

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

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

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

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

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

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);

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