diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2011-12-01 11:51:31 -0500 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2011-12-01 11:51:31 -0500 |
| commit | 5447fecdeb4a3dda31d951555420105fd31b178e (patch) | |
| tree | 907356e642556d159f8ccab32fb626d453474848 | |
| parent | 1cb81e3307686416a8e1f3ff2941fd23246b6671 (diff) | |
| parent | c60ab35eae0b3a41f78f95da84e21c604bc98d57 (diff) | |
| download | libdbusmenu-5447fecdeb4a3dda31d951555420105fd31b178e.tar.gz libdbusmenu-5447fecdeb4a3dda31d951555420105fd31b178e.tar.bz2 libdbusmenu-5447fecdeb4a3dda31d951555420105fd31b178e.zip | |
releasing version 0.5.1-0ubuntu2
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | libdbusmenu-gtk/parser.c | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 9ed20be..4428c75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libdbusmenu (0.5.1-0ubuntu2) precise; urgency=low + + * libdbusmenu-gtk/parser.c + - Don't try to get objects from boolean values. Handle the + 'always show image' property by getting the image from the object + and using that (LP: #870742) + + -- Ken VanDine <ken.vandine@canonical.com> Thu, 01 Dec 2011 11:07:36 -0500 + libdbusmenu (0.5.1-0ubuntu1) precise; urgency=low * New upstream release. diff --git a/libdbusmenu-gtk/parser.c b/libdbusmenu-gtk/parser.c index e988c62..92932c5 100644 --- a/libdbusmenu-gtk/parser.c +++ b/libdbusmenu-gtk/parser.c @@ -1059,8 +1059,13 @@ widget_notify_cb (GtkWidget *widget, 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)); |