diff options
| author | Ted Gould <ted@canonical.com> | 2009-08-25 14:13:34 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-08-25 14:13:34 -0500 |
| commit | 0d23ee0ce837c23750bdeef3e01c4f117d1250fc (patch) | |
| tree | 9fb6360036695c0d8f321784f03b8170c0abc52e /libdbusmenu-gtk/client.c | |
| parent | be6ccb4737e45a73da882ddf3d3c0fc725739a6d (diff) | |
| download | libdbusmenu-0d23ee0ce837c23750bdeef3e01c4f117d1250fc.tar.gz libdbusmenu-0d23ee0ce837c23750bdeef3e01c4f117d1250fc.tar.bz2 libdbusmenu-0d23ee0ce837c23750bdeef3e01c4f117d1250fc.zip | |
Switching the prototype for type handlers so that it passes the client as well.
Diffstat (limited to 'libdbusmenu-gtk/client.c')
| -rw-r--r-- | libdbusmenu-gtk/client.c | 15 |
1 files changed, 7 insertions, 8 deletions
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; |