From 47c59747230a1d72f29c5784b069614ae388ed57 Mon Sep 17 00:00:00 2001 From: Ryan Doyle Date: Sat, 16 Nov 2013 00:43:46 +1100 Subject: As of 5804817, the call to generate_pixmap():2353 was changed to pass by reference. This broke the GTK2 implementation of generate_pixmap(). This commit updates the GTK2 function to work with the changes. --- src/ui/frames.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ui/frames.c b/src/ui/frames.c index 7b9a94bc..82bca2ab 100644 --- a/src/ui/frames.c +++ b/src/ui/frames.c @@ -2253,25 +2253,25 @@ generate_pixmap (MetaFrames *frames, static GdkPixmap * generate_pixmap (MetaFrames *frames, MetaUIFrame *frame, - MetaRectangle rect) + MetaRectangle *rect) { GdkRectangle rectangle; GdkRegion *region; GdkPixmap *result; /* do not create a pixmap for nonexisting areas */ - if (rect.width <= 0 || rect.height <= 0) + if (rect->width <= 0 || rect->height <= 0) return NULL; - rectangle.x = rect.x; - rectangle.y = rect.y; - rectangle.width = rect.width; - rectangle.height = rect.height; + rectangle.x = rect->x; + rectangle.y = rect->y; + rectangle.width = rect->width; + rectangle.height = rect->height; result = gdk_pixmap_new (frame->window, - rect.width, rect.height, -1); + rect->width, rect->height, -1); - clear_backing (result, frame->window, rect.x, rect.y); + clear_backing (result, frame->window, rect->x, rect->y); region = gdk_region_rectangle (&rectangle); -- cgit v1.2.1 From 39f4aae72c83c5fa79b8ea84ac78e53a50d908ea Mon Sep 17 00:00:00 2001 From: Ryan Doyle Date: Sat, 16 Nov 2013 00:57:53 +1100 Subject: Fix typo in function name --- src/ui/tabpopup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tabpopup.c b/src/ui/tabpopup.c index 76a299be..6cee30cd 100644 --- a/src/ui/tabpopup.c +++ b/src/ui/tabpopup.c @@ -786,7 +786,7 @@ meta_select_image_expose_event (GtkWidget *widget, cairo_t *cr; GtkAllocation allocation; - gtk_widgeT_get_allocation(widget, &allocation); + gtk_widget_get_allocation(widget, &allocation); misc = GTK_MISC (widget); -- cgit v1.2.1