aboutsummaryrefslogtreecommitdiff
path: root/libdbusmenu-glib/client-menuitem.c
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-09-22 10:20:06 -0500
committerTed Gould <ted@gould.cx>2010-09-22 10:20:06 -0500
commit9e1c8319da6ac98bd36b73c4d46d7b655778ed9d (patch)
tree524cf35c2fcb3f144c302fd115ffb12208a1beba /libdbusmenu-glib/client-menuitem.c
parentfd9a7d175a4d6b17d04803245b30e547d34af9dc (diff)
parentba03e53fb680f3efb84156fa35926fef2ea3b36d (diff)
downloadlibdbusmenu-9e1c8319da6ac98bd36b73c4d46d7b655778ed9d.tar.gz
libdbusmenu-9e1c8319da6ac98bd36b73c4d46d7b655778ed9d.tar.bz2
libdbusmenu-9e1c8319da6ac98bd36b73c4d46d7b655778ed9d.zip
Import upstream version 0.3.16
Diffstat (limited to 'libdbusmenu-glib/client-menuitem.c')
-rw-r--r--libdbusmenu-glib/client-menuitem.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libdbusmenu-glib/client-menuitem.c b/libdbusmenu-glib/client-menuitem.c
index 979cf79..9c21065 100644
--- a/libdbusmenu-glib/client-menuitem.c
+++ b/libdbusmenu-glib/client-menuitem.c
@@ -46,7 +46,7 @@ static void dbusmenu_client_menuitem_init (DbusmenuClientMenuitem *self);
static void dbusmenu_client_menuitem_dispose (GObject *object);
static void dbusmenu_client_menuitem_finalize (GObject *object);
static void handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp);
-static void send_about_to_show (DbusmenuMenuitem * mi, dbusmenu_menuitem_about_to_show_cb cb, gpointer cb_data);
+static void send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data);
G_DEFINE_TYPE (DbusmenuClientMenuitem, dbusmenu_client_menuitem, DBUSMENU_TYPE_MENUITEM);
@@ -112,7 +112,7 @@ handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, g
typedef struct _about_to_show_t about_to_show_t;
struct _about_to_show_t {
DbusmenuMenuitem * mi;
- dbusmenu_menuitem_about_to_show_cb cb;
+ void (*cb) (DbusmenuMenuitem * mi, gpointer user_data);
gpointer cb_data;
};
@@ -131,7 +131,7 @@ about_to_show_cb (gpointer user_data)
/* Passes the about to show signal on through the client. */
static void
-send_about_to_show (DbusmenuMenuitem * mi, dbusmenu_menuitem_about_to_show_cb cb, gpointer cb_data)
+send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data)
{
DbusmenuClientMenuitemPrivate * priv = DBUSMENU_CLIENT_MENUITEM_GET_PRIVATE(mi);
if (cb == NULL) {