[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=cbfa51b

The following commit has been merged in the master branch:
commit cbfa51b276323b8b20d719472c11cb87b5ae43bb
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Wed Jul 11 12:54:46 2012 +0300

    AccountsFilterModel: Implement capability filtering on accounts
---
 KTp/Models/accounts-filter-model.cpp | 32 ++++++++++++++++++++++++++++++++
 KTp/Models/accounts-model-item.cpp   | 16 ++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/KTp/Models/accounts-filter-model.cpp b/KTp/Models/accounts-filter-model.cpp
index bd8eaa4..9f42b60 100644
--- a/KTp/Models/accounts-filter-model.cpp
+++ b/KTp/Models/accounts-filter-model.cpp
@@ -90,6 +90,38 @@ bool AccountsFilterModel::Private::filterAcceptsAccount(const QModelIndex &index
         return false;
     }
 
+    // Check capability
+    if (capabilityFilterFlags != DoNotFilterByCapability) {
+        if ((capabilityFilterFlags & FilterByTextChatCapability)
+                && !index.data(AccountsModel::TextChatCapabilityRole).toBool()) {
+            return false;
+        }
+        if ((capabilityFilterFlags & FilterByMediaCallCapability)
+                && !index.data(AccountsModel::MediaCallCapabilityRole).toBool()) {
+            return false;
+        }
+        if ((capabilityFilterFlags & FilterByAudioCallCapability)
+                && !index.data(AccountsModel::AudioCallCapabilityRole).toBool()) {
+            return false;
+        }
+        if ((capabilityFilterFlags & FilterByVideoCallCapability)
+                && !index.data(AccountsModel::VideoCallCapabilityRole).toBool()) {
+            return false;
+        }
+        if ((capabilityFilterFlags & FilterByFileTransferCapability)
+                && !index.data(AccountsModel::FileTransferCapabilityRole).toBool()) {
+            return false;
+        }
+        if ((capabilityFilterFlags & FilterByDesktopSharingCapability)
+                && !index.data(AccountsModel::DesktopSharingCapabilityRole).toBool()) {
+            return false;
+        }
+        if ((capabilityFilterFlags & FilterBySSHContactCapability)
+                && !index.data(AccountsModel::SSHContactCapabilityRole).toBool()) {
+            return false;
+        }
+    }
+
     return true;
 }
 
diff --git a/KTp/Models/accounts-model-item.cpp b/KTp/Models/accounts-model-item.cpp
index b85e9e3..fa26edc 100644
--- a/KTp/Models/accounts-model-item.cpp
+++ b/KTp/Models/accounts-model-item.cpp
@@ -193,6 +193,22 @@ QVariant AccountsModelItem::data(int role) const
         return mPriv->mAccount->connectionStatus();
     case AccountsModel::ConnectionStatusReasonRole:
         return mPriv->mAccount->connectionStatusReason();
+    case AccountsModel::TextChatCapabilityRole:
+        return mPriv->mAccount->capabilities().textChats();
+    case AccountsModel::MediaCallCapabilityRole:
+        return mPriv->mAccount->capabilities().audioCalls()
+                || mPriv->mAccount->capabilities().videoCalls();
+    case AccountsModel::AudioCallCapabilityRole:
+        return mPriv->mAccount->capabilities().audioCalls();
+    case AccountsModel::VideoCallCapabilityRole:
+        return mPriv->mAccount->capabilities().videoCalls();
+    case AccountsModel::UpgradeCallCapabilityRole:
+        return mPriv->mAccount->capabilities().upgradingCalls();
+    case AccountsModel::FileTransferCapabilityRole:
+        return mPriv->mAccount->capabilities().fileTransfers();
+    case AccountsModel::DesktopSharingCapabilityRole:
+    case AccountsModel::SSHContactCapabilityRole:
+        return mPriv->mAccount->capabilities().streamTubes();
     default:
         return QVariant();
     }

-- 
ktp-common-internals packaging