Mercurial > pidgin
changeset 25902:be3ba7e07de5
merge of '123d615deaa8daeeea7d7c341a87eab4e83a7958'
and 'e3b2ac4f2d9e6a6bc13c0394f980b28a75765258'
| author | Kevin Stange <kevin@simguy.net> |
|---|---|
| date | Tue, 06 Jan 2009 07:53:19 +0000 |
| parents | 4670851af098 (diff) 68265bcc8814 (current diff) |
| children | f8d3447235b1 |
| files | ChangeLog.API libpurple/proxy.c |
| diffstat | 3 files changed, 18 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.API Tue Jan 06 04:09:36 2009 +0000 +++ b/ChangeLog.API Tue Jan 06 07:53:19 2009 +0000 @@ -22,6 +22,7 @@ * purple_request_field_get_ui_data * purple_request_field_set_ui_data * purple_network_force_online + * purple_global_proxy_set_info * purple_strequal Deprecated:
--- a/libpurple/proxy.c Tue Jan 06 04:09:36 2009 +0000 +++ b/libpurple/proxy.c Tue Jan 06 07:53:19 2009 +0000 @@ -207,6 +207,16 @@ return global_proxy_info; } +void +purple_global_proxy_set_info(PurpleProxyInfo *info) +{ + g_return_if_fail(info != NULL); + + purple_proxy_info_destroy(global_proxy_info); + + global_proxy_info = info; +} + static PurpleProxyInfo * purple_gnome_proxy_get_info(void) {
--- a/libpurple/proxy.h Tue Jan 06 04:09:36 2009 +0000 +++ b/libpurple/proxy.h Tue Jan 06 07:53:19 2009 +0000 @@ -186,6 +186,13 @@ */ PurpleProxyInfo *purple_global_proxy_get_info(void); +/** + * Set purple's global proxy information. + * + * @param info The proxy information. + */ +void purple_global_proxy_set_info(PurpleProxyInfo *info); + /*@}*/ /**************************************************************************/