diff options
| author | Michael McConville <mmcconville@mykolab.com> | 2015-07-16 14:11:57 -0400 |
|---|---|---|
| committer | Michael McConville <mmcconville@mykolab.com> | 2015-07-16 14:11:57 -0400 |
| commit | 1661d8aad68539ffec6a525bba107c7dbb1ba7da (patch) | |
| tree | 2b27c9ac6160352900ba063525df793e74c0bd42 | |
| parent | ef483e26e2f62a3eace8bd0e981ff62ca6a13fda (diff) | |
| download | pidgin-1661d8aad68539ffec6a525bba107c7dbb1ba7da.tar.gz | |
Remove default XMPP file transfer proxy and replace existing defaults in user prefs. See ticket #16535. (ok'd by elb, etan, datallah)
| -rw-r--r-- | libpurple/protocols/jabber/jabber.c | 8 | ||||
| -rw-r--r-- | libpurple/protocols/jabber/jabber.h | 2 | ||||
| -rw-r--r-- | libpurple/protocols/jabber/libxmpp.c | 5 |
3 files changed, 7 insertions, 8 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 diff --git a/libpurple/protocols/jabber/jabber.h b/libpurple/protocols/jabber/jabber.h index 543d0af2d8..ebe5bad596 100644 --- a/libpurple/protocols/jabber/jabber.h +++ b/libpurple/protocols/jabber/jabber.h @@ -81,7 +81,7 @@ typedef struct _JabberStream JabberStream; #define CAPS0115_NODE "http://pidgin.im/" #define JABBER_DEFAULT_REQUIRE_TLS "require_starttls" -#define JABBER_DEFAULT_FT_PROXIES "proxy.eu.jabber.org" +#define JABBER_DEFAULT_FT_PROXIES "" /* Index into attention_types list */ #define JABBER_BUZZ 0 diff --git a/libpurple/protocols/jabber/libxmpp.c b/libpurple/protocols/jabber/libxmpp.c index e17e7bd50d..0b696ff94d 100644 --- a/libpurple/protocols/jabber/libxmpp.c +++ b/libpurple/protocols/jabber/libxmpp.c @@ -303,10 +303,7 @@ init_plugin(PurplePlugin *plugin) option); option = purple_account_option_string_new(_("File transfer proxies"), - "ft_proxies", - /* TODO: Is this an acceptable default? - * Also, keep this in sync as they add more servers */ - JABBER_DEFAULT_FT_PROXIES); + "ft_proxies", NULL); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); |