From ddeab9a43564caf6a858e79e3abecd5b4761235d Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Thu, 18 Jul 2013 17:10:04 -0700
Subject: [PATCH] Fix install path. Fix rdpdr plugin naming.

---
 src/protocols/rdp/Makefile.am | 4 ++--
 src/protocols/rdp/client.c    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am
index eae0a94e..28416dcd 100644
--- a/src/protocols/rdp/Makefile.am
+++ b/src/protocols/rdp/Makefile.am
@@ -116,7 +116,6 @@ if LEGACY_FREERDP_EXTENSIONS
 
 # FreeRDP 1.0-style extensions
 freerdp_LTLIBRARIES = guacsnd.la guacdr.la
-freerdpdir = ${libdir}/freerdp
 
 guacsnd_la_SOURCES = ${guacsnd_sources}
 guacsnd_la_LDFLAGS = ${guacsnd_ldflags}
@@ -130,7 +129,6 @@ else
 
 # FreeRDP 1.1 (and hopefully onward) extensions
 freerdp_LTLIBRARIES = guacsnd-client.la guacdr-client.la
-freerdpdir = ${libdir}/freerdp/extensions
 
 guacsnd_client_la_SOURCES = ${guacsnd_sources}
 guacsnd_client_la_LDFLAGS = ${guacsnd_ldflags}
@@ -142,3 +140,5 @@ guacdr_client_la_LIBADD  = ${guacdr_libadd}
 
 endif
 
+freerdpdir = ${libdir}/freerdp
+
diff --git a/src/protocols/rdp/client.c b/src/protocols/rdp/client.c
index 9aacb692..160e312d 100644
--- a/src/protocols/rdp/client.c
+++ b/src/protocols/rdp/client.c
@@ -209,9 +209,9 @@ BOOL rdp_freerdp_pre_connect(freerdp* instance) {
 
         /* Load RDPDR plugin */
         if (freerdp_channels_load_plugin(channels, instance->settings,
-                    "guac_rdpdr", client))
+                    "guacdr", client))
             guac_client_log_error(client,
-                    "Failed to load guac_rdpdr plugin.");
+                    "Failed to load guacdr plugin.");
 
     } /* end if printing enabled */