Don't mess with proxy, when we use GG11 - it's handled by libpurple. Fixes #5576

Tue, 11 Mar 2014 23:01:07 +0100

author
Tomasz Wasilczyk <twasilczyk@pidgin.im>
date
Tue, 11 Mar 2014 23:01:07 +0100
changeset 35628
8db516861567
parent 35626
6e965f58e7da
child 35629
5aecb81f23ab

Don't mess with proxy, when we use GG11 - it's handled by libpurple. Fixes #5576

libpurple/protocols/gg/deprecated.c file | annotate | diff | comparison | revisions
--- a/libpurple/protocols/gg/deprecated.c	Tue Mar 04 23:05:26 2014 -0800
+++ b/libpurple/protocols/gg/deprecated.c	Tue Mar 11 23:01:07 2014 +0100
@@ -31,8 +31,11 @@
 
 #include <libgadu.h>
 
+#include "gg.h"
+
 gboolean ggp_deprecated_setup_proxy(PurpleConnection *gc)
 {
+#if ! GGP_ENABLE_GG11
 	PurpleProxyInfo *gpi = purple_proxy_get_setup(purple_connection_get_account(gc));
 
 	if ((purple_proxy_info_get_proxy_type(gpi) != PURPLE_PROXY_NONE) &&
@@ -58,6 +61,7 @@
 	gg_proxy_port = purple_proxy_info_get_port(gpi);
 	gg_proxy_username = g_strdup(purple_proxy_info_get_username(gpi));
 	gg_proxy_password = g_strdup(purple_proxy_info_get_password(gpi));
+#endif
 
 	return TRUE;
 }

mercurial