Mercurial > pidgin.yaz
changeset 26837:ca2c3d134eaf
Fix a bad merge in 511953ddd75ccd866325fa6cf1e72dbb4fca3e82
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Thu, 30 Apr 2009 02:59:24 +0000 |
parents | 836a36564ff5 |
children | cfde0f7fd54f |
files | libpurple/protocols/jabber/libxmpp.c |
diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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); }