[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=2885061

The following commit has been merged in the master branch:
commit 2885061215749270a5d4ef85bb9074d2f273e5be
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Tue Dec 20 11:53:43 2011 +0100

    Don't use features that are not needed. Some code polish.
---
 src/telepathy-contact.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/telepathy-contact.cpp b/src/telepathy-contact.cpp
index 1f54719..c932c55 100644
--- a/src/telepathy-contact.cpp
+++ b/src/telepathy-contact.cpp
@@ -70,7 +70,7 @@ void TelepathyContact::init()
 {
     Plasma::Applet::init();
 
-    qDebug() << "APPLET ID: " << id();
+    kDebug() << "APPLET ID: " << id();
 
     if (m_declarative) {
         QString qmlFile = KGlobal::dirs()->findResource("data", "plasma/plasmoids/org.kde.telepathy-contact/contents/ui/main.qml");
@@ -184,16 +184,10 @@ void TelepathyContact::setupAccountManager()
     // setup the telepathy account manager from where I'll retrieve info on accounts and contacts
     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::Account::FeatureCapabilities);
 
     Tp::ConnectionFactoryPtr connectionFactory = Tp::ConnectionFactory::create(QDBusConnection::sessionBus(),
-                                                                               Tp::Features() << Tp::Connection::FeatureCore
-                                                                               << Tp::Connection::FeatureRosterGroups
-                                                                               << Tp::Connection::FeatureRoster
-                                                                               << Tp::Connection::FeatureSelfContact);
+                                                                               Tp::Features() << Tp::Connection::FeatureCore);
 
     Tp::ContactFactoryPtr contactFactory = Tp::ContactFactory::create(Tp::Features()
                                                                       << Tp::Contact::FeatureAlias
@@ -230,7 +224,7 @@ void TelepathyContact::showConfigurationInterface()
 {
     if (!isUserConfiguring()) {
         Config *config = new Config(m_accountManager, 0);
-        connect(config, SIGNAL(setNewContact(Tp::ContactPtr, Tp::AccountPtr)), this, SLOT(setContact(Tp::ContactPtr, Tp::AccountPtr)));
+        connect(config, SIGNAL(setNewContact(Tp::ContactPtr,Tp::AccountPtr)), this, SLOT(setContact(Tp::ContactPtr,Tp::AccountPtr)));
         config->show();
     }
 }

-- 
ktp-contact-applet packaging