--- a/libpurple/protocols/jabber/libxmpp.c Sat Apr 18 18:17:16 2009 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c Tue Apr 28 18:43:57 2009 +0000
@@ -216,19 +216,24 @@
#endif
PurpleAccountUserSplit *split;
PurpleAccountOption *option;
+
/* Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im */
split = purple_account_user_split_new(_("Domain"), NULL, '@');
purple_account_user_split_set_reverse(split, FALSE);
prpl_info.user_splits = g_list_append(prpl_info.user_splits, split);
+
split = purple_account_user_split_new(_("Resource"), NULL, '/');
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);
prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
option);
+
option = purple_account_option_bool_new(_("Force old (port 5223) SSL"), "old_ssl", FALSE);
prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
option);
+
option = purple_account_option_bool_new(
_("Allow plaintext auth over unencrypted streams"),
"auth_plain_in_clear", FALSE);
@@ -294,14 +299,10 @@
jabber_ibb_init();
jabber_si_init();
- jabber_add_feature(AVATARNAMESPACEMETA, jabber_pep_namespace_only_when_pep_enabled_cb);
- jabber_add_feature(AVATARNAMESPACEDATA, jabber_pep_namespace_only_when_pep_enabled_cb);
jabber_add_feature("http://www.xmpp.org/extensions/xep-0224.html#ns",
jabber_buzz_isenabled);
jabber_add_feature(XEP_0231_NAMESPACE, jabber_custom_smileys_isenabled);
jabber_add_feature(XEP_0047_NAMESPACE, NULL);
-
- jabber_pep_register_handler(AVATARNAMESPACEMETA, jabber_buddy_avatar_update_metadata);
}
