maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUAC-584: Name of constant should be CP1252, not ISO-8859-1.

Browse Source
This commit is contained in:
Michael Jumper 2014-04-02 14:22:22 -07:00
parent 49ffaf0826
commit 3f19e2b2bb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/protocols/rdp/rdp_cliprdr.c
View File

@ -145,7 +145,7 @@ void guac_rdp_process_cb_format_list(guac_client* client,
/* If plain text available, request it */ /* If plain text available, request it */
if (event->formats[i] == CB_FORMAT_TEXT) if (event->formats[i] == CB_FORMAT_TEXT)
formats |= GUAC_RDP_CLIPBOARD_FORMAT_ISO8859_1; formats |= GUAC_RDP_CLIPBOARD_FORMAT_CP1252;
else if (event->formats[i] == CB_FORMAT_UNICODETEXT) else if (event->formats[i] == CB_FORMAT_UNICODETEXT)
formats |= GUAC_RDP_CLIPBOARD_FORMAT_UTF16; formats |= GUAC_RDP_CLIPBOARD_FORMAT_UTF16;
@ -158,7 +158,7 @@ void guac_rdp_process_cb_format_list(guac_client* client,
} }
/* Use plain text if Unicode unavailable */ /* Use plain text if Unicode unavailable */
if (formats & GUAC_RDP_CLIPBOARD_FORMAT_ISO8859_1) { if (formats & GUAC_RDP_CLIPBOARD_FORMAT_CP1252) {
__guac_rdp_cb_request_format(client, CB_FORMAT_TEXT); __guac_rdp_cb_request_format(client, CB_FORMAT_TEXT);
return; return;
} }

4
src/protocols/rdp/rdp_cliprdr.h
View File

@ -41,9 +41,9 @@
#endif #endif
/** /**
* Clipboard format for text encoded in ISO-8859-1. * Clipboard format for text encoded in Windows CP1252.
*/ */
#define GUAC_RDP_CLIPBOARD_FORMAT_ISO8859_1 1 #define GUAC_RDP_CLIPBOARD_FORMAT_CP1252 1
/** /**
* Clipboard format for text encoded in UTF-16. * Clipboard format for text encoded in UTF-16.