callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

win32: don't convert '\n' to '\r\n' when copying if it already is '\r\n'

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=649390
This commit is contained in:
Aleksander Morgado
2013-02-27 09:22:27 +01:00
parent 242d0c5d22
commit 136f6b15be
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gdk/win32/gdkproperty-win32.c
View File

@ -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];
}