[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=fd09783

The following commit has been merged in the master branch:
commit fd097833ac00d626a94cdb219ff61464b8880215
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Oct 13 15:37:23 2013 +0000

    Use a separate channelFactory for TextChannelWatcherProxyModel
    
    This ensures that we request the correct features for text channels
    in the clientregistrar rather than relying on the application
    AccountManager
    
    REVIEW: 113231
---
 KTp/Models/contacts-model.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/KTp/Models/contacts-model.cpp b/KTp/Models/contacts-model.cpp
index f03ad45..0f69eb5 100644
--- a/KTp/Models/contacts-model.cpp
+++ b/KTp/Models/contacts-model.cpp
@@ -168,7 +168,12 @@ void KTp::ContactsModel::updateGroupProxyModels()
 
     //if needed set up the client registrar and observer proxy model
     if (d->trackUnread && d->clientRegistrar.isNull()) {
-        d->clientRegistrar = Tp::ClientRegistrar::create(d->accountManager);
+
+        //share the accountFactory and connectFactory etc. from the main application, but create a new channelFactory that fetches the message queue for text chats
+        Tp::ChannelFactoryPtr channelFactory = Tp::ChannelFactory::create(QDBusConnection::sessionBus());
+        channelFactory->addFeaturesForTextChats(Tp::Features() << Tp::Channel::FeatureCore << Tp::TextChannel::FeatureMessageQueue);
+        d->clientRegistrar = Tp::ClientRegistrar::create(d->accountManager->accountFactory(), d->accountManager->connectionFactory(), channelFactory, d->accountManager->contactFactory());
+
         d->channelWatcherProxy = Tp::SharedPtr<KTp::TextChannelWatcherProxyModel>(new TextChannelWatcherProxyModel());
         d->channelWatcherProxy->setSourceModel(d->source);
         d->clientRegistrar->registerClient(Tp::AbstractClientPtr::dynamicCast(d->channelWatcherProxy), QLatin1String("ListWatcher"));

-- 
ktp-common-internals packaging