# HG changeset patch
# User Tomasz Wasilczyk <twasilczyk@pidgin.im>
# Date 1394575267 -3600
# Node ID 8db516861567ab32274b9a493ca73515ab1d292d
# Parent  6e965f58e7da587c25d06f6ae4edac13896158d5
Don't mess with proxy, when we use GG11 - it's handled by libpurple. Fixes #5576

diff -r 6e965f58e7da -r 8db516861567 libpurple/protocols/gg/deprecated.c
--- 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;
 }