Mercurial > pidgin
diff libpurple/proxy.c @ 29299:7925bb7f2aa7
propagate from branch 'im.pidgin.pidgin' (head 92e101e3698042e7600729bc09dec9e28f81de8f)
to branch 'im.pidgin.cpw.attention_ui' (head 563c35d20efcc234a74567ebb88c059d10ce1e09)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Mon, 24 Aug 2009 19:23:56 +0000 |
| parents | 30497d814cb9 |
| children | f2a69bee9ef6 |
line wrap: on
line diff
--- a/libpurple/proxy.c Thu Aug 13 17:42:44 2009 +0000 +++ b/libpurple/proxy.c Mon Aug 24 19:23:56 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();