From 3f19e2b2bbdfebb27d5187e5d5936d45cba3194f Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 2 Apr 2014 14:22:22 -0700 Subject: [PATCH] GUAC-584: Name of constant should be CP1252, not ISO-8859-1. --- src/protocols/rdp/rdp_cliprdr.c | 4 ++-- src/protocols/rdp/rdp_cliprdr.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/protocols/rdp/rdp_cliprdr.c b/src/protocols/rdp/rdp_cliprdr.c index 4008e6a0..c9754165 100644 --- a/src/protocols/rdp/rdp_cliprdr.c +++ b/src/protocols/rdp/rdp_cliprdr.c @@ -145,7 +145,7 @@ void guac_rdp_process_cb_format_list(guac_client* client, /* If plain text available, request it */ 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) 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 */ - if (formats & GUAC_RDP_CLIPBOARD_FORMAT_ISO8859_1) { + if (formats & GUAC_RDP_CLIPBOARD_FORMAT_CP1252) { __guac_rdp_cb_request_format(client, CB_FORMAT_TEXT); return; } diff --git a/src/protocols/rdp/rdp_cliprdr.h b/src/protocols/rdp/rdp_cliprdr.h index 4c5a2a96..08b0b102 100644 --- a/src/protocols/rdp/rdp_cliprdr.h +++ b/src/protocols/rdp/rdp_cliprdr.h @@ -41,9 +41,9 @@ #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.