aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Buxton <a.j.buxton@gmail.com>2013-11-04 15:05:38 +0000
committerTarmac <Unknown>2013-11-04 15:05:38 +0000
commitae91d5e839b941c4875e7674bb2a65a64f24e847 (patch)
tree549cd303510b9e645559e519da3817db06f5e411
parenta060cc8b736ca14373a0c334ccae3a7c11298a19 (diff)
parent899dca2c3d044efebe3a7a940574c2d1942ae58e (diff)
downloadlibdbusmenu-ae91d5e839b941c4875e7674bb2a65a64f24e847.tar.gz
libdbusmenu-ae91d5e839b941c4875e7674bb2a65a64f24e847.tar.bz2
libdbusmenu-ae91d5e839b941c4875e7674bb2a65a64f24e847.zip
Use "insert" signal instead of "child-added" (LP: #1203888)
In recent Gtk+2 versions, the "insert" signal has been backported from Gtk+3. This replaces the "child-added" signal, which was carried in an Ubuntu-specific patch and was dropped in Saucy. . Fixes: https://bugs.launchpad.net/bugs/1203888. Approved by PS Jenkins bot, Ted Gould.
-rw-r--r--libdbusmenu-gtk/parser.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/libdbusmenu-gtk/parser.c b/libdbusmenu-gtk/parser.c
index b09e984..c9ec931 100644
--- a/libdbusmenu-gtk/parser.c
+++ b/libdbusmenu-gtk/parser.c
@@ -97,9 +97,7 @@ static void a11y_name_notify_cb (AtkObject * accessible,
gpointer data);
static void item_inserted_cb (GtkContainer * menu,
GtkWidget * widget,
-#ifdef HAVE_GTK3
gint position,
-#endif
gpointer data);
static void item_removed_cb (GtkContainer * menu,
GtkWidget * widget,
@@ -431,11 +429,7 @@ watch_submenu(DbusmenuMenuitem * mi, GtkWidget * menu)
pdata->shell = menu;
pdata->item_inserted_handler_id = g_signal_connect (G_OBJECT (menu),
-#ifdef HAVE_GTK3
"insert",
-#else
- "child-added",
-#endif
G_CALLBACK (item_inserted_cb),
mi);
pdata->item_removed_handler_id = g_signal_connect (G_OBJECT (menu),
@@ -1394,9 +1388,7 @@ settings_notify_cb (GtkSettings * settings, GParamSpec * pspec, gpointer data)
static void
item_inserted_cb (GtkContainer *menu,
GtkWidget *widget,
-#ifdef HAVE_GTK3
gint position,
-#endif
gpointer data)
{
DbusmenuMenuitem *menuitem = (DbusmenuMenuitem *)data;