From 136f6b15be51694aaa210ad1b6dabc1d2ab6986c Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@lanedo.com>
Date: Wed, 27 Feb 2013 09:22:27 +0100
Subject: [PATCH] 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 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c
index a260322c25..e2df14d8f4 100644
--- a/gdk/win32/gdkproperty-win32.c
+++ b/gdk/win32/gdkproperty-win32.c
@@ -205,7 +205,7 @@ _gdk_win32_window_change_property (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)))
@@ -222,7 +222,7 @@ _gdk_win32_window_change_property (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];
 	    }