Tue, 06 Jan 2009 07:53:19 +0000
merge of 'ec60fbe5a4abaf446e595d18e1d2d62da53f6cd6'
and '5a4efd97dc521b61c8d19c3598db8e33e18e2141'
committer: Etan Reisner <deryni@pidgin.im>
| ChangeLog.API | file | annotate | diff | comparison | revisions | |
| libpurple/proxy.c | file | annotate | diff | comparison | revisions |
--- 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); + /*@}*/ /**************************************************************************/