# HG changeset patch # User Paul Aurich # Date 1251134621 0 # Node ID 30497d814cb9b64576602fdc1f4b1018c1ddc6f8 # Parent 9affcab625224f368fa514b78f77109ba874113a Fix GNOME proxy settings. Fixes #10051. Fix pointed out by epienbro. diff -r 9affcab62522 -r 30497d814cb9 ChangeLog --- a/ChangeLog Mon Aug 24 06:04:16 2009 +0000 +++ b/ChangeLog Mon Aug 24 17:23:41 2009 +0000 @@ -5,6 +5,7 @@ * 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. diff -r 9affcab62522 -r 30497d814cb9 libpurple/proxy.c --- a/libpurple/proxy.c Mon Aug 24 06:04:16 2009 +0000 +++ b/libpurple/proxy.c Mon Aug 24 17:23:41 2009 +0000 @@ -245,7 +245,7 @@ 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();