libpurple/protocols/jabber/libxmpp.c

branch
release-2.x.y
changeset 38354
28aa86aaba93
parent 38258
9a6551eba09c
child 38967
303c75b86d86
--- 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);
 

mercurial