mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-06 06:30:19 +00:00
951c1f5d1c
The offical GNOME 3.28 release notes can be found at https://help.gnome.org/misc/release-notes/3.28/ Thanks to Antoine Brodin for running the exp-runs. PR: 229761
113 lines
3.5 KiB
C
113 lines
3.5 KiB
C
https://bugzilla.gnome.org/show_bug.cgi?id=775616
|
|
|
|
--- plugins/rdp/vinagre-rdp-tab.c.orig 2016-12-30 22:55:41.353490000 +0100
|
|
+++ plugins/rdp/vinagre-rdp-tab.c 2016-12-30 22:55:49.312382000 +0100
|
|
@@ -476,16 +476,18 @@ frdp_drawing_area_draw (GtkWidget *area,
|
|
return TRUE;
|
|
}
|
|
|
|
-static void
|
|
+static BOOL
|
|
frdp_begin_paint (rdpContext *context)
|
|
{
|
|
rdpGdi *gdi = context->gdi;
|
|
|
|
gdi->primary->hdc->hwnd->invalid->null = 1;
|
|
gdi->primary->hdc->hwnd->ninvalid = 0;
|
|
+
|
|
+ return TRUE;
|
|
}
|
|
|
|
-static void
|
|
+static BOOL
|
|
frdp_end_paint (rdpContext *context)
|
|
{
|
|
VinagreRdpTab *rdp_tab = ((frdpContext *) context)->rdp_tab;
|
|
@@ -495,7 +497,7 @@ frdp_end_paint (rdpContext *context)
|
|
gint x, y, w, h;
|
|
|
|
if (gdi->primary->hdc->hwnd->invalid->null)
|
|
- return;
|
|
+ return FALSE;
|
|
|
|
x = gdi->primary->hdc->hwnd->invalid->x;
|
|
y = gdi->primary->hdc->hwnd->invalid->y;
|
|
@@ -517,6 +519,8 @@ frdp_end_paint (rdpContext *context)
|
|
{
|
|
gtk_widget_queue_draw_area (priv->display, x, y, w, h);
|
|
}
|
|
+
|
|
+ return TRUE;
|
|
}
|
|
|
|
static BOOL
|
|
@@ -591,11 +595,15 @@ frdp_post_connect (freerdp *instance)
|
|
#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \
|
|
!(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && \
|
|
FREERDP_VERSION_MINOR >= 2))
|
|
- CLRBUF_24BPP,
|
|
+ CLRBUF_24BPP, NULL
|
|
+#else
|
|
+#ifdef CLRBUF_32BPP
|
|
+ CLRBUF_32BPP, NULL
|
|
#else
|
|
- CLRBUF_32BPP,
|
|
+ PIXEL_FORMAT_BGRA32
|
|
#endif
|
|
- NULL);
|
|
+#endif
|
|
+ );
|
|
gdi = instance->context->gdi;
|
|
|
|
instance->update->BeginPaint = frdp_begin_paint;
|
|
@@ -862,7 +870,7 @@ frdp_mouse_moved (GtkWidget *widget
|
|
return TRUE;
|
|
}
|
|
|
|
-static gboolean
|
|
+static BOOL
|
|
frdp_authenticate (freerdp *instance,
|
|
char **username,
|
|
char **password,
|
|
@@ -934,11 +942,13 @@ frdp_authenticate (freerdp *instance,
|
|
return TRUE;
|
|
}
|
|
|
|
-static BOOL
|
|
-frdp_certificate_verify (freerdp *instance,
|
|
- char *subject,
|
|
- char *issuer,
|
|
- char *fingerprint)
|
|
+static DWORD
|
|
+frdp_certificate_verify (freerdp *instance,
|
|
+ const char *common_name,
|
|
+ const char *subject,
|
|
+ const char *issuer,
|
|
+ const char *fingerprint,
|
|
+ BOOL host_mismatch)
|
|
{
|
|
VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab);
|
|
GtkBuilder *builder;
|
|
@@ -973,12 +983,15 @@ frdp_certificate_verify (freerdp *instan
|
|
|
|
|
|
#if HAVE_FREERDP_1_1
|
|
-static BOOL
|
|
-frdp_changed_certificate_verify (freerdp *instance,
|
|
- char *subject,
|
|
- char *issuer,
|
|
- char *new_fingerprint,
|
|
- char *old_fingerprint)
|
|
+static DWORD
|
|
+frdp_changed_certificate_verify (freerdp *instance,
|
|
+ const char *common_name,
|
|
+ const char *subject,
|
|
+ const char *issuer,
|
|
+ const char *new_fingerprint,
|
|
+ const char *old_subject,
|
|
+ const char *old_issuer,
|
|
+ const char *old_fingerprint)
|
|
{
|
|
VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab);
|
|
GtkBuilder *builder;
|