Changeset 2177

Timestamp:

06/06/07 16:54:34 (6 years ago)

Author:

njp

Message:

Added some error checking

File:

• trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c (modified) (3 diffs)

trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c

@@ -190 +190 @@
     if ( !priv->background_pixbuf )
     {
-        gchar *filename;
-        if (filename = get_bg_pixmap_name (GTK_WIDGET (self)))
+        gchar *filename = NULL;
+        if ((filename = get_bg_pixmap_name (GTK_WIDGET (self))))
         {
           priv->background_pixbuf = gdk_pixbuf_new_from_file( filename, NULL);
@@ -212 +212 @@
         g_free (buttonfile);
     }
-    GdkPixbuf* pixbuf = gdk_pixbuf_scale_simple( priv->background_pixbuf, a->width, a->height, GDK_INTERP_BILINEAR );
+    GdkPixbuf* pixbuf = NULL;
     guint w = gdk_pixbuf_get_width( priv->button_pixbuf );
     guint h = gdk_pixbuf_get_height( priv->button_pixbuf );
@@ -218 +218 @@
     guint y = 0;
 
-    gdk_pixbuf_copy_area( priv->background_pixbuf, 0, 0, gdk_pixbuf_get_width( priv->background_pixbuf ), gdk_pixbuf_get_height( priv->background_pixbuf ), pixbuf, 0, 0 );
-
+    if (GDK_IS_PIXBUF (priv->background_pixbuf))
+    {
+        pixbuf = gdk_pixbuf_scale_simple( priv->background_pixbuf, 
+                                                     a->width, a->height,
+                                                     GDK_INTERP_BILINEAR );
+        gdk_pixbuf_copy_area( priv->background_pixbuf, 0, 0, 
+                              gdk_pixbuf_get_width( priv->background_pixbuf ),
+                              gdk_pixbuf_get_height( priv->background_pixbuf ),
+                              pixbuf, 0, 0 );
+    }
     guint composite_num;
     if ( maxButtonsPerPage == 0 )