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

Fix install path. Fix rdpdr plugin naming.

Browse Source
This commit is contained in:
Michael Jumper 2013-07-18 17:10:04 -07:00
parent 14fedacfc7
commit ddeab9a435
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/protocols/rdp/Makefile.am
View File

@ -116,7 +116,6 @@ if LEGACY_FREERDP_EXTENSIONS
# FreeRDP 1.0-style extensions # FreeRDP 1.0-style extensions
freerdp_LTLIBRARIES = guacsnd.la guacdr.la freerdp_LTLIBRARIES = guacsnd.la guacdr.la
freerdpdir = ${libdir}/freerdp
guacsnd_la_SOURCES = ${guacsnd_sources} guacsnd_la_SOURCES = ${guacsnd_sources}
guacsnd_la_LDFLAGS = ${guacsnd_ldflags} guacsnd_la_LDFLAGS = ${guacsnd_ldflags}
@ -130,7 +129,6 @@ else
# FreeRDP 1.1 (and hopefully onward) extensions # FreeRDP 1.1 (and hopefully onward) extensions
freerdp_LTLIBRARIES = guacsnd-client.la guacdr-client.la freerdp_LTLIBRARIES = guacsnd-client.la guacdr-client.la
freerdpdir = ${libdir}/freerdp/extensions
guacsnd_client_la_SOURCES = ${guacsnd_sources} guacsnd_client_la_SOURCES = ${guacsnd_sources}
guacsnd_client_la_LDFLAGS = ${guacsnd_ldflags} guacsnd_client_la_LDFLAGS = ${guacsnd_ldflags}
@ -142,3 +140,5 @@ guacdr_client_la_LIBADD = ${guacdr_libadd}
endif endif
freerdpdir = ${libdir}/freerdp

4
src/protocols/rdp/client.c
View File

@ -209,9 +209,9 @@ BOOL rdp_freerdp_pre_connect(freerdp* instance) {
/* Load RDPDR plugin */ /* Load RDPDR plugin */
if (freerdp_channels_load_plugin(channels, instance->settings, if (freerdp_channels_load_plugin(channels, instance->settings,
"guac_rdpdr", client)) "guacdr", client))
guac_client_log_error(client, guac_client_log_error(client,
"Failed to load guac_rdpdr plugin."); "Failed to load guacdr plugin.");
} /* end if printing enabled */ } /* end if printing enabled */