[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [ktp-common-internals] /: Add ClientTypesRole
From: Dominik Cermak <d.cermak () arcor ! de>
Date: 2012-07-11 10:39:16
Message-ID: 20120711103916.466CDA6094 () git ! kde ! org
[Download RAW message or body]
Git commit 00d355eb00ab2dcee331c6d852dc48d6f2026dd3 by Dominik Cermak.
Committed on 11/07/2012 at 12:37.
Pushed by cermak into branch 'master'.
Add ClientTypesRole
With this change TelepathyQt >= 0.9.2.1 is required.
CCBUG: 302963
REVIEW: 105513
M +2 -2 CMakeLists.txt
M +1 -0 KTp/Models/accounts-model.h
M +5 -0 KTp/Models/contact-model-item.cpp
http://commits.kde.org/telepathy-common-internals/00d355eb00ab2dcee331c6d852dc48d6f2026dd3
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;
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic