# HG changeset patch # User Elliott Sales de Andrade # Date 1280457698 0 # Node ID 33d2caadee60a2f974cdcdf9e545943a5ff3bed8 # Parent 25d93d273e9cf4532777b5e8d686c5b631ba3ba2 So I only changed the obvious GdkGC use in the whiteboard. I think this should cover the rest this time. diff -r 25d93d273e9c -r 33d2caadee60 pidgin/gtkwhiteboard.c --- a/pidgin/gtkwhiteboard.c Wed Jul 28 04:51:24 2010 +0000 +++ b/pidgin/gtkwhiteboard.c Fri Jul 30 02:41:38 2010 +0000 @@ -353,8 +353,8 @@ static gboolean pidgin_whiteboard_configure_event(GtkWidget *widget, GdkEventConfigure *event, gpointer data) { PidginWhiteboard *gtkwb = (PidginWhiteboard*)data; - GdkPixmap *pixmap = gtkwb->pixmap; + cairo_t *cr; if(pixmap) g_object_unref(pixmap); @@ -363,15 +363,15 @@ widget->allocation.width, widget->allocation.height, -1); - gtkwb->pixmap = pixmap; - gdk_draw_rectangle(pixmap, - widget->style->white_gc, - TRUE, - 0, 0, - widget->allocation.width, - widget->allocation.height); + cr = gdk_cairo_create(GDK_DRAWABLE(pixmap)); + gdk_cairo_set_source_color(cr, &widget->style->white); + cairo_rectangle(cr, + 0, 0, + widget->allocation.width, widget->allocation.height); + cairo_fill(cr); + cairo_destroy(cr); return TRUE; } @@ -380,13 +380,15 @@ { PidginWhiteboard *gtkwb = (PidginWhiteboard*)(data); GdkPixmap *pixmap = gtkwb->pixmap; + cairo_t *cr; - gdk_draw_drawable(widget->window, - widget->style->fg_gc[GTK_WIDGET_STATE(widget)], - pixmap, - event->area.x, event->area.y, - event->area.x, event->area.y, - event->area.width, event->area.height); + cr = gdk_cairo_create(GDK_DRAWABLE(widget->window)); + gdk_cairo_set_source_pixmap(cr, pixmap, event->area.x, event->area.y); + cairo_rectangle(cr, + event->area.x, event->area.y, + event->area.width, event->area.height); + cairo_fill(cr); + cairo_destroy(cr); return FALSE; } @@ -710,13 +712,15 @@ PidginWhiteboard *gtkwb = wb->ui_data; GdkPixmap *pixmap = gtkwb->pixmap; GtkWidget *drawing_area = gtkwb->drawing_area; + cairo_t *cr = gdk_cairo_create(GDK_DRAWABLE(pixmap)); - gdk_draw_rectangle(pixmap, - drawing_area->style->white_gc, - TRUE, - 0, 0, - drawing_area->allocation.width, - drawing_area->allocation.height); + gdk_cairo_set_source_color(cr, &drawing_area->style->white); + cairo_rectangle(cr, + 0, 0, + drawing_area->allocation.width, + drawing_area->allocation.height); + cairo_fill(cr); + cairo_destroy(cr); gtk_widget_queue_draw_area(drawing_area, 0, 0,