[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=427cb59

The following commit has been merged in the master branch:
commit 427cb59dbd34df616c7ebfa9e1b233206d484acb
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Aug 9 14:14:34 2013 +0100

    Remove hack to work around connections with no RosterGroups
    
    This is now handled inside GlobalContactManager which upgrades
    connections to have roster/rostergroups() on demand
    
    This also theoretically makes AccountManager loading faster so the
    current presence will be updated quicker
    
    REVIEW: 111966
---
 main-widget.cpp | 50 +-------------------------------------------------
 1 file changed, 1 insertion(+), 49 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index b9129fa..88cc868 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -66,52 +66,6 @@
 #include "tooltips/tooltipmanager.h"
 #include "context-menu.h"
 
-/** Start of bodge to work around https://bugs.freedesktop.org/show_bug.cgi?id=57739
-    Due to a bug in TelepathyQt if we request a feature that the connection does not support, it simply fails.
-
-    Local-XMPP does not support grouping, so salut the local-xmpp spec does not either.
-    When we request the ContactRosterGroups feature on all connections, salut fails and therefore doesn't show any contacts.
-
-    Fetching ContactRosterGroups seperately is not a viable option as contacts would move after loading
-
-    In this hack we make a new ConnectionFactory that fetches ContactRosterGroups on all connections _Except_ salut
-    by overriding the featuresFor method which determines which features should be added to a given DBus proxy, in this case a connection.
-
-    When https://bugs.freedesktop.org/show_bug.cgi?id=57739 is fixes all this code should be removed and we should create a standard Tp::ConnectionFactory
- */
-namespace KTp {
-    class ConnectionFactory : Tp::ConnectionFactory {
-    public:
-        static Tp::ConnectionFactoryPtr create(const QDBusConnection &bus, const Tp::Features &features=Tp::Features());
-    protected:
-        ConnectionFactory(const QDBusConnection &bus, const Tp::Features& features);
-        virtual Tp::Features featuresFor(const Tp::DBusProxyPtr &proxy) const;
-    };
-}
-
-Tp::ConnectionFactoryPtr KTp::ConnectionFactory::create(const QDBusConnection &bus, const Tp::Features &features)
-{
-    return Tp::ConnectionFactoryPtr(new KTp::ConnectionFactory(bus, features));
-}
-
-KTp::ConnectionFactory::ConnectionFactory(const QDBusConnection &bus, const Tp::Features &features): Tp::ConnectionFactory(bus, features)
-{
-}
-
-Tp::Features KTp::ConnectionFactory::featuresFor(const Tp::DBusProxyPtr &proxy) const
-{
-    Tp::Features features = Tp::FixedFeatureFactory::featuresFor(proxy);
-
-    Tp::ConnectionPtr cm = Tp::ConnectionPtr::qObjectCast<>(proxy);
-    if (cm && cm->cmName() == QLatin1String("salut")) {
-        features.remove(Tp::Connection::FeatureRosterGroups);
-    }
-    return features;
-}
-/** End of bodge*/
-
-
-
 bool kde_tp_filter_contacts_by_publication_status(const Tp::ContactPtr &contact)
 {
     return contact->publishState() == Tp::Contact::PresenceStateAsk;
@@ -515,10 +469,8 @@ void MainWidget::setupTelepathy()
                                                                        << Tp::Account::FeatureProtocolInfo
                                                                        << Tp::Account::FeatureProfile);
 
-    Tp::ConnectionFactoryPtr connectionFactory = KTp::ConnectionFactory::create(QDBusConnection::sessionBus(),
+    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

-- 
ktp-contact-list packaging