diff options
| author | Didier Roche <didier.roche@canonical.com> | 2010-09-22 17:44:07 +0200 |
|---|---|---|
| committer | Didier Roche <didier.roche@canonical.com> | 2010-09-22 17:44:07 +0200 |
| commit | b353628b2659d06ad6e356cfbf017aa96cb4697e (patch) | |
| tree | 86f07842636c743adf6694b24ac6c2867d5b69f7 /libdbusmenu-glib/client-menuitem.c | |
| parent | 5551321b887ee90ef398a24d768a5f4a87db3af0 (diff) | |
| parent | 20744aaef8e99b0db58071e684a5d830074b2ec1 (diff) | |
| download | libdbusmenu-b353628b2659d06ad6e356cfbf017aa96cb4697e.tar.gz libdbusmenu-b353628b2659d06ad6e356cfbf017aa96cb4697e.tar.bz2 libdbusmenu-b353628b2659d06ad6e356cfbf017aa96cb4697e.zip | |
* New upstream release:
* Don't use a typedef in the signal handler in the class to
avoid confusing vapigen.
Diffstat (limited to 'libdbusmenu-glib/client-menuitem.c')
| -rw-r--r-- | libdbusmenu-glib/client-menuitem.c | 6 |
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) { |