Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/libxmpp.c @ 27946:e0bcdc2bad7d
propagate from branch 'im.pidgin.pidgin' (head 70ee1de1cc79688256a3dd6ac1a519e24c00a12c)
to branch 'im.pidgin.pidgin.yaz' (head 48181b0dbca52e9e9bd367a1dcc01fe5f9a678a1)
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Mon, 11 May 2009 02:18:47 +0000 |
parents | a4b59d72b94b |
children | 92565c8e1e3a |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/libxmpp.c Mon May 04 16:28:11 2009 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Mon May 11 02:18:47 2009 +0000 @@ -253,8 +253,9 @@ option = purple_account_option_string_new(_("File transfer proxies"), "ft_proxies", - /* TODO: Is this an acceptable default? */ - "proxy.jabber.org"); + /* TODO: Is this an acceptable default? + * Also, keep this in sync as they add more servers */ + "proxy.eu.jabber.org"); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);