[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=14336c4

The following commit has been merged in the master branch:
commit 14336c45b90f328b8b82c84122ef96a9631afe54
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Tue Mar 13 15:03:01 2012 +0100

    Add SSH Contact filtering
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
    REVIEW: 104265
---
 KTp/Models/accounts-filter-model.cpp | 4 ++++
 KTp/Models/accounts-filter-model.h   | 1 +
 KTp/Models/accounts-model.cpp        | 1 +
 KTp/Models/accounts-model.h          | 1 +
 KTp/Models/contact-model-item.cpp    | 9 +++++++++
 KTp/Models/contact-model-item.h      | 1 +
 6 files changed, 17 insertions(+)

diff --git a/KTp/Models/accounts-filter-model.cpp b/KTp/Models/accounts-filter-model.cpp
index 5beb201..c17b335 100644
--- a/KTp/Models/accounts-filter-model.cpp
+++ b/KTp/Models/accounts-filter-model.cpp
@@ -179,6 +179,10 @@ bool AccountsFilterModel::Private::filterAcceptsContact(const QModelIndex &index
                 && !index.data(AccountsModel::DesktopSharingCapabilityRole).toBool()) {
             return false;
         }
+        if ((capabilityFilterFlags & FilterBySSHContactCapability)
+                && !index.data(AccountsModel::SSHContactCapabilityRole).toBool()) {
+            return false;
+        }
     }
 
 
diff --git a/KTp/Models/accounts-filter-model.h b/KTp/Models/accounts-filter-model.h
index c23b284..df4c7d5 100644
--- a/KTp/Models/accounts-filter-model.h
+++ b/KTp/Models/accounts-filter-model.h
@@ -169,6 +169,7 @@ public:
         FilterByVideoCallCapability            = 0x0008,
         FilterByFileTransferCapability         = 0x0010,
         FilterByDesktopSharingCapability       = 0x0020,
+        FilterBySSHContactCapability           = 0x0040,
 
         CustomFilterCapability                 = 0x10000 // a placemark for custom capabilities in inherited classes
     };
diff --git a/KTp/Models/accounts-model.cpp b/KTp/Models/accounts-model.cpp
index 51fca88..0b0971b 100644
--- a/KTp/Models/accounts-model.cpp
+++ b/KTp/Models/accounts-model.cpp
@@ -108,6 +108,7 @@ AccountsModel::AccountsModel(QObject *parent)
     roles[UpgradeCallCapabilityRole] = "upgradeCall";
     roles[FileTransferCapabilityRole] = "fileTransfer";
     roles[DesktopSharingCapabilityRole] = "desktopSharing";
+    roles[SSHContactCapabilityRole] = "sshContact";
     setRoleNames(roles);
 }
 
diff --git a/KTp/Models/accounts-model.h b/KTp/Models/accounts-model.h
index a67912d..a0b6d17 100644
--- a/KTp/Models/accounts-model.h
+++ b/KTp/Models/accounts-model.h
@@ -91,6 +91,7 @@ public:
         UpgradeCallCapabilityRole,
         FileTransferCapabilityRole,
         DesktopSharingCapabilityRole,
+        SSHContactCapabilityRole,
 
         TotalUsersCountRole,
         OnlineUsersCountRole,
diff --git a/KTp/Models/contact-model-item.cpp b/KTp/Models/contact-model-item.cpp
index 5014568..b7fd6de 100644
--- a/KTp/Models/contact-model-item.cpp
+++ b/KTp/Models/contact-model-item.cpp
@@ -142,6 +142,8 @@ QVariant ContactModelItem::data(int role) const
         return fileTransferCapability();
     case AccountsModel::DesktopSharingCapabilityRole:
         return desktopSharingCapability();
+    case AccountsModel::SSHContactCapabilityRole:
+        return sshContactCapability();
     default:
         break;
     }
@@ -217,4 +219,11 @@ bool ContactModelItem::desktopSharingCapability() const
     return contactCanHandleRfb && selfCanHandleRfb;
 }
 
+bool ContactModelItem::sshContactCapability() const
+{
+    bool contactCanHandleSSHContact = mPriv->mContact->capabilities().streamTubes(QLatin1String("x-ssh-contact"));
+    bool selfCanHandleSSHContact = true; // FIXME Check if ssh-contact client is installed
+    return contactCanHandleSSHContact && selfCanHandleSSHContact;
+}
+
 #include "contact-model-item.moc"
diff --git a/KTp/Models/contact-model-item.h b/KTp/Models/contact-model-item.h
index 4d8ce51..e581705 100644
--- a/KTp/Models/contact-model-item.h
+++ b/KTp/Models/contact-model-item.h
@@ -53,6 +53,7 @@ private:
     bool videoCallCapability() const;
     bool fileTransferCapability() const;
     bool desktopSharingCapability() const;
+    bool sshContactCapability() const;
 
     struct Private;
     friend struct Private;

-- 
ktp-common-internals packaging