Merge lp:~attente/unity-gtk-module/only-noun-icons into lp:unity-gtk-module/13.10

[William Hua]

We no longer export verb icons in the menus. Only export potential noun icons that would appear in a GtkImage of a non-GtkImageMenuItem.

We no longer export verb icons in the menus. Only export potential noun icons that would appear in a GtkImage of a non-GtkImageMenuItem.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

Looks good to me. Thanks, Will.

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-07-02 19:38:34 +0000
@@ -24,6 +24,76 @@
                unity_gtk_menu_item,
                G_TYPE_OBJECT);
 
+typedef struct _UnityGtkSearch UnityGtkSearch;
+
+struct _UnityGtkSearch
+{
+  GType    type;
+  guint    index;
+  GObject *object;
+};
+
+static void
+g_object_get_nth_object (GObject  *object,
+                         gpointer  data)
+{
+  UnityGtkSearch *search = data;
+
+  g_return_if_fail (G_IS_OBJECT (object));
+
+  if (search->object == NULL)
+    {
+      if (g_type_is_a (G_OBJECT_TYPE (object), search->type))
+        {
+          if (search->index == 0)
+            search->object = object;
+          else
+            search->index--;
+        }
+
+      if (search->object == NULL && GTK_IS_CONTAINER (object))
+        gtk_container_forall (GTK_CONTAINER (object), (GtkCallback) g_object_get_nth_object, data);
+    }
+}
+
+const gchar *
+gtk_menu_item_get_nth_label (GtkMenuItem *menu_item,
+                             guint        index)
+{
+  UnityGtkSearch search;
+  const gchar *label = NULL;
+
+  g_return_val_if_fail (GTK_IS_MENU_ITEM (menu_item), NULL);
+
+  search.type = GTK_TYPE_LABEL;
+  search.index = index;
+  search.object = NULL;
+
+  g_object_get_nth_object (G_OBJECT (menu_item), &search);
+
+  if (search.object != NULL)
+    label = gtk_label_get_label (GTK_LABEL (search.object));
+
+  return label != NULL && label[0] != '\0' ? label : NULL;
+}
+
+static GtkImage *
+gtk_menu_item_get_nth_image (GtkMenuItem *menu_item,
+                             guint        index)
+{
+  UnityGtkSearch search;
+
+  g_return_val_if_fail (GTK_IS_MENU_ITEM (menu_item), NULL);
+
+  search.type = GTK_TYPE_IMAGE;
+  search.index = index;
+  search.object = NULL;
+
+  g_object_get_nth_object (G_OBJECT (menu_item), &search);
+
+  return search.object != NULL ? GTK_IMAGE (search.object) : NULL;
+}
+
 static GIcon *
 gtk_image_get_icon (GtkImage *image)
 {
@@ -409,12 +479,12 @@
 
   g_return_val_if_fail (UNITY_GTK_IS_MENU_ITEM (item), NULL);
 
-  if (GTK_IS_IMAGE_MENU_ITEM (item->menu_item))
+  if (item->menu_item != NULL && !GTK_IS_IMAGE_MENU_ITEM (item->menu_item))
     {
-      GtkWidget *image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (item->menu_item));
+      GtkImage *image = gtk_menu_item_get_nth_image (item->menu_item, 0);
 
-      if (GTK_IS_IMAGE (image))
-        icon = gtk_image_get_icon (GTK_IMAGE (image));
+      if (image != NULL)
+        icon = gtk_image_get_icon (image);
     }
 
   return icon;
@@ -519,53 +589,3 @@
 
   g_free (space);
 }
-
-typedef struct _UnityGtkSearch UnityGtkSearch;
-
-struct _UnityGtkSearch
-{
-  GtkLabel *label;
-  guint     index;
-};
-
-static void
-gtk_widget_get_nth_label (GtkWidget *widget,
-                          gpointer   data)
-{
-  UnityGtkSearch *search = data;
-
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
-  if (search->label == NULL)
-    {
-      if (GTK_IS_LABEL (widget))
-        {
-          if (search->index == 0)
-            search->label = GTK_LABEL (widget);
-          else
-            search->index--;
-        }
-      else if (GTK_IS_CONTAINER (widget))
-        gtk_container_forall (GTK_CONTAINER (widget), gtk_widget_get_nth_label, data);
-    }
-}
-
-const gchar *
-gtk_menu_item_get_nth_label (GtkMenuItem *menu_item,
-                             guint        index)
-{
-  UnityGtkSearch search;
-  const gchar *label = NULL;
-
-  g_return_val_if_fail (GTK_IS_MENU_ITEM (menu_item), NULL);
-
-  search.label = NULL;
-  search.index = index;
-
-  gtk_widget_get_nth_label (GTK_WIDGET (menu_item), &search);
-
-  if (search.label != NULL)
-    label = gtk_label_get_label (search.label);
-
-  return label != NULL && label[0] != '\0' ? label : NULL;
-}