Don't mangle sequences of consecutive \n or \r.

Mon Jan 14 17:14:13 2002  Owen Taylor  <otaylor@redhat.com>
        * gdk/x11/gdkselection-x11.c (sanitize_utf8): Don't
        mangle sequences of consecutive \n or \r.

diff --git a/ChangeLog b/ChangeLog
index 6af1b6edbdf348b87780eac13707f43bf4b541db..4564055dbee3f890db369e7feb8fe3c63e709261 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 14 17:14:13 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkselection-x11.c (sanitize_utf8): Don't
+       mangle sequences of consecutive \n or \r.
+
 Mon Jan 14 17:42:28 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_stop_editing): allow cancel to

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 6af1b6edbdf348b87780eac13707f43bf4b541db..4564055dbee3f890db369e7feb8fe3c63e709261 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Mon Jan 14 17:14:13 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkselection-x11.c (sanitize_utf8): Don't
+       mangle sequences of consecutive \n or \r.
+
 Mon Jan 14 17:42:28 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_stop_editing): allow cancel to

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6af1b6edbdf348b87780eac13707f43bf4b541db..4564055dbee3f890db369e7feb8fe3c63e709261 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Jan 14 17:14:13 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkselection-x11.c (sanitize_utf8): Don't
+       mangle sequences of consecutive \n or \r.
+
 Mon Jan 14 17:42:28 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_stop_editing): allow cancel to

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6af1b6edbdf348b87780eac13707f43bf4b541db..4564055dbee3f890db369e7feb8fe3c63e709261 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Mon Jan 14 17:14:13 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkselection-x11.c (sanitize_utf8): Don't
+       mangle sequences of consecutive \n or \r.
+
 Mon Jan 14 17:42:28 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_stop_editing): allow cancel to

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6af1b6edbdf348b87780eac13707f43bf4b541db..4564055dbee3f890db369e7feb8fe3c63e709261 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Jan 14 17:14:13 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkselection-x11.c (sanitize_utf8): Don't
+       mangle sequences of consecutive \n or \r.
+
 Mon Jan 14 17:42:28 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_stop_editing): allow cancel to

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6af1b6edbdf348b87780eac13707f43bf4b541db..4564055dbee3f890db369e7feb8fe3c63e709261 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Jan 14 17:14:13 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkselection-x11.c (sanitize_utf8): Don't
+       mangle sequences of consecutive \n or \r.
+
 Mon Jan 14 17:42:28 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_stop_editing): allow cancel to

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6af1b6edbdf348b87780eac13707f43bf4b541db..4564055dbee3f890db369e7feb8fe3c63e709261 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Jan 14 17:14:13 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkselection-x11.c (sanitize_utf8): Don't
+       mangle sequences of consecutive \n or \r.
+
 Mon Jan 14 17:42:28 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_stop_editing): allow cancel to

diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c
index 4cadfb63cfac9e1d9b11a2d4851d06ddf1ff9257..893d475ce1ed999955f7fd848f91c08c43cac60b 100644 (file)
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.c
@@ -528,7 +528,7 @@ gdk_string_to_compound_text (const gchar *str,
  * 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)
@@ -539,10 +539,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');
@@ -553,7 +553,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);