# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1136936991 0
# Node ID ac41924f8bb0caed4ed631b759375a765971671d
# Parent  b0ede7907dd06cd78c8107ff09a6566d5509e3aa
[gaim-migrate @ 15159]
Better obey the GNOME proxy settings.  If GNOME proxy configuration is set to "Direct internet connection", set to GAIM_PROXY_NONE instead of using whatever happens to be in prefs.xml.

committer: Tailor Script <tailor@pidgin.im>

diff -r b0ede7907dd0 -r ac41924f8bb0 src/proxy.c
--- a/src/proxy.c	Tue Jan 10 20:39:47 2006 +0000
+++ b/src/proxy.c	Tue Jan 10 23:49:51 2006 +0000
@@ -198,9 +198,12 @@
 		if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/use_http_proxy", &tmp,
 					       NULL, NULL, NULL))
 			return gaim_global_proxy_get_info();
-		if (strcmp(tmp, "true\n")) {
+		if (!strcmp(tmp, "false\n")) {
 			info.type = GAIM_PROXY_NONE;
 			g_free(tmp);
+			return &info;
+		} else if (strcmp(tmp, "true\n")) {
+			g_free(tmp);
 			return gaim_global_proxy_get_info();
 		}