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

The following commit has been merged in the master branch:
commit bfd4c37183dbb2b9614ea52110864a5c5e3b7435
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Wed Dec 21 13:23:40 2011 +0100

    Unbreak the plasmoid config by returning FeatureRoster and FeatureRosterGroups into loaded features. These are used in the config dialog.
---
 src/telepathy-contact.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/telepathy-contact.cpp b/src/telepathy-contact.cpp
index c932c55..9ee1bf9 100644
--- a/src/telepathy-contact.cpp
+++ b/src/telepathy-contact.cpp
@@ -187,7 +187,9 @@ void TelepathyContact::setupAccountManager()
                                                                        << Tp::Account::FeatureCapabilities);
 
     Tp::ConnectionFactoryPtr connectionFactory = Tp::ConnectionFactory::create(QDBusConnection::sessionBus(),
-                                                                               Tp::Features() << Tp::Connection::FeatureCore);
+                                                                               Tp::Features() << Tp::Connection::FeatureCore
+                                                                               << Tp::Connection::FeatureRosterGroups
+                                                                               << Tp::Connection::FeatureRoster);
 
     Tp::ContactFactoryPtr contactFactory = Tp::ContactFactory::create(Tp::Features()
                                                                       << Tp::Contact::FeatureAlias

-- 
ktp-contact-applet packaging