vinagre/trunk/freerdp2017.diff

   1 diff --git c/configure.ac i/configure.ac
   2 index 0dfc0dbf3069a17b..35e5f7b59fe7f9a3 100644
   3 --- c/configure.ac
   4 +++ i/configure.ac
   5 @@ -58,7 +58,7 @@ AS_IF([test "x$have_ssh" = "xyes"],
   6  AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [test "x$have_ssh" = "xyes"])
   7
   8  # Whether to enable support for RDP.
   9 -RDP_DEPS="freerdp x11"
  10 +RDP_DEPS="freerdp2 x11"
  11  AC_ARG_ENABLE([rdp],
  12    [AS_HELP_STRING([--disable-rdp],
  13      [Disable Remote Desktop Protocol (RDP) support])])
  14 @@ -66,7 +66,7 @@ AC_ARG_ENABLE([rdp],
  15  AS_IF([test "x$enable_rdp" != "xno"],
  16    [PKG_CHECK_EXISTS([$RDP_DEPS],
  17      [have_rdp=yes
  18 -     PKG_CHECK_EXISTS(freerdp >= 1.1,
  19 +     PKG_CHECK_EXISTS(freerdp2 >= 1.1,
  20         [AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [])],
  21      [have_rdp=no])],
  22    [have_rdp=no])
  23 diff --git c/plugins/rdp/vinagre-rdp-tab.c i/plugins/rdp/vinagre-rdp-tab.c
  24 index b731f9b20ec910cc..13100de3dc0e07e1 100644
  25 --- c/plugins/rdp/vinagre-rdp-tab.c
  26 +++ i/plugins/rdp/vinagre-rdp-tab.c
  27 @@ -476,16 +476,17 @@ frdp_drawing_area_draw (GtkWidget *area,
  28    return TRUE;
  29  }
  30
  31 -static void
  32 +static BOOL
  33  frdp_begin_paint (rdpContext *context)
  34  {
  35    rdpGdi *gdi = context->gdi;
  36
  37    gdi->primary->hdc->hwnd->invalid->null = 1;
  38    gdi->primary->hdc->hwnd->ninvalid = 0;
  39 +  return TRUE;
  40  }
  41
  42 -static void
  43 +static BOOL
  44  frdp_end_paint (rdpContext *context)
  45  {
  46    VinagreRdpTab        *rdp_tab = ((frdpContext *) context)->rdp_tab;
  47 @@ -495,7 +496,7 @@ frdp_end_paint (rdpContext *context)
  48    gint                  x, y, w, h;
  49
  50    if (gdi->primary->hdc->hwnd->invalid->null)
  51 -    return;
  52 +    return TRUE;
  53
  54    x = gdi->primary->hdc->hwnd->invalid->x;
  55    y = gdi->primary->hdc->hwnd->invalid->y;
  56 @@ -517,6 +518,7 @@ frdp_end_paint (rdpContext *context)
  57      {
  58        gtk_widget_queue_draw_area (priv->display, x, y, w, h);
  59      }
  60 +  return TRUE;
  61  }
  62
  63  static BOOL
  64 @@ -587,15 +589,7 @@ frdp_post_connect (freerdp *instance)
  65    rdpGdi               *gdi;
  66    int                   stride;
  67
  68 -  gdi_init (instance,
  69 -#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \
  70 -    !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && \
  71 -    FREERDP_VERSION_MINOR >= 2))
  72 -                    CLRBUF_24BPP,
  73 -#else
  74 -                    CLRBUF_32BPP,
  75 -#endif
  76 -                    NULL);
  77 +  gdi_init (instance, PIXEL_FORMAT_BGRA32);
  78    gdi = instance->context->gdi;
  79
  80    instance->update->BeginPaint = frdp_begin_paint;
  81 @@ -934,11 +928,13 @@ frdp_authenticate (freerdp  *instance,
  82    return TRUE;
  83  }
  84
  85 -static BOOL
  86 +static DWORD
  87  frdp_certificate_verify (freerdp *instance,
  88 -                         char    *subject,
  89 -                         char    *issuer,
  90 -                         char    *fingerprint)
  91 +                         const char *common_name,
  92 +                         const char *subject,
  93 +                         const char *issuer,
  94 +                         const char *fingerprint,
  95 +                         BOOL host_mismatch)
  96  {
  97    VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab);
  98    GtkBuilder *builder;
  99 @@ -968,17 +964,20 @@ frdp_certificate_verify (freerdp *instance,
 100    gtk_widget_hide (dialog);
 101
 102
 103 -  return response == GTK_RESPONSE_YES;
 104 +  return (response == GTK_RESPONSE_YES) ? 1 : 0;
 105  }
 106
 107
 108  #if HAVE_FREERDP_1_1
 109 -static BOOL
 110 +static DWORD
 111  frdp_changed_certificate_verify (freerdp *instance,
 112 -                                 char    *subject,
 113 -                                 char    *issuer,
 114 -                                 char    *new_fingerprint,
 115 -                                 char    *old_fingerprint)
 116 +                                 const char *common_name,
 117 +                                 const char *subject,
 118 +                                 const char *issuer,
 119 +                                 const char *new_fingerprint,
 120 +                                 const char *old_subject,
 121 +                                 const char *old_issuer,
 122 +                                 const char *old_fingerprint)
 123  {
 124    VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab);
 125    GtkBuilder *builder;
 126 @@ -1023,7 +1022,7 @@ frdp_changed_certificate_verify (freerdp *instance,
 127    gtk_widget_hide (dialog);
 128
 129
 130 -  return response == GTK_RESPONSE_YES;
 131 +  return (response == GTK_RESPONSE_YES) ? 1 : 0;
 132  }
 133  #endif
 134