Merge lp:~a-j-buxton/libdbusmenu/gtk2signalfix into lp:libdbusmenu/13.10

Proposed by Ted Gould on 2013-11-04
Status: Merged
Approved by: Ted Gould on 2013-11-04
Approved revision: 462
Merged at revision: 462
Proposed branch: lp:~a-j-buxton/libdbusmenu/gtk2signalfix
Merge into: lp:libdbusmenu/13.10
Diff against target: 35 lines (+0/-8)
1 file modified
libdbusmenu-gtk/parser.c (+0/-8)
To merge this branch: bzr merge lp:~a-j-buxton/libdbusmenu/gtk2signalfix
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-11-04
Ted Gould (community) Approve on 2013-11-04
Review via email: mp+193806@code.launchpad.net

Commit message

Use "insert" signal instead of "child-added"

Description of the change

Also apply to 13.10

To post a comment you must log in.
Ted Gould (ted) :
review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libdbusmenu-gtk/parser.c'
2--- libdbusmenu-gtk/parser.c 2013-06-18 19:59:44 +0000
3+++ libdbusmenu-gtk/parser.c 2013-11-04 15:51:01 +0000
4@@ -97,9 +97,7 @@
5 gpointer data);
6 static void item_inserted_cb (GtkContainer * menu,
7 GtkWidget * widget,
8-#ifdef HAVE_GTK3
9 gint position,
10-#endif
11 gpointer data);
12 static void item_removed_cb (GtkContainer * menu,
13 GtkWidget * widget,
14@@ -431,11 +429,7 @@
15
16 pdata->shell = menu;
17 pdata->item_inserted_handler_id = g_signal_connect (G_OBJECT (menu),
18-#ifdef HAVE_GTK3
19 "insert",
20-#else
21- "child-added",
22-#endif
23 G_CALLBACK (item_inserted_cb),
24 mi);
25 pdata->item_removed_handler_id = g_signal_connect (G_OBJECT (menu),
26@@ -1394,9 +1388,7 @@
27 static void
28 item_inserted_cb (GtkContainer *menu,
29 GtkWidget *widget,
30-#ifdef HAVE_GTK3
31 gint position,
32-#endif
33 gpointer data)
34 {
35 DbusmenuMenuitem *menuitem = (DbusmenuMenuitem *)data;

Subscribers

People subscribed via source and target branches