# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1178980139 0
# Node ID f1547260a11eaa8ac364f76e4da87aba7f1bf4a2
# Parent  34f698ffe88bc9911a1cdd4d3ccf016adbc6b6bf
Fix for detecting gnome proxy settings from ticket #935

This prevents trying to use a proxy when gnome is configured for automatic
proxy configuration. If someone feels like writing a javascript parser for
libpurple to parse proxy autoconfiguration files we could in the future
support automatic proxy settings too.

diff -r 34f698ffe88b -r f1547260a11e libpurple/proxy.c
--- a/libpurple/proxy.c	Sat May 12 13:24:59 2007 +0000
+++ b/libpurple/proxy.c	Sat May 12 14:28:59 2007 +0000
@@ -217,14 +217,14 @@
 		g_free(path);
 
 		/* See whether to use a proxy. */
-		if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/use_http_proxy", &tmp,
+		if (!g_spawn_command_line_sync("gconftool-2 -g /system/proxy/mode", &tmp,
 					       NULL, NULL, NULL))
 			return purple_global_proxy_get_info();
-		if (!strcmp(tmp, "false\n")) {
+		if (!strcmp(tmp, "none\n")) {
 			info.type = PURPLE_PROXY_NONE;
 			g_free(tmp);
 			return &info;
-		} else if (strcmp(tmp, "true\n")) {
+		} else if (strcmp(tmp, "manual\n")) {
 			g_free(tmp);
 			return purple_global_proxy_get_info();
 		}