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

Proposed by Ted Gould on 2011-11-14
Status: Merged
Merged at revision: 346
Proposed branch: lp:~ted/libdbusmenu/lp870742
Merge into: lp:libdbusmenu/0.5
Diff against target: 46 lines (+10/-5)
2 files modified
configure.ac (+3/-3)
libdbusmenu-gtk/parser.c (+7/-2)
To merge this branch: bzr merge lp:~ted/libdbusmenu/lp870742
Reviewer Review Type Date Requested Status
Conor Curran (community) 2011-11-14 Approve on 2011-11-29
Review via email: mp+82218@code.launchpad.net
To post a comment you must log in.
Conor Curran (cjcurran) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2011-09-29 19:34:08 +0000
3+++ configure.ac 2011-11-14 20:45:26 +0000
4@@ -1,11 +1,11 @@
5
6-AC_INIT(libdbusmenu, 0.5.0, ted@canonical.com)
7+AC_INIT(libdbusmenu, 0.5.1, ted@canonical.com)
8 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
9
10 AC_PREREQ(2.62)
11
12 AM_CONFIG_HEADER(config.h)
13-AM_INIT_AUTOMAKE(libdbusmenu, 0.5.0, [-Wno-portability])
14+AM_INIT_AUTOMAKE(libdbusmenu, 0.5.1, [-Wno-portability])
15
16 AM_MAINTAINER_MODE
17
18@@ -172,7 +172,7 @@
19 ###########################
20
21 LIBDBUSMENU_CURRENT=4
22-LIBDBUSMENU_REVISION=5
23+LIBDBUSMENU_REVISION=6
24 LIBDBUSMENU_AGE=0
25
26 AC_SUBST(LIBDBUSMENU_CURRENT)
27
28=== modified file 'libdbusmenu-gtk/parser.c'
29--- libdbusmenu-gtk/parser.c 2011-09-19 18:07:27 +0000
30+++ libdbusmenu-gtk/parser.c 2011-11-14 20:45:26 +0000
31@@ -1059,8 +1059,13 @@
32 DBUSMENU_MENUITEM_PROP_VISIBLE,
33 g_value_get_boolean (&prop_value));
34 }
35- else if (pspec->name == g_intern_static_string ("image") ||
36- pspec->name == g_intern_static_string ("always-show-image"))
37+ else if (pspec->name == g_intern_static_string ("always-show-image"))
38+ {
39+ GtkWidget *image = NULL;
40+ g_object_get(widget, "image", &image, NULL);
41+ update_icon (child, GTK_IMAGE(image));
42+ }
43+ else if (pspec->name == g_intern_static_string ("image"))
44 {
45 GtkWidget *image;
46 image = GTK_WIDGET (g_value_get_object (&prop_value));

Subscribers

People subscribed via source and target branches