summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-11-15 10:02:39 -0800
committerStefano Karapetsas <[email protected]>2013-11-15 10:02:39 -0800
commit0403454e7f3c456effaa8ae83fad4afa7dcca581 (patch)
tree8513ca11cabb670f486f9e5867c42e4154b5daaa /src
parentcf101a024b8749a1b2109e3a3b49a7a760124d2d (diff)
parent39f4aae72c83c5fa79b8ea84ac78e53a50d908ea (diff)
downloadmarco-0403454e7f3c456effaa8ae83fad4afa7dcca581.tar.bz2
marco-0403454e7f3c456effaa8ae83fad4afa7dcca581.tar.xz
Merge pull request #67 from ryandoyle/master
Regression fix and typo
Diffstat (limited to 'src')
-rw-r--r--src/ui/frames.c16
-rw-r--r--src/ui/tabpopup.c2
2 files changed, 9 insertions, 9 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);
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);