vcard tweaking

This commit is contained in:
HanzZ 2011-08-16 23:16:52 +02:00
parent f9b712391e
commit 13a6896ce1

View file

@ -894,6 +894,9 @@ static void *notify_user_info(PurpleConnection *gc, const char *who, PurpleNotif
vcardEntries = vcardEntries->next;
}
if ((!firstName.empty() || !lastName.empty()) && fullName.empty())
fullName = firstName + " " + lastName;
if (nickname.empty() && !fullName.empty()) {
nickname = fullName;
}
@ -923,9 +926,6 @@ static void *notify_user_info(PurpleConnection *gc, const char *who, PurpleNotif
}
}
if ((!firstName.empty() || !lastName.empty()) && fullName.empty())
fullName = firstName + " " + lastName;
PurpleBuddy *buddy = purple_find_buddy(purple_connection_get_account(gc), who);
if (buddy && photo.size() == 0) {
gsize len;