Switching the prototype for type handlers so that it passes the client as well.

3 files changed, 9 insertions, 10 deletions

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index 4f5922d..9ac880b 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -553,7 +553,7 @@ menuitem_get_properties_new_cb (DBusGProxy * proxy, GHashTable * properties, GEr
 	}
 
 	if (newfunc != NULL) {
-		handled = newfunc(propdata->item, propdata->parent);
+		handled = newfunc(propdata->item, propdata->parent, propdata->client);
 	}
 
 	g_signal_emit(G_OBJECT(propdata->item), DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID, 0, TRUE);
diff --git a/libdbusmenu-glib/client.h b/libdbusmenu-glib/client.h
index c30f318..b4d214f 100644
--- a/libdbusmenu-glib/client.h
+++ b/libdbusmenu-glib/client.h
@@ -94,7 +94,7 @@ struct _DbusmenuClient {
 	GObject parent;
 };
 
-typedef gboolean (*DbusmenuClientTypeHandler) (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent);
+typedef gboolean (*DbusmenuClientTypeHandler) (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client);
 
 GType                dbusmenu_client_get_type          (void);
 DbusmenuClient *     dbusmenu_client_new               (const gchar * name,
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c
index 0f24c39..bc4a72a 100644
--- a/libdbusmenu-gtk/client.c
+++ b/libdbusmenu-gtk/client.c
@@ -44,9 +44,9 @@ static void new_child (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, guint po
 static void delete_child (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, DbusmenuGtkClient * gtkclient);
 static void move_child (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, guint new, guint old, DbusmenuGtkClient * gtkclient);
 
-static gboolean new_item_normal     (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent);
-static gboolean new_item_seperator  (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent);
-static gboolean new_item_image      (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent);
+static gboolean new_item_normal     (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client);
+static gboolean new_item_seperator  (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client);
+static gboolean new_item_image      (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client);
 
 /* GObject Stuff */
 G_DEFINE_TYPE (DbusmenuGtkClient, dbusmenu_gtkclient, DBUSMENU_TYPE_CLIENT);
@@ -266,7 +266,7 @@ dbusmenu_gtkclient_menuitem_get (DbusmenuGtkClient * client, DbusmenuMenuitem *
 }
 
 static gboolean
-new_item_normal     (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent)
+new_item_normal     (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
 {
 	gpointer ann_mi = g_object_get_data(G_OBJECT(newitem), data_menuitem);
 	GtkMenuItem * gmi = GTK_MENU_ITEM(ann_mi);
@@ -279,21 +279,20 @@ new_item_normal     (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent)
 
 	gmi = GTK_MENU_ITEM(gtk_menu_item_new());
 
-	// Need client
-	base_new_menuitem(newitem, gmi, NULL);
+	base_new_menuitem(newitem, gmi, DBUSMENU_GTKCLIENT(client));
 
 	return TRUE;
 }
 
 static gboolean
-new_item_seperator (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent)
+new_item_seperator (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
 {
 
 	return TRUE;
 }
 
 static gboolean
-new_item_image (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent)
+new_item_image (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
 {
 
 	return TRUE;