pidgin: 92e101e3: Fix GNOME proxy settings. Fixes #10051.

darkrain42 at pidgin.im darkrain42 at pidgin.im
Mon Aug 24 13:31:54 EDT 2009


-----------------------------------------------------------------
Revision: 92e101e3698042e7600729bc09dec9e28f81de8f
Ancestor: 181764ee5b9643826233ae4d6eefb5be194cca08
Author: darkrain42 at pidgin.im
Date: 2009-08-24T17:23:41
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/92e101e3698042e7600729bc09dec9e28f81de8f

Modified files:
        ChangeLog libpurple/proxy.c

ChangeLog: 

Fix GNOME proxy settings. Fixes #10051.

Fix pointed out by epienbro.

-------------- next part --------------
============================================================
--- ChangeLog	fe0d40e1679b88b4f9445f9df86d047cd76e9171
+++ ChangeLog	bb8d27591fb576b45c2baf587a8d767802879e11
@@ -5,6 +5,7 @@ version 2.6.2 (??/??/2009):
 	* Fix --disable-avahi to actually disable it in configure, as opposed
 	  to just making the warning non-fatal.
 	* Sending custom smileys in MSN chats is now supported.
+	* Fix using GNOME proxy settings properly.
 
 	XMPP:
 	* Prompt the user before cancelling a presence subscription.
============================================================
--- libpurple/proxy.c	38f80798fa823b1b15b559316f968e4d88f441ee
+++ libpurple/proxy.c	9635445cccc76924bbfb3b4cf2934a0ea2425e74
@@ -245,7 +245,7 @@ purple_gnome_proxy_get_info(void)
 		return &info;
 	}
 
-	if (purple_strequal(tmp, "manual\n")) {
+	if (!purple_strequal(tmp, "manual\n")) {
 		/* Unknown setting.  Fallback to using our global proxy settings. */
 		g_free(tmp);
 		return purple_global_proxy_get_info();


More information about the Commits mailing list