summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Aurich <darkrain42@pidgin.im>2009-05-06 21:58:50 +0000
committerPaul Aurich <darkrain42@pidgin.im>2009-05-06 21:58:50 +0000
commit026cacd61fa869094bb9da7c7fd2fec563ae80e4 (patch)
treee7e934abc52126e6f45b2e13ede731258f73c3d1
parent97bfce12e78149d7fb64e93086a9555401c2a8e3 (diff)
downloadpidgin-026cacd61fa869094bb9da7c7fd2fec563ae80e4.tar.gz
disapproval of revision '4f1de8106fb9a269bfd96f28b83b52a144cd9a72'
-rw-r--r--libpurple/protocols/jabber/libxmpp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libpurple/protocols/jabber/libxmpp.c b/libpurple/protocols/jabber/libxmpp.c
index c9a5f99fea..0034722dcd 100644
--- a/libpurple/protocols/jabber/libxmpp.c
+++ b/libpurple/protocols/jabber/libxmpp.c
@@ -252,7 +252,9 @@ init_plugin(PurplePlugin *plugin)
option);
option = purple_account_option_string_new(_("File transfer proxies"),
- "ft_proxies", NULL);
+ "ft_proxies",
+ /* TODO: Is this an acceptable default? */
+ "proxy.jabber.org");
prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
option);