From 70b3f830a36e565d37834c4d00ea6a61628efbcf Mon Sep 17 00:00:00 2001
From: HanzZ <hanzz.k@gmail.com>
Date: Sat, 18 Jun 2011 11:00:55 +0200
Subject: [PATCH] log unknown vcard labels

---
 backends/libpurple/main.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/backends/libpurple/main.cpp b/backends/libpurple/main.cpp
index 74f06b29..b03db84e 100644
--- a/backends/libpurple/main.cpp
+++ b/backends/libpurple/main.cpp
@@ -668,17 +668,22 @@ static void *notify_user_info(PurpleConnection *gc, const char *who, PurpleNotif
 			else if (label=="Full Name"){
 				fullName = purple_notify_user_info_entry_get_value(vcardEntry);
 			}
+			else {
+				std::cout << "UNHANDLED VCARD LABEL '" << vcardEntry << "' " << purple_notify_user_info_entry_get_value(vcardEntry) << "\n";
+			}
 		}
 		vcardEntries = vcardEntries->next;
 	}
 
-	const gchar *displayname = purple_connection_get_display_name(gc);
-	if (!displayname) {
-		displayname = purple_account_get_name_for_display(account);
-	}
+	if (name == purple_account_get_username(account)) {
+		const gchar *displayname = purple_connection_get_display_name(gc);
+		if (!displayname) {
+			displayname = purple_account_get_name_for_display(account);
+		}
 
-	if (displayname) {
-		nickname = displayname;
+		if (displayname) {
+			nickname = displayname;
+		}
 	}
 
 	if ((!firstName.empty() || !lastName.empty()) && fullName.empty())