From 3b8e2a5528589b1ad44a4e82b91808c044993224 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 5 Oct 2014 14:30:55 -0700 Subject: [PATCH] GUAC-874: Remove detection of FastPath settings. Rely on defaults. --- configure.ac | 13 ------------- src/protocols/rdp/rdp_settings.c | 8 -------- 2 files changed, 21 deletions(-) diff --git a/configure.ac b/configure.ac index 19ace667..f1b38533 100644 --- a/configure.ac +++ b/configure.ac @@ -374,7 +374,6 @@ then legacy_freerdp_extensions=no rdpsettings_interface=unknown rdpsettings_audioplayback=yes - rdpsettings_fastpath=yes freerdp_interface=unknown event_interface=unknown @@ -597,12 +596,6 @@ then AC_DEFINE([LEGACY_RDPSETTINGS],, [Whether the legacy version of the rdpSettings API was found]) - # Legacy interface may not have FastPath settings - AC_CHECK_MEMBERS([rdpSettings.fast_path_input, - rdpSettings.fast_path_output],, - [rdpsettings_fastpath=no], - [[#include ]]) - # Legacy interface may not have AudioPlayback settings AC_CHECK_MEMBERS([rdpSettings.audio_playback],, [rdpsettings_audioplayback=no], @@ -618,12 +611,6 @@ then fi fi -# Activate FastPath settings if present -if test "x${have_freerdp}" = "xyes" -a "x${rdpsettings_fastpath}" = "xyes"; then - AC_DEFINE([HAVE_RDPSETTINGS_FASTPATH],, - [Whether the rdpSettings structure has FastPath settings]) -fi - # Activate audio playback settings if present if test "x${have_freerdp}" = "xyes" -a "x${rdpsettings_audioplayback}" = "xyes"; then AC_DEFINE([HAVE_RDPSETTINGS_AUDIOPLAYBACK],, diff --git a/src/protocols/rdp/rdp_settings.c b/src/protocols/rdp/rdp_settings.c index ce09d539..f9689363 100644 --- a/src/protocols/rdp/rdp_settings.c +++ b/src/protocols/rdp/rdp_settings.c @@ -217,10 +217,6 @@ void guac_rdp_push_settings(guac_rdp_settings* guac_settings, freerdp* rdp) { bitmap_cache = rdp_settings->bitmap_cache; rdp_settings->os_major_type = OSMAJORTYPE_UNSPECIFIED; rdp_settings->os_minor_type = OSMINORTYPE_UNSPECIFIED; -#ifdef HAVE_RDPSETTINGS_FASTPATH - rdp_settings->fast_path_input = FALSE; - rdp_settings->fast_path_output = FALSE; -#endif rdp_settings->desktop_resize = TRUE; rdp_settings->order_support[NEG_DSTBLT_INDEX] = TRUE; rdp_settings->order_support[NEG_PATBLT_INDEX] = FALSE; /* PATBLT not yet supported */ @@ -250,10 +246,6 @@ void guac_rdp_push_settings(guac_rdp_settings* guac_settings, freerdp* rdp) { bitmap_cache = rdp_settings->BitmapCacheEnabled; rdp_settings->OsMajorType = OSMAJORTYPE_UNSPECIFIED; rdp_settings->OsMinorType = OSMINORTYPE_UNSPECIFIED; -#ifdef HAVE_RDPSETTINGS_FASTPATH - rdp_settings->FastPathInput = FALSE; - rdp_settings->FastPathOutput = FALSE; -#endif rdp_settings->DesktopResize = TRUE; rdp_settings->OrderSupport[NEG_DSTBLT_INDEX] = TRUE; rdp_settings->OrderSupport[NEG_PATBLT_INDEX] = FALSE; /* PATBLT not yet supported */