You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2016/03/23 04:08:05 UTC
incubator-guacamole-server git commit: GUAC-1164: Do not load
"drdynvc" plugin unless actually needed.
Repository: incubator-guacamole-server
Updated Branches:
refs/heads/master f97a681f1 -> ecbb6fc6b
GUAC-1164: Do not load "drdynvc" plugin unless actually needed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/ecbb6fc6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/ecbb6fc6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/ecbb6fc6
Branch: refs/heads/master
Commit: ecbb6fc6b3c5b6cb6314f775abe4f80f2debdb52
Parents: f97a681
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Mar 22 13:41:53 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Mar 22 16:50:49 2016 -0700
----------------------------------------------------------------------
src/protocols/rdp/rdp.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/ecbb6fc6/src/protocols/rdp/rdp.c
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/rdp.c b/src/protocols/rdp/rdp.c
index 4654fc8..0a4ebab 100644
--- a/src/protocols/rdp/rdp.c
+++ b/src/protocols/rdp/rdp.c
@@ -225,15 +225,23 @@ BOOL rdp_freerdp_pre_connect(freerdp* instance) {
(pChannelConnectedEventHandler) guac_rdp_channel_connected);
#endif
- /* Load virtual channel management plugin */
- if (freerdp_channels_load_plugin(channels, instance->settings,
- "drdynvc", instance->settings))
- guac_client_log(client, GUAC_LOG_WARNING,
- "Failed to load drdynvc plugin.");
+#ifdef HAVE_FREERDP_DISPLAY_UPDATE_SUPPORT
+ /* Load required plugins if display update is enabled */
+ if (settings->resize_method == GUAC_RESIZE_DISPLAY_UPDATE) {
- /* Init display update plugin (if available and required) */
- if (settings->resize_method == GUAC_RESIZE_DISPLAY_UPDATE)
- guac_rdp_disp_load_plugin(instance->context);
+ /* Load virtual channel management plugin (needed by display update) */
+ if (freerdp_channels_load_plugin(channels, instance->settings,
+ "drdynvc", instance->settings))
+ guac_client_log(client, GUAC_LOG_WARNING,
+ "Failed to load drdynvc plugin. Display update support "
+ "will be disabled.");
+
+ /* Init display update plugin if "drdynvc" was loaded successfully */
+ else
+ guac_rdp_disp_load_plugin(instance->context);
+
+ }
+#endif
/* Load clipboard plugin */
if (freerdp_channels_load_plugin(channels, instance->settings,