Mercurial > pidgin.yaz

comparison libpurple/protocols/jabber/libxmpp.c @ 27577:6d26258e9f1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head ac87c285c7056f86005dc157b9870745de471f74) to branch 'im.pidgin.cpw.darkrain42.roster' (head 976d874853ac9745edb77d3cf107b92ebc037c10)
author Paul Aurich <paul@darkrain42.org>
date Mon, 06 Jul 2009 04:37:41 +0000
parents e07abac099a2
children da22b6d0151e
comparison
equal deleted inserted replaced
27576:b9da56683499 27577:6d26258e9f1d
286 286
287 split = purple_account_user_split_new(_("Resource"), NULL, '/'); 287 split = purple_account_user_split_new(_("Resource"), NULL, '/');
288 purple_account_user_split_set_reverse(split, FALSE); 288 purple_account_user_split_set_reverse(split, FALSE);
289 prpl_info.user_splits = g_list_append(prpl_info.user_splits, split); 289 prpl_info.user_splits = g_list_append(prpl_info.user_splits, split);
290 290
291 option = purple_account_option_bool_new(_("Require SSL/TLS"), "require_tls", FALSE); 291 option = purple_account_option_bool_new(_("Require SSL/TLS"), "require_tls", TRUE);
292 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, 292 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
293 option); 293 option);
294 294
295 option = purple_account_option_bool_new(_("Force old (port 5223) SSL"), "old_ssl", FALSE); 295 option = purple_account_option_bool_new(_("Force old (port 5223) SSL"), "old_ssl", FALSE);
296 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, 296 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
314 option = purple_account_option_string_new(_("File transfer proxies"), 314 option = purple_account_option_string_new(_("File transfer proxies"),
315 "ft_proxies", 315 "ft_proxies",
316 /* TODO: Is this an acceptable default? 316 /* TODO: Is this an acceptable default?
317 * Also, keep this in sync as they add more servers */ 317 * Also, keep this in sync as they add more servers */
318 "proxy.eu.jabber.org"); 318 "proxy.eu.jabber.org");
319 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
320 option);
321
322 option = purple_account_option_string_new(_("BOSH URL"),
323 "bosh_url", NULL);
319 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, 324 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
320 option); 325 option);
321 326
322 /* this should probably be part of global smiley theme settings later on, 327 /* this should probably be part of global smiley theme settings later on,
323 shared with MSN */ 328 shared with MSN */