From f9bd8eb22b0cb2c92f78b9e420e83fbc052f2665 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Thu, 18 Jul 2013 21:52:40 -0700
Subject: [PATCH] Fix build on 1.0 again.

---
 src/protocols/rdp/client.c              | 6 +++---
 src/protocols/rdp/compat/winpr-stream.c | 2 --
 src/protocols/rdp/compat/winpr-stream.h | 6 ++++--
 src/protocols/rdp/rdp_cliprdr.h         | 4 ++--
 src/protocols/rdp/rdp_settings.c        | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/protocols/rdp/client.c b/src/protocols/rdp/client.c
index 02105c99..377af15f 100644
--- a/src/protocols/rdp/client.c
+++ b/src/protocols/rdp/client.c
@@ -54,12 +54,12 @@
 #include <freerdp/cache/palette.h>
 #include <freerdp/cache/pointer.h>
 #include <freerdp/cache/offscreen.h>
-#include <freerdp/client/channels.h>
+#include <freerdp/channels/channels.h>
 #include <freerdp/input.h>
 #include <freerdp/constants.h>
 
-#ifdef HAVE_FREERDP_CHANNELS_CHANNELS_H
-#include <freerdp/channels/channels.h>
+#ifdef HAVE_FREERDP_CLIENT_CHANNELS_H
+#include <freerdp/client/channels.h>
 #endif
 
 #ifdef HAVE_FREERDP_ADDIN_H
diff --git a/src/protocols/rdp/compat/winpr-stream.c b/src/protocols/rdp/compat/winpr-stream.c
index a552f3c9..b85de262 100644
--- a/src/protocols/rdp/compat/winpr-stream.c
+++ b/src/protocols/rdp/compat/winpr-stream.c
@@ -45,5 +45,3 @@ void Stream_Free(wStream* s, BOOL bFreeBuffer) {
     /* STUB */
 }
 
-#endif
-
diff --git a/src/protocols/rdp/compat/winpr-stream.h b/src/protocols/rdp/compat/winpr-stream.h
index 2dc389dd..70a6496d 100644
--- a/src/protocols/rdp/compat/winpr-stream.h
+++ b/src/protocols/rdp/compat/winpr-stream.h
@@ -37,9 +37,10 @@
 #ifndef __GUAC_WINPR_STREAM_COMPAT_H
 #define __GUAC_WINPR_STREAM_COMPAT_H
 
-/* FreeRDP 1.0 streams */
+#include <freerdp/utils/stream.h>
+#include "winpr-wtypes.h"
 
-#define Stream_New                     stream_new
+/* FreeRDP 1.0 streams */
 
 #define Stream_Write                   stream_write
 #define Stream_Write_UINT8             stream_write_uint8
@@ -59,6 +60,7 @@
 #define Stream_GetPointer              stream_get_mark
 #define Stream_EnsureRemainingCapacity stream_check_size
 #define Stream_Write                   stream_write
+#define Stream_GetPosition             stream_get_pos
 #define Stream_SetPosition             stream_set_pos
 #define Stream_SetPointer              stream_set_mark
 #define Stream_Buffer                  stream_get_head
diff --git a/src/protocols/rdp/rdp_cliprdr.h b/src/protocols/rdp/rdp_cliprdr.h
index f33d7c7f..8e832972 100644
--- a/src/protocols/rdp/rdp_cliprdr.h
+++ b/src/protocols/rdp/rdp_cliprdr.h
@@ -39,9 +39,9 @@
 #define __GUAC_RDP_RDP_CLIPRDR_H
 
 #ifdef ENABLE_WINPR
-#include <winpr/wtypes.h>
+#include <winpr/stream.h>
 #else
-#include "compat/winpr-wtypes.h"
+#include "compat/winpr-stream.h"
 #endif
 
 #include <freerdp/freerdp.h>
diff --git a/src/protocols/rdp/rdp_settings.c b/src/protocols/rdp/rdp_settings.c
index e0acada9..71a727e2 100644
--- a/src/protocols/rdp/rdp_settings.c
+++ b/src/protocols/rdp/rdp_settings.c
@@ -58,7 +58,7 @@ void guac_rdp_commit_settings(guac_rdp_settings* guac_settings, rdpSettings* rdp
     rdp_settings->width = guac_settings->width;
     rdp_settings->height = guac_settings->height;
     rdp_settings->shell = guac_settings->initial_program;
-    rdp_settiongs->kbd_layout = guac_settings->server_layout->freerdp_keyboard_layout;
+    rdp_settings->kbd_layout = guac_settings->server_layout->freerdp_keyboard_layout;
 
     /* Console */
     rdp_settings->console_session = guac_settings->console;