Merge pull request #67 from ryandoyle/master

Regression fix and typo

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);