AppMenu GTK+

Merge lp:~bratsche/appmenu-gtk/watch-gtkaction-sensitivity-change into lp:appmenu-gtk/0.4

  1. watch-gtkaction-sensitivity-change
  2. Merge into trunk
Proposed by Cody Russell
Status: Merged
Merged at revision: 98
Proposed branch: lp:~bratsche/appmenu-gtk/watch-gtkaction-sensitivity-change
Merge into: lp:appmenu-gtk/0.4
Diff against target: 30 lines (+8/-2)
2 files modified
configure.ac (+1/-1)
src/bridge.c (+7/-1)
To merge this branch: bzr merge lp:~bratsche/appmenu-gtk/watch-gtkaction-sensitivity-change
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+36487@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) :
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 2010-09-09 15:00:24 +0000
3+++ configure.ac 2010-09-23 18:52:15 +0000
4@@ -1,6 +1,6 @@
5 AC_PREREQ(2.59)
6
7-AC_INIT([appmenu-gtk], [0.1.8], [crussell@canonical.com])
8+AC_INIT([appmenu-gtk], [0.1.9], [crussell@canonical.com])
9 AC_COPYRIGHT([Copyright 2010 Canonical])
10 AC_CONFIG_SRCDIR([src/bridge.c])
11 AC_CONFIG_MACRO_DIR([build/autotools])
12
13=== modified file 'src/bridge.c'
14--- src/bridge.c 2010-09-13 15:28:34 +0000
15+++ src/bridge.c 2010-09-23 18:52:15 +0000
16@@ -673,7 +673,13 @@
17 {
18 DbusmenuMenuitem *mi = (DbusmenuMenuitem *)data;
19
20- if (pspec->name == g_intern_static_string ("active"))
21+ if (pspec->name == g_intern_static_string ("sensitive"))
22+ {
23+ dbusmenu_menuitem_property_set_bool (mi,
24+ DBUSMENU_MENUITEM_PROP_ENABLED,
25+ gtk_action_is_visible (action));
26+ }
27+ else if (pspec->name == g_intern_static_string ("active"))
28 {
29 dbusmenu_menuitem_property_set_bool (mi,
30 DBUSMENU_MENUITEM_PROP_TOGGLE_STATE,

Subscribers

People subscribed via source and target branches