Mercurial > pidgin.yaz
changeset 28437:30497d814cb9
Fix GNOME proxy settings. Fixes #10051.
Fix pointed out by epienbro.
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Mon, 24 Aug 2009 17:23:41 +0000 |
| parents | 9affcab62522 |
| children | 80265d67fc7e 7925bb7f2aa7 7763697a85c8 |
| files | ChangeLog libpurple/proxy.c |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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();