[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=00d355e

The following commit has been merged in the master branch:
commit 00d355eb00ab2dcee331c6d852dc48d6f2026dd3
Author: Dominik Cermak <d.cermak at arcor.de>
Date:   Wed Jul 11 12:37:29 2012 +0200

    Add ClientTypesRole
    
    With this change TelepathyQt >= 0.9.2.1 is required.
    
    CCBUG: 302963
    REVIEW: 105513
---
 CMakeLists.txt                    | 4 ++--
 KTp/Models/accounts-model.h       | 1 +
 KTp/Models/contact-model-item.cpp | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 491780f..0928941 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,10 +7,10 @@ set (CMAKE_MODULE_PATH
 
 set (KTP_VERSION "0.4")
 # Bump for every 0.x release, or whenever BC changes
-set (KTP_SONUMBER 1)
+set (KTP_SONUMBER 2)
 
 find_package (KDE4 REQUIRED)
-find_package (TelepathyQt4 0.9.0 REQUIRED)
+find_package (TelepathyQt4 0.9.2.1 REQUIRED)
 
 # set some default settings
 include (KDE4Defaults)
diff --git a/KTp/Models/accounts-model.h b/KTp/Models/accounts-model.h
index 23f901d..caf93fa 100644
--- a/KTp/Models/accounts-model.h
+++ b/KTp/Models/accounts-model.h
@@ -93,6 +93,7 @@ public:
         FileTransferCapabilityRole,
         DesktopSharingCapabilityRole,
         SSHContactCapabilityRole,
+        ClientTypesRole,
 
         TotalUsersCountRole,
         OnlineUsersCountRole,
diff --git a/KTp/Models/contact-model-item.cpp b/KTp/Models/contact-model-item.cpp
index 0261550..6778504 100644
--- a/KTp/Models/contact-model-item.cpp
+++ b/KTp/Models/contact-model-item.cpp
@@ -91,6 +91,9 @@ ContactModelItem::ContactModelItem(const Tp::ContactPtr &contact)
     connect(contact.data(),
             SIGNAL(blockStatusChanged(bool)),
             SLOT(onChanged()));
+    connect(contact.data(),
+            SIGNAL(clientTypesChanged(QStringList)),
+            SLOT(onChanged()));
 }
 
 ContactModelItem::~ContactModelItem()
@@ -146,6 +149,8 @@ QVariant ContactModelItem::data(int role) const
         return desktopSharingCapability();
     case AccountsModel::SSHContactCapabilityRole:
         return sshContactCapability();
+    case AccountsModel::ClientTypesRole:
+        return mPriv->mContact->clientTypes();
     default:
         break;
     }

-- 
ktp-common-internals packaging