pidgin: 7fe4ff35: jabber: Handle "Extended Address" correc...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 7fe4ff35555d8e6b54d12ae565610485ae2efa4b
Ancestor: 561315b6287740585d64d5714065bfe7c06eaefd
Author: darkrain42 at pidgin.im
Date: 2009-07-29T19:16:02
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7fe4ff35555d8e6b54d12ae565610485ae2efa4b

Modified files:
        libpurple/protocols/jabber/buddy.c

ChangeLog: 

jabber: Handle "Extended Address" correctly.

Per an exchange on standards at xmpp.org, EXTADD is correct (which is also
what is generated by the prpl's Set User Info). Other clients generate
EXTADR, so keep it around for backward-compatibility.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/buddy.c	20fc2f99c45c3091845a9fadb6d1f1b7b046c4c7
+++ libpurple/protocols/jabber/buddy.c	25c2c2d0966767c9bc198afa9a297a347c7898a8
@@ -1018,7 +1018,12 @@ static void jabber_vcard_parse(JabberStr
 
 					if(!strcmp(child2->name, "POBOX")) {
 						purple_notify_user_info_add_pair(user_info, _("P.O. Box"), text2);
-					} else if(!strcmp(child2->name, "EXTADR")) {
+					} else if (g_str_equal(child2->name, "EXTADD") || g_str_equal(child2->name, "EXTADR")) {
+						/*
+						 * EXTADD is correct, EXTADR is generated by other
+						 * clients. The next time someone reads this, remove
+						 * EXTADR.
+						 */
 						purple_notify_user_info_add_pair(user_info, _("Extended Address"), text2);
 					} else if(!strcmp(child2->name, "STREET")) {
 						purple_notify_user_info_add_pair(user_info, _("Street Address"), text2);