[gtk+/gtk-2-24] win32: don't convert '\n' to '\r\n' when copying if it already is '\r\n'

[Aleksander Morgado <aleksm src gnome org>]

commit 99e3d072d6676d7a219594f05e0409b9eadd5a52
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Wed Feb 27 09:22:27 2013 +0100

    win32: don't convert '\n' to '\r\n' when copying if it already is '\r\n'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=649390

 gdk/win32/gdkproperty-win32.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c
index 9096729..39163b5 100644
--- a/gdk/win32/gdkproperty-win32.c
+++ b/gdk/win32/gdkproperty-win32.c
@@ -206,7 +206,7 @@ gdk_property_change (GdkWindow    *window,
          wclen++;              /* Terminating 0 */
          size = wclen * 2;
          for (i = 0; i < wclen; i++)
-           if (wcptr[i] == '\n')
+           if (wcptr[i] == '\n' && (i == 0 || wcptr[i - 1] != '\r'))
              size += 2;
          
          if (!(hdata = GlobalAlloc (GMEM_MOVEABLE, size)))
@@ -223,7 +223,7 @@ gdk_property_change (GdkWindow    *window,
          p = (wchar_t *) ucptr;
          for (i = 0; i < wclen; i++)
            {
-             if (wcptr[i] == '\n')
+             if (wcptr[i] == '\n' && (i == 0 || wcptr[i - 1] != '\r'))
                *p++ = '\r';
              *p++ = wcptr[i];
            }