Mercurial > pidgin
changeset 18867:1d96cfd8879f
merge of '408e22fd58560f1326bfd9ebb031f2d0fd99a906'
and '45f3c77584e15822a1c8508ddcf2cb4f655e0980'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Sat, 11 Aug 2007 03:21:36 +0000 |
| parents | e7314d58ebe6 (diff) 8704cb2ed8e2 (current diff) |
| children | d470282d49da |
| files | |
| diffstat | 4 files changed, 34 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.API Fri Aug 10 22:16:09 2007 +0000 +++ b/ChangeLog.API Sat Aug 11 03:21:36 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 Fri Aug 10 22:16:09 2007 +0000 +++ b/finch/gntaccount.c Sat Aug 11 03:21:36 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 Fri Aug 10 22:16:09 2007 +0000 +++ b/libpurple/account.h Sat Aug 11 03:21:36 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 Fri Aug 10 22:16:09 2007 +0000 +++ b/pidgin/gtkaccount.c Sat Aug 11 03:21:36 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);