From d7c35c09381063b16ef2221fd3edf1d537ac5578 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 22 Sep 2010 09:39:21 -0500 Subject: Removing the typedef for the callback --- libdbusmenu-glib/menuitem.h | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'libdbusmenu-glib/menuitem.h') diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h index 9be938b..a505c9c 100644 --- a/libdbusmenu-glib/menuitem.h +++ b/libdbusmenu-glib/menuitem.h @@ -94,16 +94,6 @@ struct _DbusmenuMenuitem GObject parent; }; -/** - * dbusmenu_menuitem_about_to_show_cb: - * @mi: Menu item that should be shown - * @user_data: (closure): Extra user data sent with the function - * - * Callback prototype for a callback that is called when the - * menu should be shown. - */ -typedef void (*dbusmenu_menuitem_about_to_show_cb) (DbusmenuMenuitem * mi, gpointer user_data); - /** * dbusmenu_menuitem_buildxml_slot_t: * @mi: (in): Menu item that should be built from @@ -143,7 +133,7 @@ struct _DbusmenuMenuitemClass /* Virtual functions */ dbusmenu_menuitem_buildxml_slot_t buildxml; void (*handle_event) (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp); - void (*send_about_to_show) (DbusmenuMenuitem * mi, dbusmenu_menuitem_about_to_show_cb cb, gpointer cb_data); + void (*send_about_to_show) (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data); void (*show_to_user) (DbusmenuMenuitem * mi, guint timestamp, gpointer cb_data); /* void (*reserved1) (void); */ @@ -189,7 +179,7 @@ gboolean dbusmenu_menuitem_get_root (DbusmenuMenuitem * mi); void dbusmenu_menuitem_foreach (DbusmenuMenuitem * mi, void (*func) (DbusmenuMenuitem * mi, gpointer data), gpointer data); void dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp); -void dbusmenu_menuitem_send_about_to_show (DbusmenuMenuitem * mi, dbusmenu_menuitem_about_to_show_cb cb, gpointer cb_data); +void dbusmenu_menuitem_send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data); void dbusmenu_menuitem_show_to_user (DbusmenuMenuitem * mi, guint timestamp); -- cgit v1.2.3