/pidgin/main: 8db516861567: Don't mess with proxy, when we use G...

[Tomasz Wasilczyk]

Changeset: 8db516861567ab32274b9a493ca73515ab1d292d
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-03-11 23:01 +0100
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/8db516861567

Description:

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

diffstat:

 libpurple/protocols/gg/deprecated.c |  4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diffs (23 lines):

diff --git a/libpurple/protocols/gg/deprecated.c b/libpurple/protocols/gg/deprecated.c
--- a/libpurple/protocols/gg/deprecated.c
+++ b/libpurple/protocols/gg/deprecated.c
@@ -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 @@ gboolean ggp_deprecated_setup_proxy(Purp
 	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;
 }