Mercurial > pidgin.yaz
changeset 18829:7a594763c229
Correct the types of the authorize_cb and deny_cb parameters of
PurpleAccountUiOps.request_authorize to be
PurpleAccountRequestAuthorizationCb rather than GCallback, and amend
Pidgin and Finch accordingly. Fixes #2437
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Fri, 10 Aug 2007 17:30:59 +0000 |
| parents | f8b22b11a126 |
| children | e7314d58ebe6 |
| files | ChangeLog.API finch/gntaccount.c libpurple/account.h pidgin/gtkaccount.c |
| diffstat | 4 files changed, 34 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.API Tue Aug 07 09:47:39 2007 +0000 +++ b/ChangeLog.API Fri Aug 10 17:30:59 2007 +0000 @@ -1,5 +1,15 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul +Version 2.1.1 (x/x/x): + libpurple: + Changed: + * PurpleAccountUiOps.request_authorize's authorize_cb and + deny_cb parameters now correctly have type + PurpleAccountRequestAuthorizationCb rather than GCallback. + (You'll want to change your UI's implementation's signature + to avoid warnings, and then remove some now-redundant casts + back to the proper type.) + version 2.1.0 (7/28/2007): libpurple: Added:
--- a/finch/gntaccount.c Tue Aug 07 09:47:39 2007 +0000 +++ b/finch/gntaccount.c Fri Aug 10 17:30:59 2007 +0000 @@ -912,9 +912,15 @@ } static void * -finch_request_authorize(PurpleAccount *account, const char *remote_user, - const char *id, const char *alias, const char *message, gboolean on_list, - GCallback auth_cb, GCallback deny_cb, void *user_data) +finch_request_authorize(PurpleAccount *account, + const char *remote_user, + const char *id, + const char *alias, + const char *message, + gboolean on_list, + PurpleAccountRequestAuthorizationCb auth_cb, + PurpleAccountRequestAuthorizationCb deny_cb, + void *user_data) { char *buffer; PurpleConnection *gc; @@ -941,8 +947,8 @@ GList *iter; auth_and_add *aa = g_new(auth_and_add, 1); - aa->auth_cb = (PurpleAccountRequestAuthorizationCb)auth_cb; - aa->deny_cb = (PurpleAccountRequestAuthorizationCb)deny_cb; + aa->auth_cb = auth_cb; + aa->deny_cb = deny_cb; aa->data = user_data; aa->username = g_strdup(remote_user); aa->alias = g_strdup(alias);
--- a/libpurple/account.h Tue Aug 07 09:47:39 2007 +0000 +++ b/libpurple/account.h Fri Aug 10 17:30:59 2007 +0000 @@ -88,8 +88,8 @@ const char *alias, const char *message, gboolean on_list, - GCallback authorize_cb, - GCallback deny_cb, + PurpleAccountRequestAuthorizationCb authorize_cb, + PurpleAccountRequestAuthorizationCb deny_cb, void *user_data); /** Close a pending request for authorization. \a ui_handle is a handle
--- a/pidgin/gtkaccount.c Tue Aug 07 09:47:39 2007 +0000 +++ b/pidgin/gtkaccount.c Fri Aug 10 17:30:59 2007 +0000 @@ -2546,9 +2546,15 @@ } static void * -pidgin_accounts_request_authorization(PurpleAccount *account, const char *remote_user, - const char *id, const char *alias, const char *message, gboolean on_list, - GCallback auth_cb, GCallback deny_cb, void *user_data) +pidgin_accounts_request_authorization(PurpleAccount *account, + const char *remote_user, + const char *id, + const char *alias, + const char *message, + gboolean on_list, + PurpleAccountRequestAuthorizationCb auth_cb, + PurpleAccountRequestAuthorizationCb deny_cb, + void *user_data) { char *buffer; PurpleConnection *gc; @@ -2574,8 +2580,8 @@ if (!on_list) { struct auth_and_add *aa = g_new0(struct auth_and_add, 1); - aa->auth_cb = (PurpleAccountRequestAuthorizationCb)auth_cb; - aa->deny_cb = (PurpleAccountRequestAuthorizationCb)deny_cb; + aa->auth_cb = auth_cb; + aa->deny_cb = deny_cb; aa->data = user_data; aa->username = g_strdup(remote_user); aa->alias = g_strdup(alias);