Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 27945:cc45ac2782cc | 27946:e0bcdc2bad7d |
|---|---|
| 251 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, | 251 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, |
| 252 option); | 252 option); |
| 253 | 253 |
| 254 option = purple_account_option_string_new(_("File transfer proxies"), | 254 option = purple_account_option_string_new(_("File transfer proxies"), |
| 255 "ft_proxies", | 255 "ft_proxies", |
| 256 /* TODO: Is this an acceptable default? */ | 256 /* TODO: Is this an acceptable default? |
| 257 "proxy.jabber.org"); | 257 * Also, keep this in sync as they add more servers */ |
| 258 "proxy.eu.jabber.org"); | |
| 258 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, | 259 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, |
| 259 option); | 260 option); |
| 260 | 261 |
| 261 /* this should probably be part of global smiley theme settings later on, | 262 /* this should probably be part of global smiley theme settings later on, |
| 262 shared with MSN */ | 263 shared with MSN */ |