[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=a141bd2

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

    If in kpeople mode use the shared AccountManager
    
    REVIEW: 113232
    BUG:325216
---
 main-widget.cpp | 57 +++++++++++++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 525df47..65beae8 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -515,32 +515,37 @@ void MainWidget::setupToolBar()
 void MainWidget::setupTelepathy()
 {
     Tp::registerTypes();
-    Tp::AccountFactoryPtr  accountFactory = Tp::AccountFactory::create(QDBusConnection::sessionBus(),
-                                                                       Tp::Features() << Tp::Account::FeatureCore
-                                                                       << Tp::Account::FeatureAvatar
-                                                                       << Tp::Account::FeatureCapabilities
-                                                                       << Tp::Account::FeatureProtocolInfo
-                                                                       << Tp::Account::FeatureProfile);
-
-    Tp::ConnectionFactoryPtr connectionFactory = Tp::ConnectionFactory::create(QDBusConnection::sessionBus(),
-                                                                               Tp::Features() << Tp::Connection::FeatureCore
-                                                                               << Tp::Connection::FeatureSelfContact);
-
-    Tp::ContactFactoryPtr contactFactory = KTp::ContactFactory::create(Tp::Features()  << Tp::Contact::FeatureAlias
-                                                                      << Tp::Contact::FeatureAvatarToken
-                                                                      << Tp::Contact::FeatureAvatarData
-                                                                      << Tp::Contact::FeatureSimplePresence
-                                                                      << Tp::Contact::FeatureCapabilities
-                                                                      << Tp::Contact::FeatureClientTypes);
-
-    Tp::ChannelFactoryPtr channelFactory = Tp::ChannelFactory::create(QDBusConnection::sessionBus());
-    channelFactory->addFeaturesForTextChats(Tp::Features() << Tp::Channel::FeatureCore << Tp::TextChannel::FeatureMessageQueue);
-
-    m_accountManager = Tp::AccountManager::create(QDBusConnection::sessionBus(),
-                                                  accountFactory,
-                                                  connectionFactory,
-                                                  channelFactory,
-                                                  contactFactory);
+
+    if (KTp::kpeopleEnabled()) {
+        m_accountManager = KTp::accountManager();
+    } else {
+
+        Tp::AccountFactoryPtr  accountFactory = Tp::AccountFactory::create(QDBusConnection::sessionBus(),
+                                                                        Tp::Features() << Tp::Account::FeatureCore
+                                                                        << Tp::Account::FeatureAvatar
+                                                                        << Tp::Account::FeatureCapabilities
+                                                                        << Tp::Account::FeatureProtocolInfo
+                                                                        << Tp::Account::FeatureProfile);
+
+        Tp::ConnectionFactoryPtr connectionFactory = Tp::ConnectionFactory::create(QDBusConnection::sessionBus(),
+                                                                                Tp::Features() << Tp::Connection::FeatureCore
+                                                                                << Tp::Connection::FeatureSelfContact);
+
+        Tp::ContactFactoryPtr contactFactory = KTp::ContactFactory::create(Tp::Features()  << Tp::Contact::FeatureAlias
+                                                                        << Tp::Contact::FeatureAvatarToken
+                                                                        << Tp::Contact::FeatureAvatarData
+                                                                        << Tp::Contact::FeatureSimplePresence
+                                                                        << Tp::Contact::FeatureCapabilities
+                                                                        << Tp::Contact::FeatureClientTypes);
+
+        Tp::ChannelFactoryPtr channelFactory = Tp::ChannelFactory::create(QDBusConnection::sessionBus());
+
+        m_accountManager = Tp::AccountManager::create(QDBusConnection::sessionBus(),
+                                                    accountFactory,
+                                                    connectionFactory,
+                                                    channelFactory,
+                                                    contactFactory);
+    }
 
     connect(m_accountManager->becomeReady(), SIGNAL(finished(Tp::PendingOperation*)),
             this, SLOT(onAccountManagerReady(Tp::PendingOperation*)));

-- 
ktp-contact-list packaging