Attachment #472588 for bug #609474




  return TRUE;
}

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 BOOL
frdp_end_paint (rdpContext *context)
{
  VinagreRdpTab        *rdp_tab = ((frdpContext *) context)->rdp_tab;

  gint                  x, y, w, h;

  if (gdi->primary->hdc->hwnd->invalid->null)
    return TRUE;

  x = gdi->primary->hdc->hwnd->invalid->x;
  y = gdi->primary->hdc->hwnd->invalid->y;

    {
      gtk_widget_queue_draw_area (priv->display, x, y, w, h);
    }
  return TRUE;
}

static BOOL

  rdpGdi               *gdi;
  int                   stride;

  gdi_init (instance, PIXEL_FORMAT_BGRA32);
#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;

  return TRUE;
}

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;

  gtk_widget_hide (dialog);


  return (response == GTK_RESPONSE_YES) ? 1 : 0;
}


#if HAVE_FREERDP_1_1
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;

  gtk_widget_hide (dialog);


  return (response == GTK_RESPONSE_YES) ? 1 : 0;
}
#endif

Return to bug 609474

Lines 476-491 frdp_drawing_area_draw (GtkWidget *area, Link Here

(-)c/plugins/rdp/vinagre-rdp-tab.c (-23 / +22 lines)
476	return TRUE;	476	return TRUE;
477	}	477	}
478		478
479	static void	479	static BOOL
480	frdp_begin_paint (rdpContext *context)	480	frdp_begin_paint (rdpContext *context)
481	{	481	{
482	rdpGdi *gdi = context->gdi;	482	rdpGdi *gdi = context->gdi;
483		483
484	gdi->primary->hdc->hwnd->invalid->null = 1;	484	gdi->primary->hdc->hwnd->invalid->null = 1;
485	gdi->primary->hdc->hwnd->ninvalid = 0;	485	gdi->primary->hdc->hwnd->ninvalid = 0;
		486	return TRUE;
486	}	487	}
487		488
488	static void	489	static BOOL
489	frdp_end_paint (rdpContext *context)	490	frdp_end_paint (rdpContext *context)
490	{	491	{
491	VinagreRdpTab rdp_tab = ((frdpContext ) context)->rdp_tab;	492	VinagreRdpTab rdp_tab = ((frdpContext ) context)->rdp_tab;
Lines 495-501 frdp_end_paint (rdpContext *context) Link Here
495	gint x, y, w, h;	496	gint x, y, w, h;
496		497
497	if (gdi->primary->hdc->hwnd->invalid->null)	498	if (gdi->primary->hdc->hwnd->invalid->null)
498	return;	499	return TRUE;
499		500
500	x = gdi->primary->hdc->hwnd->invalid->x;	501	x = gdi->primary->hdc->hwnd->invalid->x;
501	y = gdi->primary->hdc->hwnd->invalid->y;	502	y = gdi->primary->hdc->hwnd->invalid->y;
Lines 517-522 frdp_end_paint (rdpContext *context) Link Here
517	{	518	{
518	gtk_widget_queue_draw_area (priv->display, x, y, w, h);	519	gtk_widget_queue_draw_area (priv->display, x, y, w, h);
519	}	520	}
		521	return TRUE;
520	}	522	}
521		523
522	static BOOL	524	static BOOL
Lines 587-601 frdp_post_connect (freerdp *instance) Link Here
587	rdpGdi *gdi;	589	rdpGdi *gdi;
588	int stride;	590	int stride;
589		591
590	gdi_init (instance,	592	gdi_init (instance, PIXEL_FORMAT_BGRA32);
591	#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \
592	!(FREERDP_VERSION_MAJOR > 1 \|\| (FREERDP_VERSION_MAJOR == 1 && \
593	FREERDP_VERSION_MINOR >= 2))
594	CLRBUF_24BPP,
595	#else
596	CLRBUF_32BPP,
597	#endif
598	NULL);
599	gdi = instance->context->gdi;	593	gdi = instance->context->gdi;
600		594
601	instance->update->BeginPaint = frdp_begin_paint;	595	instance->update->BeginPaint = frdp_begin_paint;
Lines 934-944 frdp_authenticate (freerdp *instance, Link Here
934	return TRUE;	928	return TRUE;
935	}	929	}
936		930
937	static BOOL	931	static DWORD
938	frdp_certificate_verify (freerdp *instance,	932	frdp_certificate_verify (freerdp *instance,
939	char *subject,	933	const char *common_name,
940	char *issuer,	934	const char *subject,
941	char *fingerprint)	935	const char *issuer,
		936	const char *fingerprint,
		937	BOOL host_mismatch)
942	{	938	{
943	VinagreTab tab = VINAGRE_TAB (((frdpContext ) instance->context)->rdp_tab);	939	VinagreTab tab = VINAGRE_TAB (((frdpContext ) instance->context)->rdp_tab);
944	GtkBuilder *builder;	940	GtkBuilder *builder;
Lines 968-984 frdp_certificate_verify (freerdp *instance, Link Here
968	gtk_widget_hide (dialog);	964	gtk_widget_hide (dialog);
969		965
970		966
971	return response == GTK_RESPONSE_YES;	967	return (response == GTK_RESPONSE_YES) ? 1 : 0;
972	}	968	}
973		969
974		970
975	#if HAVE_FREERDP_1_1	971	#if HAVE_FREERDP_1_1
976	static BOOL	972	static DWORD
977	frdp_changed_certificate_verify (freerdp *instance,	973	frdp_changed_certificate_verify (freerdp *instance,
978	char *subject,	974	const char *common_name,
979	char *issuer,	975	const char *subject,
980	char *new_fingerprint,	976	const char *issuer,
981	char *old_fingerprint)	977	const char *new_fingerprint,
		978	const char *old_subject,
		979	const char *old_issuer,
		980	const char *old_fingerprint)
982	{	981	{
983	VinagreTab tab = VINAGRE_TAB (((frdpContext ) instance->context)->rdp_tab);	982	VinagreTab tab = VINAGRE_TAB (((frdpContext ) instance->context)->rdp_tab);
984	GtkBuilder *builder;	983	GtkBuilder *builder;
Lines 1023-1029 frdp_changed_certificate_verify (freerdp *instance, Link Here
1023	gtk_widget_hide (dialog);	1022	gtk_widget_hide (dialog);
1024		1023
1025		1024
1026	return response == GTK_RESPONSE_YES;	1025	return (response == GTK_RESPONSE_YES) ? 1 : 0;
1027	}	1026	}
1028	#endif	1027	#endif