pidgin/pidgin

Remove default XMPP file transfer proxy and replace existing defaults in user prefs. See ticket #16535. (ok'd by elb, etan, datallah)
release-2.x.y
2015-07-16, Michael McConville
28aa86aaba93
Parents 38a40ddbb9b7
Children 43d73148b4892deceb0f9ef9
Remove default XMPP file transfer proxy and replace existing defaults in user prefs. See ticket #16535. (ok'd by elb, etan, datallah)
3 files changed, 7 insertions(+), 8 deletions(-)
  • +5 -3
    libpurple/protocols/jabber/jabber.c
  • +1 -1
    libpurple/protocols/jabber/jabber.h
  • +1 -4
    libpurple/protocols/jabber/libxmpp.c
    • --- a/libpurple/protocols/jabber/jabber.c Thu Sep 01 23:42:21 2016 -0400
    +++ b/libpurple/protocols/jabber/jabber.c Thu Jul 16 14:11:57 2015 -0400
    @@ -1093,9 +1093,11 @@
    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
    --- a/libpurple/protocols/jabber/jabber.h Thu Sep 01 23:42:21 2016 -0400
    +++ b/libpurple/protocols/jabber/jabber.h Thu Jul 16 14:11:57 2015 -0400
    @@ -81,7 +81,7 @@
    #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
    --- a/libpurple/protocols/jabber/libxmpp.c Thu Sep 01 23:42:21 2016 -0400
    +++ b/libpurple/protocols/jabber/libxmpp.c Thu Jul 16 14:11:57 2015 -0400
    @@ -303,10 +303,7 @@
    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);