/soc/2015/mmcc/main: 077a1f2a14a3: remove either previous defaul...
Michael McConville <[email protected]>
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: 077a1f2a14a32dd42acfd59acf42621c714048e0 Author: Michael McConville <[email protected]> Date: 2015-07-15 17:46 -0400 Branch: default URL: https://hg.pidgin.im/soc/2015/mmcc/main/rev/077a1f2a14a3 Description: remove either previous default file transfer proxy if present (ok'd by etan, elb, datallah) diffstat: libpurple/protocols/jabber/jabber.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c --- a/libpurple/protocols/jabber/jabber.c +++ b/libpurple/protocols/jabber/jabber.c @@ -1096,7 +1096,10 @@ jabber_login(PurpleAccount *account) if (js == NULL) return; - if (g_str_equal("proxy.jabber.org", purple_account_get_string(account, "ft_proxies", ""))) + /* replace old default proxies with the new default: NULL + * TODO: these can eventually be removed */ + if (g_str_equal("proxy.jabber.org", purple_account_get_string(account, "ft_proxies", "")) + || g_str_equal("proxy.eu.jabber.org", purple_account_get_string(account, "ft_proxies", ""))) purple_account_set_string(account, "ft_proxies", NULL); /* _______________________________________________ Commits mailing list [email protected] https://pidgin.im/cgi-bin/mailman/listinfo/commits