Mercurial > pidgin
changeset 29850:e72f6383095b
It seems like the _varg should be at the end.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Fri, 30 Apr 2010 03:46:27 +0000 |
| parents | 38d5dd9c9a07 |
| children | b9df84b0574f |
| files | ChangeLog.API libpurple/request.c libpurple/request.h |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.API Fri Apr 30 03:35:28 2010 +0000 +++ b/ChangeLog.API Fri Apr 30 03:46:27 2010 +0000 @@ -40,7 +40,7 @@ * purple_xfer_set_thumbnail * purple_xfer_prepare_thumbnail * purple_request_action_with_icon - * purple_request_action_varg_with_icon + * purple_request_action_with_icon_varg * media_caps to the PurpleBuddy struct * buddy-caps-changed blist signal * ui-caps-changed media manager signal
--- a/libpurple/request.c Fri Apr 30 03:35:28 2010 +0000 +++ b/libpurple/request.c Fri Apr 30 03:46:27 2010 +0000 @@ -1330,7 +1330,7 @@ g_return_val_if_fail(action_count > 0, NULL); va_start(args, action_count); - ui_handle = purple_request_action_varg_with_icon(handle, title, primary, + ui_handle = purple_request_action_with_icon_varg(handle, title, primary, secondary, default_action, account, who, conv, icon_data, icon_size, user_data, action_count, args); va_end(args); @@ -1371,7 +1371,7 @@ } void * -purple_request_action_varg_with_icon(void *handle, const char *title, +purple_request_action_with_icon_varg(void *handle, const char *title, const char *primary, const char *secondary, int default_action, PurpleAccount *account, const char *who,
--- a/libpurple/request.h Fri Apr 30 03:35:28 2010 +0000 +++ b/libpurple/request.h Fri Apr 30 03:46:27 2010 +0000 @@ -237,7 +237,7 @@ PurpleAccount *account, const char *who, PurpleConversation *conv, void *user_data); - /** @see purple_request_action_varg_with_icon(). */ + /** @see purple_request_action_with_icon_varg(). */ void *(*request_action_with_icon)(const char *title, const char *primary, const char *secondary, int default_action, PurpleAccount *account, const char *who, @@ -1416,7 +1416,7 @@ * see its documentation. * @since 2.7.0 */ -void *purple_request_action_varg_with_icon(void *handle, const char *title, +void *purple_request_action_with_icon_varg(void *handle, const char *title, const char *primary, const char *secondary, int default_action, PurpleAccount *account, const char *who, PurpleConversation *conv, gconstpointer icon_data, gsize icon_size,