[SCM] ktp-contact-runner packaging branch, master, updated. debian/15.12.1-2-244-g38a1f58

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-runner.git;a=commitdiff;h=3fba6e9

The following commit has been merged in the master branch:
commit 3fba6e9f66764248d03627b9d0116b1fe3fb56b1
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Feb 7 14:48:23 2013 +0100

    Port away from KTp::AccountsFilterModel
---
 src/contactrunner.cpp | 39 +++++++++++++++++++--------------------
 src/contactrunner.h   | 13 ++++++++++---
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/contactrunner.cpp b/src/contactrunner.cpp
index 6fbae06..605b89b 100644
--- a/src/contactrunner.cpp
+++ b/src/contactrunner.cpp
@@ -38,12 +38,11 @@
 #include <TelepathyQt/Constants>
 #include <TelepathyQt/ContactCapabilities>
 
-#include <KTp/Models/accounts-model-item.h>
-#include <KTp/Models/accounts-filter-model.h>
-#include <KTp/Models/contact-model-item.h>
 #include <KTp/presence.h>
 #include <KTp/global-presence.h>
 #include <KTp/actions.h>
+#include <KTp/contact-factory.h>
+#include <KTp/contact.h>
 
 struct MatchInfo {
     Tp::AccountPtr account;
@@ -114,7 +113,7 @@ ContactRunner::ContactRunner(QObject *parent, const QVariantList &args):
                                                     << Tp::Connection::FeatureSelfContact
                                                     << Tp::Connection::FeatureRoster);
 
-    Tp::ContactFactoryPtr contactFactory = Tp::ContactFactory::create(
+    Tp::ContactFactoryPtr contactFactory = KTp::ContactFactory::create(
                                                 Tp::Features()  << Tp::Contact::FeatureAlias
                                                     << Tp::Contact::FeatureAvatarData
                                                     << Tp::Contact::FeatureSimplePresence
@@ -256,33 +255,33 @@ void ContactRunner::run(const Plasma::RunnerContext &context, const Plasma::Quer
     }
 }
 
-bool ContactRunner::hasCapability(const Tp::ContactPtr &contact, AccountsFilterModel::CapabilityFilterFlag capability) const
+bool ContactRunner::hasCapability(const Tp::ContactPtr &contact, Capability capability) const
 {
-    if (capability == AccountsFilterModel::DoNotFilterByCapability) {
+    if (capability == AllCapabilitites) {
         return true;
     }
 
-    if ((capability == AccountsFilterModel::FilterByTextChatCapability) &&
+    if ((capability == TextChatCapability) &&
         contact->capabilities().textChats()) {
         return true;
     }
 
-    if ((capability == AccountsFilterModel::FilterByAudioCallCapability) &&
+    if ((capability == AudioCallCapability) &&
         contact->capabilities().audioCalls()) {
         return true;
     }
 
-    if ((capability == AccountsFilterModel::FilterByVideoCallCapability) &&
+    if ((capability == VideoCallCapability) &&
         contact->capabilities().videoCalls()) {
         return true;
     }
 
-    if ((capability == AccountsFilterModel::FilterByFileTransferCapability) &&
+    if ((capability == FileTransferCapability) &&
         contact->capabilities().fileTransfers()) {
         return true;
     }
 
-    if ((capability == AccountsFilterModel::FilterByDesktopSharingCapability) &&
+    if ((capability == DesktopSharingCapability) &&
         contact->capabilities().streamTubes(QLatin1String("org.freedesktop.Telepathy.Client.krfb_rfb_handler"))) {
         return true;
     }
@@ -296,34 +295,34 @@ void ContactRunner::matchContacts(Plasma::RunnerContext &context)
 
     QAction *defaultAction;
     QString contactQuery;
-    AccountsFilterModel::CapabilityFilterFlag filterFlag;
+    Capability capability;
     if (term.startsWith(QLatin1String("chat "), Qt::CaseInsensitive)) {
         defaultAction = action(QLatin1String("start-text-chat"));
-        filterFlag = AccountsFilterModel::FilterByTextChatCapability;
+        capability = TextChatCapability;
         contactQuery = term.mid(QString("chat").length()).trimmed();
     } else if (term.startsWith(QLatin1String("audiocall "), Qt::CaseInsensitive)) {
         defaultAction = action(QLatin1String("start-audio-call"));
-        filterFlag = AccountsFilterModel::FilterByAudioCallCapability;
+        capability = AudioCallCapability;
         contactQuery = term.mid(QString("audiocall").length()).trimmed();
     } else if (term.startsWith(QLatin1String("videocall "), Qt::CaseInsensitive)) {
         defaultAction = action(QLatin1String("start-video-call"));
-        filterFlag = AccountsFilterModel::FilterByVideoCallCapability;
+        capability = VideoCallCapability;
         contactQuery = term.mid(QString("videocall").length()).trimmed();
     } else if (term.startsWith(QLatin1String("sendfile "), Qt::CaseInsensitive)) {
         defaultAction = action(QLatin1String("start-file-transfer"));
-        filterFlag = AccountsFilterModel::FilterByFileTransferCapability;
+        capability = FileTransferCapability;
         contactQuery = term.mid(QString("sendfile").length()).trimmed();
     } else if (term.startsWith(QLatin1String("sharedesktop "), Qt::CaseInsensitive)) {
         defaultAction = action(QLatin1String("start-desktop-sharing"));
-        filterFlag = AccountsFilterModel::FilterByDesktopSharingCapability;
+        capability = DesktopSharingCapability;
         contactQuery = term.mid(QString("sharedesktop").length()).trimmed();
     } else if (term.startsWith(QLatin1String("log "), Qt::CaseInsensitive)) {
         defaultAction = action(QLatin1String("show-log-viewer"));
-        filterFlag = AccountsFilterModel::DoNotFilterByCapability;
+        capability = AllCapabilitites;
         contactQuery = term.mid(QString("log").length()).trimmed();
     } else {
         defaultAction = action(QLatin1String("start-text-chat"));
-        filterFlag = AccountsFilterModel::DoNotFilterByCapability;
+        capability = AllCapabilitites;
         contactQuery = term;
     }
 
@@ -338,7 +337,7 @@ void ContactRunner::matchContacts(Plasma::RunnerContext &context)
             Plasma::QueryMatch match(this);
             qreal relevance = 0.1;
 
-            if (!hasCapability(contact, filterFlag)) {
+            if (!hasCapability(contact, capability)) {
                 continue;
             }
 
diff --git a/src/contactrunner.h b/src/contactrunner.h
index 751b17d..f0c91b8 100644
--- a/src/contactrunner.h
+++ b/src/contactrunner.h
@@ -25,8 +25,6 @@
 #include <Plasma/AbstractRunner>
 #include <KIcon>
 
-#include <KTp/Models/accounts-filter-model.h>
-
 #include <TelepathyQt/AccountManager>
 
 namespace KTp
@@ -45,6 +43,15 @@ class ContactRunner : public Plasma::AbstractRunner
     Q_OBJECT
 
   public:
+    enum Capability {
+        AllCapabilitites = 0,
+        TextChatCapability,
+        AudioCallCapability,
+        VideoCallCapability,
+        DesktopSharingCapability,
+        FileTransferCapability
+    };
+
     ContactRunner( QObject *parent, const QVariantList& args );
     ~ContactRunner();
 
@@ -58,7 +65,7 @@ class ContactRunner : public Plasma::AbstractRunner
     void accountManagerReady(Tp::PendingOperation *operation);
 
   private:
-    bool hasCapability(const Tp::ContactPtr &contact, AccountsFilterModel::CapabilityFilterFlag capability) const;
+    bool hasCapability(const Tp::ContactPtr &contact, Capability capability) const;
 
     void matchPresence(Plasma::RunnerContext &context);
     void matchContacts(Plasma::RunnerContext &context);

-- 
ktp-contact-runner packaging