diff options
author | Mateu Batle <mateu.batle@collabora.co.uk> | 2011-08-02 15:52:54 -0500 |
---|---|---|
committer | Mateu Batle <mateu.batle@collabora.co.uk> | 2011-08-02 15:52:54 -0500 |
commit | 147d6f04eb1fbc845d739ab02c1b9d3c1826646b (patch) | |
tree | 6c2b7ebe0f9539ca8523afcc4d6cdc38170b8680 | |
parent | cadd7f6a006c42530069563f215f59a2fd9f02f8 (diff) | |
parent | 0ac93a997e77e07e3b9c35bda9e19d21eb5ea7fe (diff) |
Merge branch 'caps-update'
Reviewed-by: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
-rw-r--r-- | NEWS | 1 | ||||
-rw-r--r-- | TelepathyQt4Yell/Models/contact-model-item.cpp | 1 | ||||
-rw-r--r-- | TelepathyQt4Yell/Models/contact-model-item.h | 3 |
3 files changed, 5 insertions, 0 deletions
@@ -3,6 +3,7 @@ telepathy-qt4-yell 0.1.x Enhancements: * Emit a signal when an account item is added to AccountsModel + * Emit a signal on contact item when the caps get updated Fixes: * Report the connection status reason using the Connection object if possible diff --git a/TelepathyQt4Yell/Models/contact-model-item.cpp b/TelepathyQt4Yell/Models/contact-model-item.cpp index 564d831..9e1986c 100644 --- a/TelepathyQt4Yell/Models/contact-model-item.cpp +++ b/TelepathyQt4Yell/Models/contact-model-item.cpp @@ -203,6 +203,7 @@ Tp::ContactPtr ContactModelItem::contact() const void ContactModelItem::onCapabilitiesChanged() { mPriv->mCallContactCaps.updateRequestableChannelClasses(mPriv->mContact->capabilities().allClassSpecs().bareClasses()); + emit capabilitiesChanged(); } } diff --git a/TelepathyQt4Yell/Models/contact-model-item.h b/TelepathyQt4Yell/Models/contact-model-item.h index b6fd72e..4dbb5b1 100644 --- a/TelepathyQt4Yell/Models/contact-model-item.h +++ b/TelepathyQt4Yell/Models/contact-model-item.h @@ -46,6 +46,9 @@ public: Tp::ContactPtr contact() const; +Q_SIGNALS: + void capabilitiesChanged(); + public Q_SLOTS: void onChanged(); void onCapabilitiesChanged(); |