Mercurial > pidgin.yaz
changeset 32518:0f0996c93c42
merge of '5c4e09621b978c0972fd440fd215b775a926e26d'
and 'dc01d13c59e6c7a6352cd4c3c6bf679f095e00fe'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Tue, 06 Sep 2011 18:30:50 +0000 |
| parents | cc55df4702aa (current diff) bf65d24d84ae (diff) |
| children | e1c801f3669d |
| files | pidgin/gtkdocklet-gtk.c |
| diffstat | 3 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/dbus-analyze-functions.py Tue Sep 06 00:25:29 2011 +0000 +++ b/libpurple/dbus-analyze-functions.py Tue Sep 06 18:30:50 2011 +0000 @@ -31,6 +31,11 @@ "purple_account_unregister", "purple_connection_new_unregister", + # Similar to the above, again + "purple_menu_action_new", + "purple_menu_action_set_callback", + "purple_menu_action_get_callback", + # These functions are excluded because they involve setting arbitrary # data via pointers for protocols and UIs. This just won't work. "purple_blist_get_ui_data",
--- a/libpurple/util.c Tue Sep 06 00:25:29 2011 +0000 +++ b/libpurple/util.c Tue Sep 06 18:30:50 2011 +0000 @@ -113,8 +113,7 @@ return act->label; } -PurpleCallback * -purple_menu_action_get_callback(const PurpleMenuAction *act) +PurpleCallback purple_menu_action_get_callback(const PurpleMenuAction *act) { g_return_val_if_fail(act != NULL, NULL);
--- a/libpurple/util.h Tue Sep 06 00:25:29 2011 +0000 +++ b/libpurple/util.h Tue Sep 06 18:30:50 2011 +0000 @@ -103,7 +103,7 @@ * * @return The callback function. */ -PurpleCallback *purple_menu_action_get_callback(const PurpleMenuAction *act); +PurpleCallback purple_menu_action_get_callback(const PurpleMenuAction *act); /** * Returns the data stored in the PurpleMenuAction.