Merge lp:~ted/libdbusmenu/lp870742 into lp:libdbusmenu/0.5

[Ted Gould]

[Conor Curran (cjcurran)]

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2011-09-29 19:34:08 +0000
+++ configure.ac	2011-11-14 20:45:26 +0000
@@ -1,11 +1,11 @@
 
-AC_INIT(libdbusmenu, 0.5.0, [e-mail])
+AC_INIT(libdbusmenu, 0.5.1, [e-mail])
 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
 
 AC_PREREQ(2.62)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 0.5.0, [-Wno-portability])
+AM_INIT_AUTOMAKE(libdbusmenu, 0.5.1, [-Wno-portability])
 
 AM_MAINTAINER_MODE
 
@@ -172,7 +172,7 @@
 ###########################
 
 LIBDBUSMENU_CURRENT=4
-LIBDBUSMENU_REVISION=5
+LIBDBUSMENU_REVISION=6
 LIBDBUSMENU_AGE=0
 
 AC_SUBST(LIBDBUSMENU_CURRENT)
 
=== modified file 'libdbusmenu-gtk/parser.c'
--- libdbusmenu-gtk/parser.c	2011-09-19 18:07:27 +0000
+++ libdbusmenu-gtk/parser.c	2011-11-14 20:45:26 +0000
@@ -1059,8 +1059,13 @@
                                            DBUSMENU_MENUITEM_PROP_VISIBLE,
                                            g_value_get_boolean (&prop_value));
     }
-  else if (pspec->name == g_intern_static_string ("image") ||
-           pspec->name == g_intern_static_string ("always-show-image"))
+  else if (pspec->name == g_intern_static_string ("always-show-image"))
+    {
+      GtkWidget *image = NULL;
+      g_object_get(widget, "image", &image, NULL);
+      update_icon (child, GTK_IMAGE(image));
+    }
+  else if (pspec->name == g_intern_static_string ("image"))
     {
       GtkWidget *image;
       image = GTK_WIDGET (g_value_get_object (&prop_value));