diff libpurple/protocols/jabber/libxmpp.c @ 25211:53b073da65ee

propagate from branch 'im.pidgin.pidgin' (head d7476bfe7f9003553f7b3ea48491f4cebd192098) to branch 'im.pidgin.cpw.malu.xmpp.ibb_ft' (head 11e25d42c31c1c2c0cd2dff0c862c638940dac19)

--- a/libpurple/protocols/jabber/libxmpp.c	Mon Sep 22 17:23:59 2008 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Tue Sep 23 17:44:38 2008 +0000
@@ -43,7 +43,7 @@
 #include "pep.h"
 #include "usertune.h"
 #include "caps.h"
-#include "ibb.h"
+#include "data.h"
 
 static PurplePluginProtocolInfo prpl_info =
 {
@@ -137,8 +137,7 @@
 			     purple_marshal_VOID__POINTER_POINTER, NULL, 2,
 			     purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION),
 			     purple_value_new_outgoing(PURPLE_TYPE_STRING));
-			   
-
+	
 	return TRUE;
 }
 
@@ -149,9 +148,8 @@
 	purple_signal_unregister(plugin, "jabber-sending-xmlnode");
 	
 	purple_signal_unregister(plugin, "jabber-sending-text");
-
-	jabber_si_uninit();
-	jabber_ibb_uninit();
+	
+	jabber_data_uninit();
 	
 	return TRUE;
 }
@@ -245,6 +243,13 @@
 	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"),
+		"custom_smileys", TRUE);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
+		option);
+
 	jabber_init_plugin(plugin);
 
 	purple_prefs_remove("/plugins/prpl/jabber");
@@ -274,14 +279,19 @@
 	jabber_tune_init();
 	jabber_caps_init();
 	
+	jabber_data_init();
+	
+	
 	jabber_ibb_init();
 	jabber_si_init();
 
 	jabber_add_feature("avatarmeta", AVATARNAMESPACEMETA, jabber_pep_namespace_only_when_pep_enabled_cb);
 	jabber_add_feature("avatardata", AVATARNAMESPACEDATA, jabber_pep_namespace_only_when_pep_enabled_cb);
-	jabber_add_feature("buzz", "http://www.xmpp.org/extensions/xep-0224.html#ns", jabber_buzz_isenabled);
-	jabber_add_feature("ibb", XEP_0047_NAMESPACE, NULL);
-					   
+	jabber_add_feature("buzz", "http://www.xmpp.org/extensions/xep-0224.html#ns",
+					   jabber_buzz_isenabled);
+	jabber_add_feature("bob", XEP_0231_NAMESPACE,
+					   jabber_custom_smileys_isenabled);
+
 	jabber_pep_register_handler("avatar", AVATARNAMESPACEMETA, jabber_buddy_avatar_update_metadata);
 }