[SCM] ktp-common-internals packaging branch, master, updated. debian/16.04.2-1-111-g6e00b1c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=c0bd88e

The following commit has been merged in the master branch:
commit c0bd88ef554105375d4f8a12a32cf963c0aefb00
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue Feb 23 18:24:33 2016 -0500

    [kpeople] Add dedicated property for account display name
    
    Reviewed-by: Alexandr Akulich <akulichalexander at gmail.com>
---
 KTp/types.h                                         | 1 +
 kpeople/datasourceplugin/im-persons-data-source.cpp | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/KTp/types.h b/KTp/types.h
index 27eb897..8d3ca4f 100644
--- a/KTp/types.h
+++ b/KTp/types.h
@@ -93,6 +93,7 @@ namespace KTp
 }
 
 static const QString S_KPEOPLE_PROPERTY_ACCOUNT_PATH = QStringLiteral("telepathy-accountPath");
+static const QString S_KPEOPLE_PROPERTY_ACCOUNT_DISPLAY_NAME = QStringLiteral("telepathy-accountDisplayName");
 static const QString S_KPEOPLE_PROPERTY_CONTACT_ID = QStringLiteral("telepathy-contactId");
 static const QString S_KPEOPLE_PROPERTY_CONTACT_URI = QStringLiteral("telepathy-contactUri");
 static const QString S_KPEOPLE_PROPERTY_PRESENCE = QStringLiteral("telepathy-presence");
diff --git a/kpeople/datasourceplugin/im-persons-data-source.cpp b/kpeople/datasourceplugin/im-persons-data-source.cpp
index 05eb840..51037c9 100644
--- a/kpeople/datasourceplugin/im-persons-data-source.cpp
+++ b/kpeople/datasourceplugin/im-persons-data-source.cpp
@@ -87,6 +87,8 @@ public:
                 return s_presenceStrings.value(m_contact->presence().type());
             else if (key == AbstractContact::PictureProperty)
                 return m_contact->avatarPixmap();
+            else if (key == S_KPEOPLE_PROPERTY_ACCOUNT_DISPLAY_NAME)
+                return m_account->displayName();
         }
         return m_properties[key];
     }

-- 
ktp-common-internals packaging