styleproperties: Add a hacky function to redirect color lookups

[~andy/gtk] / gtk / gtkquartz.c

diff --git a/gtk/gtkquartz.c b/gtk/gtkquartz.c
index 3b9558d387ee6edc5c171f47469613eebf00bdc8..e98dbb4527642b3b861af984da6c7ad2f9fa9a3f 100644 (file)
--- a/gtk/gtkquartz.c
+++ b/gtk/gtkquartz.c
@@ -39,7 +39,7 @@ _gtk_quartz_create_image_from_pixbuf (GdkPixbuf *pixbuf)
 
   pixbuf_width = gdk_pixbuf_get_width (pixbuf);
   pixbuf_height = gdk_pixbuf_get_height (pixbuf);
-  g_return_val_if_fail (pixbuf_width == 0 && pixbuf_height == 0, NULL);
+  g_return_val_if_fail (pixbuf_width != 0 && pixbuf_height != 0, NULL);
   rowstride = gdk_pixbuf_get_rowstride (pixbuf);
   has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
 
@@ -60,10 +60,11 @@ _gtk_quartz_create_image_from_pixbuf (GdkPixbuf *pixbuf)
 
   nsimage = [[NSImage alloc] initWithSize:NSMakeSize (pixbuf_width, pixbuf_height)];
   nsimage_size = [nsimage size];
-  if (size.width == 0.0 && size.height == 0.0)
+  if (nsimage_size.width == 0.0 && nsimage_size.height == 0.0)
     {
       [nsimage release];
-      g_return_val_if_fail (FALSE, NULL);
+      g_critical ("%s returned a zero-sized image", G_STRFUNC);
+      return NULL;
     }
   [nsimage lockFocus];