ayatana-commits team mailing list archive

[Cody Russell <crussell@xxxxxxxxxxxxx>]

Cody Russell has proposed merging lp:~bratsche/appmenu-gtk/image-check into lp:appmenu-gtk.

Requested reviews:
  Canonical Desktop Experience Team (canonical-dx-team)
Related bugs:
  #603152 Getting lots of command-line errors when running GIMP
  https://bugs.launchpad.net/bugs/603152

-- 
https://code.launchpad.net/~bratsche/appmenu-gtk/image-check/+merge/29466
Your team ayatana-commits is subscribed to branch lp:appmenu-gtk.

=== modified file 'src/bridge.c'
--- src/bridge.c	2010-07-07 20:38:35 +0000
+++ src/bridge.c	2010-07-08 13:37:34 +0000
@@ -608,21 +608,25 @@
               GtkImageType image_type;
 
               image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (widget));
-              image_type = gtk_image_get_storage_type (GTK_IMAGE (image));
-
-              if (image_type == GTK_IMAGE_STOCK)
-                {
-                  label_set = update_stock_item (mi, image);
-                }
-              else if (image_type == GTK_IMAGE_ICON_NAME)
-                {
-                  update_icon_name (mi, image);
-                }
-              else if (image_type == GTK_IMAGE_PIXBUF)
-                {
-                  dbusmenu_menuitem_property_set_image (mi,
-                                                        DBUSMENU_MENUITEM_PROP_ICON_DATA,
-                                                        gtk_image_get_pixbuf (GTK_IMAGE (image)));
+
+              if (GTK_IS_IMAGE (image))
+                {
+                  image_type = gtk_image_get_storage_type (GTK_IMAGE (image));
+
+                  if (image_type == GTK_IMAGE_STOCK)
+                    {
+                      label_set = update_stock_item (mi, image);
+                    }
+                  else if (image_type == GTK_IMAGE_ICON_NAME)
+                    {
+                      update_icon_name (mi, image);
+                    }
+                  else if (image_type == GTK_IMAGE_PIXBUF)
+                    {
+                      dbusmenu_menuitem_property_set_image (mi,
+                                                            DBUSMENU_MENUITEM_PROP_ICON_DATA,
+                                                            gtk_image_get_pixbuf (GTK_IMAGE (image)));
+                    }
                 }
             }