comparison src/proxy.c @ 12811:ac41924f8bb0

[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 <[e-mail]>

12810:b0ede7907dd0

		/* See whether to use a proxy. */
		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")) {
			info.type = GAIM_PROXY_NONE;
			g_free(tmp);
			return gaim_global_proxy_get_info();
		}

		g_free(tmp);

12811:ac41924f8bb0

		/* See whether to use a proxy. */
		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, "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();
		}

		g_free(tmp);