[vinagre/wip/oholy/fix-hangs] plugins/rdp: Fix hangs with recent FreeRDP versions

[Ondrej Holy <oholy src gnome org>]

commit 404a56a11469ef24a1df632847465030d81db091
Author: Ondrej Holy <oholy redhat com>
Date:   Fri May 15 15:43:37 2020 +0200

    plugins/rdp: Fix hangs with recent FreeRDP versions
    
    Connection to all my testing servers fails with "SERVER BUG: The support
    for this feature was not announced! Use /relax-order-checks to ignore"
    currently. This happens always with current FreeRDP versions after
    https://github.com/FreeRDP/FreeRDP/pull/4926 has been merged. This can be
    fixed by the usage of /relax-order-checks option, however, this option
    should be used only if necessary needed and it should not be needed in
    most of the cases. This currenlty happens always as it interfere with our
    custom OrderSupports settings. Let's use the default OrderSupports
    settings to fix this issue, which is possible thanks to
    https://github.com/FreeRDP/FreeRDP/pull/5057.
    
    See: https://gitlab.gnome.org/GNOME/gtk-frdp/-/issues/27

 configure.ac                  |  2 +-
 plugins/rdp/vinagre-rdp-tab.c | 27 ---------------------------
 2 files changed, 1 insertion(+), 28 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 61617f1..445b3e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,7 @@ AS_IF([test "x$have_ssh" = "xyes"],
 AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [test "x$have_ssh" = "xyes"])
 
 # Whether to enable support for RDP.
-RDP_DEPS="freerdp2 x11"
+RDP_DEPS="freerdp2 >= 2.0.0 x11"
 
 AC_ARG_ENABLE([rdp],
   [AS_HELP_STRING([--disable-rdp],
diff --git a/plugins/rdp/vinagre-rdp-tab.c b/plugins/rdp/vinagre-rdp-tab.c
index bbb8adf..046b0b9 100644
--- a/plugins/rdp/vinagre-rdp-tab.c
+++ b/plugins/rdp/vinagre-rdp-tab.c
@@ -522,33 +522,6 @@ frdp_end_paint (rdpContext *context)
 static BOOL
 frdp_pre_connect (freerdp *instance)
 {
-  rdpSettings *settings = instance->settings;
-
-  settings->OrderSupport[NEG_DSTBLT_INDEX] = TRUE;
-  settings->OrderSupport[NEG_PATBLT_INDEX] = TRUE;
-  settings->OrderSupport[NEG_SCRBLT_INDEX] = TRUE;
-  settings->OrderSupport[NEG_OPAQUE_RECT_INDEX] = TRUE;
-  settings->OrderSupport[NEG_DRAWNINEGRID_INDEX] = FALSE;
-  settings->OrderSupport[NEG_MULTIDSTBLT_INDEX] = FALSE;
-  settings->OrderSupport[NEG_MULTIPATBLT_INDEX] = FALSE;
-  settings->OrderSupport[NEG_MULTISCRBLT_INDEX] = FALSE;
-  settings->OrderSupport[NEG_MULTIOPAQUERECT_INDEX] = TRUE;
-  settings->OrderSupport[NEG_MULTI_DRAWNINEGRID_INDEX] = FALSE;
-  settings->OrderSupport[NEG_LINETO_INDEX] = TRUE;
-  settings->OrderSupport[NEG_POLYLINE_INDEX] = TRUE;
-  settings->OrderSupport[NEG_MEMBLT_INDEX] = TRUE;
-  settings->OrderSupport[NEG_MEM3BLT_INDEX] = FALSE;
-  settings->OrderSupport[NEG_MEMBLT_V2_INDEX] = TRUE;
-  settings->OrderSupport[NEG_MEM3BLT_V2_INDEX] = FALSE;
-  settings->OrderSupport[NEG_SAVEBITMAP_INDEX] = FALSE;
-  settings->OrderSupport[NEG_GLYPH_INDEX_INDEX] = TRUE;
-  settings->OrderSupport[NEG_FAST_INDEX_INDEX] = TRUE;
-  settings->OrderSupport[NEG_FAST_GLYPH_INDEX] = FALSE;
-  settings->OrderSupport[NEG_POLYGON_SC_INDEX] = FALSE;
-  settings->OrderSupport[NEG_POLYGON_CB_INDEX] = FALSE;
-  settings->OrderSupport[NEG_ELLIPSE_SC_INDEX] = FALSE;
-  settings->OrderSupport[NEG_ELLIPSE_CB_INDEX] = FALSE;
-
   return TRUE;
 }