Merge lp:~bratsche/appmenu-gtk/checkboxes into lp:appmenu-gtk/0.4

Proposed by Cody Russell
Status: Merged
Merged at revision: 16
Proposed branch: lp:~bratsche/appmenu-gtk/checkboxes
Merge into: lp:appmenu-gtk/0.4
Diff against target: 41 lines (+24/-0)
1 file modified
src/bridge.c (+24/-0)
To merge this branch: bzr merge lp:~bratsche/appmenu-gtk/checkboxes
Reviewer Review Type Date Requested Status
David Barth (community) Approve
Review via email: mp+27171@code.launchpad.net
To post a comment you must log in.
Revision history for this message
David Barth (dbarth) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/bridge.c'
2--- src/bridge.c 2010-06-06 20:07:05 +0000
3+++ src/bridge.c 2010-06-09 15:14:31 +0000
4@@ -249,6 +249,14 @@
5 }
6
7 static void
8+checkbox_toggled (GtkWidget *widget, DbusmenuMenuitem *mi)
9+{
10+ dbusmenu_menuitem_property_set_int (mi,
11+ DBUSMENU_MENUITEM_PROP_TOGGLE_STATE,
12+ gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget)) ? DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED : DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED);
13+}
14+
15+static void
16 app_menu_bridge_insert (GtkMenuProxy *proxy,
17 GtkWidget *parent,
18 GtkWidget *child,
19@@ -330,6 +338,22 @@
20 }
21 else
22 {
23+ if (GTK_IS_CHECK_MENU_ITEM (child))
24+ {
25+ dbusmenu_menuitem_property_set (item,
26+ DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE,
27+ GTK_IS_RADIO_MENU_ITEM (child) ? DBUSMENU_MENUITEM_TOGGLE_RADIO : DBUSMENU_MENUITEM_TOGGLE_CHECK);
28+
29+ dbusmenu_menuitem_property_set_int (item,
30+ DBUSMENU_MENUITEM_PROP_TOGGLE_STATE,
31+ gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (child)) ? DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED : DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED);
32+
33+ g_signal_connect (child,
34+ "toggled",
35+ G_CALLBACK (checkbox_toggled),
36+ item);
37+ }
38+
39 dbusmenu_menuitem_property_set (item,
40 "label",
41 get_menu_label_text (child));

Subscribers

People subscribed via source and target branches