Mercurial > pidgin.yaz
changeset 30268:e89bf860e3cf
merge of '5b4322528c199b000fbfc774bb782dfd6dc0e2f2'
and 'c3825297241eefdff3ba2e08398ddfa301577a69'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sat, 01 May 2010 01:03:38 +0000 |
| parents | 5bac51b394e6 (current diff) b9df84b0574f (diff) |
| children | 702ea988070c |
| files | |
| diffstat | 4 files changed, 19 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.API Thu Apr 29 17:17:00 2010 +0000 +++ b/ChangeLog.API Sat May 01 01:03:38 2010 +0000 @@ -8,17 +8,27 @@ * account-signed-off * account-connection-error * purple_account_get_name_for_display + * purple_account_get_privacy_type * purple_account_get_public_alias - * purple_account_get_privacy_type + * purple_account_set_privacy_type * purple_account_set_public_alias - * purple_account_set_privacy_type + * buddy-caps-changed blist signal + * Added media_caps to the PurpleBuddy struct * purple_buddy_get_media_caps * purple_buddy_set_media_caps + * purple_certificates_import for importing multiple + certificates from a single file (and corresponding + import_certificates member of PurpleCertificateScheme struct) + * autojoin connection signal * purple_contact_get_group + * sent-attention conversation signal + * got-attention conversation signal + * ui-caps-changed media manager signal * purple_media_candidate_copy * purple_media_codec_copy * purple_media_manager_get_backend_type * purple_media_manager_set_backend_type + * PurpleMood struct in status.h * purple_network_get_all_local_system_ips, which returns all local IPs on the system. On systems with the getifaddrs() function, this will return both IPv4 and IPv6 addresses @@ -31,6 +41,8 @@ only supported if the getaddrinfo() function is available at build-time (not the case on Windows, currently). * purple_prpl_got_media_caps + * purple_request_action_with_icon + * purple_request_action_with_icon_varg * purple_socket_get_family * purple_socket_speaks_ipv4 * purple_unescape_text @@ -39,18 +51,6 @@ * purple_xfer_get_thumbnail_mimetype * purple_xfer_set_thumbnail * purple_xfer_prepare_thumbnail - * purple_request_action_with_icon - * purple_request_action_varg_with_icon - * media_caps to the PurpleBuddy struct - * buddy-caps-changed blist signal - * ui-caps-changed media manager signal - * sent-attention conversation signal - * got-attention conversation signal - * PurpleMood struct in status.h - * purple_certificates_import for importing multiple - certificates from a single file (and corresponding - import_certificates member of PurpleCertificateScheme struct) - * autojoin connection signal Pidgin: Added:
--- a/libpurple/protocols/jabber/si.c Thu Apr 29 17:17:00 2010 +0000 +++ b/libpurple/protocols/jabber/si.c Sat May 01 01:03:38 2010 +0000 @@ -1790,6 +1790,7 @@ purple_xfer_request(xfer); } #else + thumbnail = NULL; /* Silence warning */ purple_xfer_request(xfer); #endif }
--- a/libpurple/request.c Thu Apr 29 17:17:00 2010 +0000 +++ b/libpurple/request.c Sat May 01 01:03:38 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 Thu Apr 29 17:17:00 2010 +0000 +++ b/libpurple/request.h Sat May 01 01:03:38 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,