diff -r ee3bd4532a33 -r 07dcc28b6039 pidgin/gtkwhiteboard.c --- a/pidgin/gtkwhiteboard.c Wed Dec 16 00:35:23 2015 -0800 +++ b/pidgin/gtkwhiteboard.c Sun Dec 20 20:46:34 2015 -0800 @@ -87,11 +87,6 @@ static gboolean pidgin_whiteboard_draw_event(GtkWidget *widget, cairo_t *cr, gpointer _gtkwb); -#if !GTK_CHECK_VERSION(3,0,0) -static gboolean -pidgin_whiteboard_expose_event(GtkWidget *widget, GdkEventExpose *event, - gpointer _gtkwb); -#endif static gboolean pidgin_whiteboard_brush_down(GtkWidget *widget, GdkEventButton *event, gpointer data); static gboolean pidgin_whiteboard_brush_motion(GtkWidget *widget, GdkEventMotion *event, gpointer data); @@ -219,19 +214,11 @@ gtk_widget_show(drawing_area); /* Signals used to handle backing pixmap */ -#if GTK_CHECK_VERSION(3,0,0) g_signal_connect(G_OBJECT(drawing_area), "draw", G_CALLBACK(pidgin_whiteboard_draw_event), gtkwb); g_signal_connect(G_OBJECT(drawing_area), "configure-event", G_CALLBACK(pidgin_whiteboard_configure_event), gtkwb); -#else - g_signal_connect(G_OBJECT(drawing_area), "expose_event", - G_CALLBACK(pidgin_whiteboard_expose_event), gtkwb); - - g_signal_connect(G_OBJECT(drawing_area), "configure_event", - G_CALLBACK(pidgin_whiteboard_configure_event), gtkwb); -#endif /* Event signals */ g_signal_connect(G_OBJECT(drawing_area), "button_press_event", @@ -389,9 +376,7 @@ PidginWhiteboard *gtkwb = (PidginWhiteboard*)data; cairo_t *cr; GtkAllocation allocation; -#if GTK_CHECK_VERSION(3,0,0) GdkRGBA white = {1.0, 1.0, 1.0, 1.0}; -#endif if (gtkwb->priv->cr) cairo_destroy(gtkwb->priv->cr); @@ -403,11 +388,7 @@ gtkwb->priv->surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24, allocation.width, allocation.height); gtkwb->priv->cr = cr = cairo_create(gtkwb->priv->surface); -#if GTK_CHECK_VERSION(3,0,0) gdk_cairo_set_source_rgba(cr, &white); -#else - gdk_cairo_set_source_color(cr, >k_widget_get_style(widget)->white); -#endif cairo_rectangle(cr, 0, 0, allocation.width, allocation.height); cairo_fill(cr); @@ -426,23 +407,6 @@ return FALSE; } -#if !GTK_CHECK_VERSION(3,0,0) -static gboolean -pidgin_whiteboard_expose_event(GtkWidget *widget, GdkEventExpose *event, - gpointer _gtkwb) -{ - cairo_t *cr; - - cr = gdk_cairo_create(GDK_DRAWABLE(widget->window)); - - pidgin_whiteboard_draw_event(widget, cr, _gtkwb); - - cairo_destroy(cr); - - return FALSE; -} -#endif - static gboolean pidgin_whiteboard_brush_down(GtkWidget *widget, GdkEventButton *event, gpointer data) { PidginWhiteboard *gtkwb = (PidginWhiteboard*)data; @@ -502,12 +466,8 @@ GList *draw_list = purple_whiteboard_get_draw_list(wb); if(event->is_hint) -#if GTK_CHECK_VERSION(3,0,0) gdk_window_get_device_position(event->window, event->device, &x, &y, &state); -#else - gdk_window_get_pointer(event->window, &x, &y, &state); -#endif else { x = event->x; @@ -645,22 +605,16 @@ GtkWidget *widget = gtkwb->drawing_area; cairo_t *gfx_con = gtkwb->priv->cr; GdkColor col; -#if GTK_CHECK_VERSION(3,0,0) GdkRGBA rgba; -#endif /* Interpret and convert color */ pidgin_whiteboard_rgb24_to_rgb48(color, &col); -#if GTK_CHECK_VERSION(3,0,0) rgba.red = col.red / 0xffff; rgba.green = col.green / 0xffff; rgba.blue = col.blue / 0xffff; rgba.alpha = 1.0; gdk_cairo_set_source_rgba(gfx_con, &rgba); -#else - gdk_cairo_set_source_color(gfx_con, &col); -#endif /* Draw a circle */ cairo_arc(gfx_con, @@ -763,18 +717,11 @@ GtkWidget *drawing_area = gtkwb->drawing_area; cairo_t *cr = gtkwb->priv->cr; GtkAllocation allocation; -#if GTK_CHECK_VERSION(3,0,0) GdkRGBA white = {1.0, 1.0, 1.0, 1.0}; -#endif gtk_widget_get_allocation(drawing_area, &allocation); -#if GTK_CHECK_VERSION(3,0,0) gdk_cairo_set_source_rgba(cr, &white); -#else - gdk_cairo_set_source_color(cr, - >k_widget_get_style(drawing_area)->white); -#endif cairo_rectangle(cr, 0, 0, allocation.width, allocation.height); cairo_fill(cr);