From 3ec7beccdab16afccbc19842c7eef3eedcf12d03 Mon Sep 17 00:00:00 2001 From: HanzZ Date: Mon, 13 Jun 2011 23:16:43 +0200 Subject: [PATCH] Forward display-name in VCards --- backends/libpurple/main.cpp | 9 +++++++++ src/networkpluginserver.cpp | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/backends/libpurple/main.cpp b/backends/libpurple/main.cpp index 25f19ae5..603493c5 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 02dae947..49f831ce 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()));