# HG changeset patch # User Paul Aurich # Date 1241060364 0 # Node ID ca2c3d134eafe3d88f7de938eb5a5e167d0c5c08 # Parent 836a36564ff504efb7f8c4f07c95f7d0304993f2 Fix a bad merge in 511953ddd75ccd866325fa6cf1e72dbb4fca3e82 diff -r 836a36564ff5 -r ca2c3d134eaf libpurple/protocols/jabber/libxmpp.c --- a/libpurple/protocols/jabber/libxmpp.c Wed Apr 29 17:50:14 2009 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Thu Apr 30 02:59:24 2009 +0000 @@ -299,8 +299,7 @@ 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); }