diff options
Diffstat (limited to 'libpurple/protocols/jabber/jabber.c')
| -rw-r--r-- | libpurple/protocols/jabber/jabber.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c index 4acd74d560..de1de6b944 100644 --- a/libpurple/protocols/jabber/jabber.c +++ b/libpurple/protocols/jabber/jabber.c @@ -1093,9 +1093,11 @@ jabber_login(PurpleAccount *account) if (js == NULL) return; - /* TODO: Remove this at some point. Added 2010-02-14 (v2.6.6) */ - if (purple_strequal("proxy.jabber.org", purple_account_get_string(account, "ft_proxies", ""))) - purple_account_set_string(account, "ft_proxies", JABBER_DEFAULT_FT_PROXIES); + /* replace old default proxies with the new default: NULL + * TODO: these can eventually be removed */ + if (purple_strequal("proxy.jabber.org", purple_account_get_string(account, "ft_proxies", "")) + || purple_strequal("proxy.eu.jabber.org", purple_account_get_string(account, "ft_proxies", ""))) + purple_account_set_string(account, "ft_proxies", NULL); /* * Calculate the avatar hash for our current image so we know (when we |