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

Maximiliano Curia maxy at moszumanska.debian.org
Mon May 9 09:08:32 UTC 2016


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

The following commit has been merged in the master branch:
commit bf6e645ae8d287a78ecd7a10884684e936a2ee45
Author: Aleix Pol <aleixpol at kde.org>
Date:   Mon Nov 24 19:37:05 2014 +0100

    Fix loading of the kpeople backend cache
    
    We need to turn the accountId -> accountPath. Otherwise we're using wrong
    identifiers in some places. For some reason, the UI kept working, but better
    make sure things are working properly underneath.
---
 kpeople/datasourceplugin/im-persons-data-source.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kpeople/datasourceplugin/im-persons-data-source.cpp b/kpeople/datasourceplugin/im-persons-data-source.cpp
index a948ba9..62c7609 100644
--- a/kpeople/datasourceplugin/im-persons-data-source.cpp
+++ b/kpeople/datasourceplugin/im-persons-data-source.cpp
@@ -145,7 +145,7 @@ void KTpAllContacts::loadCache()
         }
 
         addressee.insertCustom(S_KABC_PRODUCT, S_KABC_FIELD_CONTACT_ID, contactId);
-        addressee.insertCustom(S_KABC_PRODUCT, S_KABC_FIELD_ACCOUNT_PATH, accountId);
+        addressee.insertCustom(S_KABC_PRODUCT, S_KABC_FIELD_ACCOUNT_PATH, TP_QT_ACCOUNT_OBJECT_PATH_BASE + QLatin1Char('/') + accountId);
         addressee.insertCustom(S_KABC_PRODUCT, S_KABC_FIELD_PRESENCE, m_presenceStrings.at(Tp::ConnectionPresenceTypeOffline));
 
         const QString uri = QLatin1String("ktp://") + accountId + QLatin1Char('?') + contactId;

-- 
ktp-common-internals packaging



More information about the pkg-kde-commits mailing list