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

The following commit has been merged in the master branch:
commit f1c069cfff8dbe156fc26692d1778cfa384e3c1d
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Feb 16 18:43:40 2014 +0100

    Simplify contact list test
---
 tests/contact-list-model-view-main.cpp | 30 +++---------------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/tests/contact-list-model-view-main.cpp b/tests/contact-list-model-view-main.cpp
index ca7cab1..a2ddde4 100644
--- a/tests/contact-list-model-view-main.cpp
+++ b/tests/contact-list-model-view-main.cpp
@@ -38,6 +38,8 @@
 
 #include "KTp/Models/contacts-list-model.h"
 #include "KTp/contact-factory.h"
+#include "KTp/core.h"
+
 
 int main(int argc, char *argv[])
 {
@@ -58,33 +60,7 @@ int main(int argc, char *argv[])
     Tp::enableWarnings(true);
 
     
-        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::FeatureRosterGroups
-                                                                               << Tp::Connection::FeatureRoster
-                                                                               << Tp::Connection::FeatureSelfContact);
-
-    Tp::ContactFactoryPtr contactFactory = KTp::ContactFactory::create(Tp::Features()  << Tp::Contact::FeatureAlias
-                                                                      << 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);
-
-    Tp::AccountManagerPtr accountManager = Tp::AccountManager::create(QDBusConnection::sessionBus(),
-                                                  accountFactory,
-                                                  connectionFactory,
-                                                  channelFactory,
-                                                  contactFactory);
+    const Tp::AccountManagerPtr accountManager = KTp::accountManager();
 
     KTp::ContactsListModel *model = new KTp::ContactsListModel(&app);
     model->setAccountManager(accountManager);

-- 
ktp-common-internals packaging