diff --git a/backends/libpurple/main.cpp b/backends/libpurple/main.cpp index 25f19ae5c309e4d9ae223cf51bfeeecb99bbd2b1..603493c55ff7e336e4d40ece36ca0e869dc66bf1 100644 --- a/backends/libpurple/main.cpp +++ b/backends/libpurple/main.cpp @@ -537,6 +537,15 @@ static void *notify_user_info(PurpleConnection *gc, const char *who, PurpleNotif vcardEntries = vcardEntries->next; } + const gchar *displayname = purple_connection_get_display_name(gc); + if (!displayname) { + displayname = purple_account_get_name_for_display(account); + } + + if (displayname) { + nickname = displayname; + } + if ((!firstName.empty() || !lastName.empty()) && fullName.empty()) fullName = firstName + " " + lastName; diff --git a/src/networkpluginserver.cpp b/src/networkpluginserver.cpp index 02dae94772dd9de78e2914e00c6f3e4a989fc7e6..49f831ce0836eb6b3a038c87cc02b89ceeeaab0d 100644 --- a/src/networkpluginserver.cpp +++ b/src/networkpluginserver.cpp @@ -214,7 +214,7 @@ void NetworkPluginServer::handleVCardPayload(const std::string &data) { // TODO: ERROR return; } - std::cout << "OMG?\n"; + boost::shared_ptr vcard(new Swift::VCard()); vcard->setFullName(payload.fullname()); vcard->setPhoto(Swift::createByteArray(payload.photo()));