From d85a18c24ddc8dfb8b9941c0e49a28309c20d985 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Tue, 25 Nov 2014 22:11:43 -0800
Subject: [PATCH] GUAC-935: Add missing headers. Fix test for PubSub.

---
 configure.ac               |  8 ++++----
 src/protocols/rdp/client.c | 12 ++++++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1da028a2..96815b89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -491,10 +491,10 @@ fi
 # Support for "PubSub" event system
 if test "x${have_freerdp}" = "xyes"
 then
-    AC_CHECK_MEMBERS([rdpContext.pubSub],
-                     [AC_DEFINE([HAVE_FREERDP_PUBSUB],,
-                                [Whether this version of FreeRDP provides the PubSub event system])],,
-                     [[#include <freerdp/freerdp.h>]])
+    AC_CHECK_DECL([PubSub_SubscribeChannelConnected],
+        [AC_DEFINE([HAVE_FREERDP_EVENT_PUBSUB],,
+                   [Whether this version of FreeRDP provides the PubSub event system])],,
+        [#include <freerdp/event.h>])
 fi
 
 # Addin registration variations
diff --git a/src/protocols/rdp/client.c b/src/protocols/rdp/client.c
index c023d8ea..9aaa0c7b 100644
--- a/src/protocols/rdp/client.c
+++ b/src/protocols/rdp/client.c
@@ -57,6 +57,14 @@
 #include "compat/client-cliprdr.h"
 #endif
 
+#ifdef HAVE_FREERDP_CLIENT_DISP_H
+#include <freerdp/client/disp.h>
+#endif
+
+#ifdef HAVE_FREERDP_EVENT_PUBSUB
+#include <freerdp/event.h>
+#endif
+
 #ifdef ENABLE_WINPR
 #include <winpr/wtypes.h>
 #else
@@ -146,7 +154,7 @@ int __guac_receive_channel_data(freerdp* rdp_inst, int channelId, UINT8* data, i
     return freerdp_channels_data(rdp_inst, channelId, data, size, flags, total_size);
 }
 
-#ifdef HAVE_FREERDP_PUBSUB
+#ifdef HAVE_FREERDP_EVENT_PUBSUB
 /**
  * Called whenever a channel connects.
  */
@@ -204,7 +212,7 @@ BOOL rdp_freerdp_pre_connect(freerdp* instance) {
         guac_client_log(client, GUAC_LOG_WARNING,
                 "Failed to load drdynvc plugin.");
 
-#ifdef HAVE_FREERDP_PUBSUB
+#ifdef HAVE_FREERDP_EVENT_PUBSUB
     /* Subscribe to and handle channel connected events */
     PubSub_SubscribeChannelConnected(context->pubSub,
             (pChannelConnectedEventHandler) guac_rdp_channel_connected);