# HG changeset patch
# User Andreas Monitzer <pidgin@monitzer.com>
# Date 1182133157 0
# Node ID 91cbd18fee06d1094a67d7e5972564e70fd7e4f0
# Parent  84638e3af1bcc175aed4c3b203ce137970366205
svn revision 728 of Psi fixes the avatar namespace issue, so I can remove this workaround.

diff -r 84638e3af1bc -r 91cbd18fee06 libpurple/protocols/jabber/buddy.h
--- 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,
diff -r 84638e3af1bc -r 91cbd18fee06 libpurple/protocols/jabber/libxmpp.c
--- 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);
 }