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

The following commit has been merged in the master branch:
commit c82c15e224bc604d24cff73baf576da9c4abc5e7
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Mar 11 01:24:30 2013 +0000

    Fix Join Chat Room Dialog from presence applet context menu
    
    Join Channel Widget filters by chatroom capabilities, caps weren't included
    in the AccountFactory so it didn't work.
    
    REVIEW: 109405
    BUG: 316491
---
 presence/src/presence-applet.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/presence/src/presence-applet.cpp b/presence/src/presence-applet.cpp
index c753e40..d9baa81 100644
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@ -114,7 +114,8 @@ void TelepathyPresenceApplet::init()
     Tp::AccountFactoryPtr  accountFactory = Tp::AccountFactory::create(QDBusConnection::sessionBus(),
                                                                        Tp::Features() << Tp::Account::FeatureCore
                                                                        << Tp::Account::FeatureProtocolInfo
-                                                                       << Tp::Account::FeatureProfile);
+                                                                       << Tp::Account::FeatureProfile
+                                                                       << Tp::Account::FeatureCapabilities);
 
     Tp::ConnectionFactoryPtr connectionFactory = Tp::ConnectionFactory::create(QDBusConnection::sessionBus(),
                                                                                Tp::Features() << Tp::Connection::FeatureCore

-- 
ktp-contact-applet packaging