libtransport.git Changeset - f9b712391ef4

Changeset - f9b712391ef4

Parent rev.

Child rev.

[Not reviewed]

0 1 0

HanzZ - 14 years ago 2011-08-16 21:55:45
hanzz.k@gmail.com

Overwrite nickname in vcard only if it is not set yet

1 file changed with 5 insertions and 1 deletions:

backends/libpurple/main.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

 				LOG4CXX_WARN(logger, "Unhandled VCard Label '" << purple_notify_user_info_entry_get_label(vcardEntry) << "' " << purple_notify_user_info_entry_get_value(vcardEntry));
+			}
+		}
 		vcardEntries = vcardEntries->next;
+	}
 	if (nickname.empty() && !fullName.empty()) {
 		nickname = fullName;
+	}
 	bool ownInfo = name == purple_account_get_username(account);
 	std::cout << "RECEIVED " << name << " " << purple_account_get_username(account) << "\n";
 	if (ownInfo) {
 		const gchar *displayname = purple_connection_get_display_name(gc);
 		if (!displayname) {
 			displayname = purple_account_get_name_for_display(account);
+		}
 		if (displayname) {
+		if (displayname && nickname.empty()) {
 			nickname = displayname;
+		}
 		// avatar
 		PurpleStoredImage *avatar = purple_buddy_icons_find_account_icon(account);
 		if (avatar) {

0 comments (0 inline, 0 general)