Merge lp:~attente/unity-gtk-module/stock-image-items into lp:unity-gtk-module/13.10

[William Hua]

Handle GtkImageMenuItems with stock ids.

Handle GtkImageMenuItems with stock ids.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:296
http://jenkins.qa.ubuntu.com/job/unity-gtk-module-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-saucy-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-saucy-armhf-ci/4

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-gtk-module-ci/8/rebuild

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

+1

review: Approve

=== modified file 'lib/unity-gtk-menu-item.c'
--- lib/unity-gtk-menu-item.c	2013-06-17 17:32:33 +0000
+++ lib/unity-gtk-menu-item.c	2013-06-28 16:09:26 +0000
@@ -396,6 +396,22 @@
 
   label = gtk_menu_item_get_label (item->menu_item);
 
+  if (label != NULL && label[0] != '\0')
+    {
+      if (GTK_IS_IMAGE_MENU_ITEM (item->menu_item))
+        {
+          GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (item->menu_item);
+
+          if (gtk_image_menu_item_get_use_stock (image_menu_item))
+            {
+              GtkStockItem stock_item;
+
+              if (gtk_stock_lookup (label, &stock_item))
+                label = stock_item.label;
+            }
+        }
+    }
+
   if (label == NULL || label[0] == '\0')
     label = gtk_menu_item_get_nth_label (item->menu_item, 0);