changeset 17861:91cbd18fee06

svn revision 728 of Psi fixes the avatar namespace issue, so I can remove this workaround.
author Andreas Monitzer <pidgin@monitzer.com>
date Mon, 18 Jun 2007 02:19:17 +0000
parents 84638e3af1bc
children 248d2d0c606e
files libpurple/protocols/jabber/buddy.h libpurple/protocols/jabber/libxmpp.c
diffstat 2 files changed, 3 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/buddy.h	Mon Jun 18 01:55:54 2007 +0000
+++ b/libpurple/protocols/jabber/buddy.h	Mon Jun 18 02:19:17 2007 +0000
@@ -24,14 +24,8 @@
 
 #include "jabber.h"
 
-/* for some reason, Psi uses the first one instead of the second one as defined in the XEP */
-#ifndef USE_XEP_0084
-#define AVATARNAMESPACEDATA "http://jabber.org/protocol/avatar#data"
-#define AVATARNAMESPACEMETA "http://jabber.org/protocol/avatar#metadata"
-#else
 #define AVATARNAMESPACEDATA "http://www.xmpp.org/extensions/xep-0084.html#ns-data"
 #define AVATARNAMESPACEMETA "http://www.xmpp.org/extensions/xep-0084.html#ns-metadata"
-#endif
 
 typedef enum {
 	JABBER_BUDDY_STATE_UNKNOWN = -2,
--- a/libpurple/protocols/jabber/libxmpp.c	Mon Jun 18 01:55:54 2007 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Mon Jun 18 02:19:17 2007 +0000
@@ -234,10 +234,10 @@
         jabber_iq_init();
         jabber_pep_init();
 
-		jabber_add_feature("avatarnonxepmeta", AVATARNAMESPACEMETA, jabber_pep_namespace_only_when_pep_enabled_cb);
-		jabber_add_feature("avatarnonxepdata", AVATARNAMESPACEDATA, jabber_pep_namespace_only_when_pep_enabled_cb);
+		jabber_add_feature("avatarmeta", AVATARNAMESPACEMETA, jabber_pep_namespace_only_when_pep_enabled_cb);
+		jabber_add_feature("avatardata", AVATARNAMESPACEDATA, jabber_pep_namespace_only_when_pep_enabled_cb);
 		
-		jabber_pep_register_handler("avatarnonxep", AVATARNAMESPACEMETA, jabber_buddy_avatar_update_metadata);
+		jabber_pep_register_handler("avatar", AVATARNAMESPACEMETA, jabber_buddy_avatar_update_metadata);
 }