pidgin: b8bfeb89: Fix a bad merge in 511953ddd75ccd866325f...
darkrain42 at pidgin.im
darkrain42 at pidgin.im
Wed Apr 29 23:46:29 EDT 2009
-----------------------------------------------------------------
Revision: b8bfeb89a3051f7d0f958afccd71b8dd4b11560c
Ancestor: 13ac492a493b4d31c8b29905174b43a533304300
Author: darkrain42 at pidgin.im
Date: 2009-04-30T02:59:24
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b8bfeb89a3051f7d0f958afccd71b8dd4b11560c
Modified files:
libpurple/protocols/jabber/libxmpp.c
ChangeLog:
Fix a bad merge in 511953ddd75ccd866325fa6cf1e72dbb4fca3e82
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/libxmpp.c 7fb4cdca652ec69f448cd8c4945345f8e376640a
+++ libpurple/protocols/jabber/libxmpp.c b4050f1d4cc28f2a493ec3838fdd640f815a2c42
@@ -299,8 +299,7 @@ init_plugin(PurplePlugin *plugin)
jabber_ibb_init();
jabber_si_init();
- jabber_add_feature("http://www.xmpp.org/extensions/xep-0224.html#ns",
- jabber_buzz_isenabled);
+ jabber_add_feature(XEP_0224_NAMESPACE, jabber_buzz_isenabled);
jabber_add_feature(XEP_0231_NAMESPACE, jabber_custom_smileys_isenabled);
jabber_add_feature(XEP_0047_NAMESPACE, NULL);
}
More information about the Commits
mailing list