summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Aurich <darkrain42@pidgin.im>2009-05-06 21:49:52 +0000
committerPaul Aurich <darkrain42@pidgin.im>2009-05-06 21:49:52 +0000
commit97bfce12e78149d7fb64e93086a9555401c2a8e3 (patch)
tree2cb636f5104dbeee707e0d7b4299c48b7b0b64ed
parent5f80d8d6bf822e3827e60fa4277916f5c5fbe2f5 (diff)
downloadpidgin-97bfce12e78149d7fb64e93086a9555401c2a8e3.tar.gz
proxy.jabber.org hasn't existed in a while.
proxy.eu.jabber.org does exist but is the first in a series of globally-distributed proxy servers. We could continually update this as they add more servers or leave it blank and put something in the FAQ about public bytestream proxy servers.
-rw-r--r--libpurple/protocols/jabber/libxmpp.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libpurple/protocols/jabber/libxmpp.c b/libpurple/protocols/jabber/libxmpp.c
index 0034722dcd..c9a5f99fea 100644
--- a/libpurple/protocols/jabber/libxmpp.c
+++ b/libpurple/protocols/jabber/libxmpp.c
@@ -252,9 +252,7 @@ init_plugin(PurplePlugin *plugin)
option);
option = purple_account_option_string_new(_("File transfer proxies"),
- "ft_proxies",
- /* TODO: Is this an acceptable default? */
- "proxy.jabber.org");
+ "ft_proxies", NULL);
prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
option);