From a99a7ee8f80a7247f50704a69675f39dff1d9622 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Menil Date: Fri, 28 Nov 2014 17:08:16 +0000 Subject: [PATCH] Fix RDP initialization with recent FreeRDP https://bugzilla.gnome.org/show_bug.cgi?id=740868 --- plugins/rdp/vinagre-rdp-tab.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/plugins/rdp/vinagre-rdp-tab.c b/plugins/rdp/vinagre-rdp-tab.c index 1e699a1..b3051b9 100644 --- a/plugins/rdp/vinagre-rdp-tab.c +++ b/plugins/rdp/vinagre-rdp-tab.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #if HAVE_FREERDP_1_1 #include @@ -577,7 +576,15 @@ frdp_post_connect (freerdp *instance) rdpGdi *gdi; int stride; - gdi_init (instance, CLRBUF_24BPP, NULL); + gdi_init (instance, +#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \ + !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && \ + FREERDP_VERSION_MINOR >= 2)) + CLRBUF_24BPP, +#else + CLRBUF_32BPP, +#endif + NULL); gdi = instance->context->gdi; instance->update->BeginPaint = frdp_begin_paint; -- 2.5.0