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

GUAC-865: rdpSettings may not have SupportDisplayControl, even if freerdp/client/disp.h is present.

Browse Source
This commit is contained in:
Michael Jumper 2014-11-21 13:51:01 -08:00
parent a0e1e5f0c6
commit 1fc80182a3
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -480,7 +480,9 @@ if test "x${have_freerdp}" = "xyes"
then then
AC_CHECK_HEADERS([freerdp/client/disp.h], AC_CHECK_HEADERS([freerdp/client/disp.h],
[AC_DEFINE([HAVE_FREERDP_DISPLAY_UPDATE_SUPPORT],, [AC_DEFINE([HAVE_FREERDP_DISPLAY_UPDATE_SUPPORT],,
[Whether FreeRDP supports the display update channel])], [Whether FreeRDP supports the display update channel])]
[AC_CHECK_MEMBERS([rdpSettings.SupportDisplayControl],,,
[[#include <freerdp/freerdp.h>]])],
have_disp=no, have_disp=no,
[#include <winpr/wtypes.h> [#include <winpr/wtypes.h>
#include <winpr/collections.h>]) #include <winpr/collections.h>])

3
src/protocols/rdp/rdp_disp.c
View File

@ -20,6 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "client.h" #include "client.h"
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>
@ -58,7 +59,9 @@ void guac_rdp_disp_load_plugin(rdpContext* context) {
PubSub_SubscribeChannelConnected(context->pubSub, PubSub_SubscribeChannelConnected(context->pubSub,
(pChannelConnectedEventHandler) guac_rdp_disp_channel_connected); (pChannelConnectedEventHandler) guac_rdp_disp_channel_connected);
#ifdef HAVE_RDPSETTINGS_SUPPORTDISPLAYCONTROL
context->settings->SupportDisplayControl = TRUE; context->settings->SupportDisplayControl = TRUE;
#endif
/* Add "disp" channel */ /* Add "disp" channel */
ADDIN_ARGV* args = malloc(sizeof(ADDIN_ARGV)); ADDIN_ARGV* args = malloc(sizeof(ADDIN_ARGV));