cpw.malu.xmpp.jingle_ft: 0565c5d1: These were gone missing after merge...
malu at pidgin.im
malu at pidgin.im
Sun Dec 6 14:10:59 EST 2009
-----------------------------------------------------------------
Revision: 0565c5d1af0cac66f55f8dd1c875bed951a84228
Ancestor: 3b1ba9926091b4879a81208b3c83ba4c1df871fa
Author: malu at pidgin.im
Date: 2009-12-06T19:05:42
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/0565c5d1af0cac66f55f8dd1c875bed951a84228
Modified files:
libpurple/protocols/jabber/jabber.c
ChangeLog:
These were gone missing after merge...
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c 3b0ba847ce3fd060cc7c9be9a7a96d8933c33c84
+++ libpurple/protocols/jabber/jabber.c fb757b6e94d40c467c433e04d5b7869ff79a77e0
@@ -3527,6 +3527,11 @@ jabber_init_plugin(PurplePlugin *plugin)
jabber_add_feature(JINGLE_TRANSPORT_ICEUDP, 0);
#endif
+ /* Jingle FT */
+ jabber_add_feature(JINGLE_APP_FT, 0);
+ jabber_add_feature(JINGLE_TRANSPORT_S5B, 0);
+ jabber_add_feature(JINGLE_TRANSPORT_IBB, 0);
+
jabber_auth_init();
/* IPC functions */
More information about the Commits
mailing list