[gtk+] win32: don't convert '\n' to '\r\n' when copying if it already is '\r\n'
- From: Aleksander Morgado <aleksm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] win32: don't convert '\n' to '\r\n' when copying if it already is '\r\n'
- Date: Tue, 18 Jun 2013 12:37:25 +0000 (UTC)
commit 136f6b15be51694aaa210ad1b6dabc1d2ab6986c
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 a260322..e2df14d 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];
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]