cpw.malu.xmpp.ibb_ft: c4bf6bc6: Some changes got lost when I merged...

malu at pidgin.im malu at pidgin.im
Tue Sep 23 14:03:01 EDT 2008


-----------------------------------------------------------------
Revision: c4bf6bc62d2ae69b7e872eab1fabbec2168ff649
Ancestor: 4f50d80422098d4c6c4a6da8c8a1c630cdb8ca47
Author: malu at pidgin.im
Date: 2008-09-23T17:55:53
Branch: im.pidgin.cpw.malu.xmpp.ibb_ft
URL: http://d.pidgin.im/viewmtn/revision/info/c4bf6bc62d2ae69b7e872eab1fabbec2168ff649

Modified files:
        libpurple/protocols/jabber/libxmpp.c

ChangeLog: 

Some changes got lost when I merged...

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/libxmpp.c	3daa51707bacf5c0b9d16110afb1de7914b574ad
+++ libpurple/protocols/jabber/libxmpp.c	9be8e39cabd7ce27f97c96d96061839c65cdc70c
@@ -44,6 +44,7 @@
 #include "usertune.h"
 #include "caps.h"
 #include "data.h"
+#include "ibb.h"
 
 static PurplePluginProtocolInfo prpl_info =
 {
@@ -150,6 +151,8 @@ static gboolean unload_plugin(PurplePlug
 	purple_signal_unregister(plugin, "jabber-sending-text");
 	
 	jabber_data_uninit();
+	jabber_si_uninit();
+	jabber_ibb_uninit();
 	
 	return TRUE;
 }
@@ -291,6 +294,7 @@ init_plugin(PurplePlugin *plugin)
 					   jabber_buzz_isenabled);
 	jabber_add_feature("bob", XEP_0231_NAMESPACE,
 					   jabber_custom_smileys_isenabled);
+	jabber_add_feature("ibb", XEP_0047_NAMESPACE, NULL);
 
 	jabber_pep_register_handler("avatar", AVATARNAMESPACEMETA, jabber_buddy_avatar_update_metadata);
 }


More information about the Commits mailing list