[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 18123c11f43e1fa7d7476420f5c24b109a20344b
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Thu Feb 5 16:30:41 2015 +0100

    Set the Unknown and Error presences to something
    
    Otherwise the translation proxy will filter these out when we're online
    (as it rejects contacts without any presence), but these would appear
    when the user goes offline because at that point it's fetched from the
    cache, which simply contains all contacts and sets all of them to
    "offline".
    
    Additionally, we do want to have the blocked contacts available for KTp
    so the user can ublock them if needed. Their filtering is done by the
    KTp filter proxy and contact list setting.
    
    Issue found & fixed thanks to the testing application in tests/ \o/
---
 kpeople/datasourceplugin/im-persons-data-source.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kpeople/datasourceplugin/im-persons-data-source.cpp b/kpeople/datasourceplugin/im-persons-data-source.cpp
index c8b9432..f0868b8 100644
--- a/kpeople/datasourceplugin/im-persons-data-source.cpp
+++ b/kpeople/datasourceplugin/im-persons-data-source.cpp
@@ -78,8 +78,8 @@ const QHash<Tp::ConnectionPresenceType, QString> s_presenceStrings = {
         { Tp::ConnectionPresenceTypeExtendedAway, QString::fromLatin1("xa") },
         { Tp::ConnectionPresenceTypeHidden, QString::fromLatin1("hidden") }, //of 'offline' ?
         { Tp::ConnectionPresenceTypeBusy, QString::fromLatin1("busy") },
-        { Tp::ConnectionPresenceTypeUnknown, QString() },
-        { Tp::ConnectionPresenceTypeError, QString() }
+        { Tp::ConnectionPresenceTypeUnknown, QString::fromLatin1("unknown") },
+        { Tp::ConnectionPresenceTypeError, QString::fromLatin1("error") }
 };
 
 class TelepathyContact : public KPeople::AbstractContact

-- 
ktp-common-internals packaging