pidgin: f54a2776: disapproval of revision '4de75e1b8967aac...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: f54a277603759665b5cdb574b3a9f3288ba28782
Ancestor: 4de75e1b8967aaca07059f575739e49e70fda9da
Author: darkrain42 at pidgin.im
Date: 2009-05-06T21:58:50
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f54a277603759665b5cdb574b3a9f3288ba28782

Modified files:
        libpurple/protocols/jabber/libxmpp.c

ChangeLog: 

disapproval of revision '4de75e1b8967aaca07059f575739e49e70fda9da'
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/libxmpp.c	e804ee450e74c058e4f5ac3414c96ce2d265cc1e
+++ libpurple/protocols/jabber/libxmpp.c	55e5d9b2c392cc4cac72fd57d5710ef0b52f404c
@@ -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);