changeset 28069:82ac0bef7d89

jabber: Handle "Extended Address" correctly. Per an exchange on standards@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.
author Paul Aurich <paul@darkrain42.org>
date Wed, 29 Jul 2009 19:16:02 +0000
parents 03c99fb4c981
children d0654dea0575
files libpurple/protocols/jabber/buddy.c
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/buddy.c	Wed Jul 29 02:32:00 2009 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Wed Jul 29 19:16:02 2009 +0000
@@ -1018,7 +1018,12 @@
 
 					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);