Merge lp:~larsu/ido/update-icon into lp:ido/14.04

[Lars Karlitski]

idobasicmenuitem: update icon when the theme changes

idobasicmenuitem: update icon when the theme changes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:181
http://jenkins.qa.ubuntu.com/job/ido-ci/63/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ido-trusty-amd64-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ido-trusty-armhf-ci/21/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ido-ci/63/rebuild

review: Needs Fixing (continuous-integration)

[lp:~larsu/ido/update-icon]

182. By Lars Karlitski on 2014-04-04

idobasicmenuitem: don't export update_image()

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:182
http://jenkins.qa.ubuntu.com/job/ido-ci/64/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-trusty-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-trusty-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/ido-trusty-armhf-ci/22/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ido-ci/64/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Looks good.

Omitting top approval only to wait for Jenkins

review: Approve

=== modified file 'src/idobasicmenuitem.c'
--- src/idobasicmenuitem.c	2014-03-28 10:27:12 +0000
+++ src/idobasicmenuitem.c	2014-04-04 17:37:51 +0000
@@ -136,6 +136,50 @@
   G_OBJECT_CLASS (ido_basic_menu_item_parent_class)->finalize (object);
 }
 
+static void
+ido_basic_menu_item_update_image (IdoBasicMenuItem *self)
+{
+  IdoBasicMenuItemPrivate * p = self->priv;
+
+  gtk_image_clear (GTK_IMAGE (p->image));
+
+  if (p->icon == NULL)
+    {
+      gtk_widget_set_visible (p->image, FALSE);
+    }
+  else
+    {
+      GtkIconInfo *info;
+      const gchar *filename;
+
+      info = gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default (), p->icon, 16, 0);
+      filename = gtk_icon_info_get_filename (info);
+
+      if (filename)
+        {
+          GdkPixbuf *pixbuf;
+
+          pixbuf = gdk_pixbuf_new_from_file_at_scale (filename, -1, 16, TRUE, NULL);
+          gtk_image_set_from_pixbuf (GTK_IMAGE (p->image), pixbuf);
+
+          g_object_unref (pixbuf);
+        }
+
+      gtk_widget_set_visible (p->image, filename != NULL);
+
+      g_object_unref (info);
+    }
+}
+
+static void
+ido_basic_menu_item_style_updated (GtkWidget *widget)
+{
+  GTK_WIDGET_CLASS (ido_basic_menu_item_parent_class)->style_updated (widget);
+
+  ido_basic_menu_item_update_image (IDO_BASIC_MENU_ITEM (widget));
+  gtk_widget_queue_draw (widget);
+}
+
 /***
 ****  Instantiation
 ***/
@@ -145,6 +189,7 @@
 {
   GParamFlags prop_flags;
   GObjectClass * gobject_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
   g_type_class_add_private (klass, sizeof (IdoBasicMenuItemPrivate));
 
@@ -153,6 +198,8 @@
   gobject_class->dispose = my_dispose;
   gobject_class->finalize = my_finalize;
 
+  widget_class->style_updated = ido_basic_menu_item_style_updated;
+
   prop_flags = G_PARAM_CONSTRUCT
              | G_PARAM_READWRITE
              | G_PARAM_STATIC_STRINGS;
@@ -244,37 +291,11 @@
 
   if (p->icon != icon)
     {
-      g_clear_object (&p->icon);
-      gtk_image_clear (GTK_IMAGE(p->image));
-
-      if (icon == NULL)
-        {
-          gtk_widget_set_visible (p->image, FALSE);
-        }
-      else
-        {
-          GtkIconInfo *info;
-          const gchar *filename;
-
-          p->icon = g_object_ref (icon);
-
-          info = gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default (), p->icon, 16, 0);
-          filename = gtk_icon_info_get_filename (info);
-
-          if (filename)
-            {
-              GdkPixbuf *pixbuf;
-
-              pixbuf = gdk_pixbuf_new_from_file_at_scale (filename, -1, 16, TRUE, NULL);
-              gtk_image_set_from_pixbuf (GTK_IMAGE(p->image), pixbuf);
-
-              g_object_unref (pixbuf);
-            }
-
-          gtk_widget_set_visible (p->image, filename != NULL);
-
-          g_object_unref (info);
-        }
+      if (p->icon)
+        g_object_unref (p->icon);
+
+      p->icon = icon ? g_object_ref (icon) : NULL;
+      ido_basic_menu_item_update_image (self);
     }
 }