Mercurial > pidgin
diff libpurple/protocols/jabber/libxmpp.c @ 27590:a08e84032814
merge of '2348ff22f0ff3453774b8b25b36238465580c609'
and 'e76f11543c2a4aa05bdf584f087cbe3439029661'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sun, 12 Jul 2009 05:43:38 +0000 |
| parents | e07abac099a2 |
| children | da22b6d0151e |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/libxmpp.c Sun Jul 12 05:42:40 2009 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Sun Jul 12 05:43:38 2009 +0000 @@ -288,7 +288,7 @@ purple_account_user_split_set_reverse(split, FALSE); prpl_info.user_splits = g_list_append(prpl_info.user_splits, split); - option = purple_account_option_bool_new(_("Require SSL/TLS"), "require_tls", FALSE); + option = purple_account_option_bool_new(_("Require SSL/TLS"), "require_tls", TRUE); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); @@ -319,6 +319,11 @@ prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); + option = purple_account_option_string_new(_("BOSH URL"), + "bosh_url", NULL); + prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, + option); + /* this should probably be part of global smiley theme settings later on, shared with MSN */ option = purple_account_option_bool_new(_("Show Custom Smileys"),