[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=f400052

The following commit has been merged in the master branch:
commit f400052b1f85a899d080c1f89af83e7e58ad7ad0
Merge: 711f57db28350863b22bdaf90d204fa499012519 eae086df7994ad6f00bf4bd09a64865d6f0c22bf
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Nov 19 14:03:29 2012 +0900

    Merge branch 'use_ktp_actions'

 abstract-contact-delegate.cpp |  10 +--
 contact-list-widget.cpp       | 149 ++++++++++++------------------------------
 contact-list-widget.h         |  20 +++---
 contact-overlays.cpp          |   7 +-
 contact-overlays.h            |   4 +-
 context-menu.cpp              |  57 ++++++++--------
 main-widget.cpp               |   9 +--
 main-widget.h                 |   1 -
 8 files changed, 95 insertions(+), 162 deletions(-)

diff --cc contact-overlays.cpp
index 0c1bcbe,5cc4ce5..bc2671b
--- a/contact-overlays.cpp
+++ b/contact-overlays.cpp
@@@ -113,10 -113,11 +113,11 @@@ void StartChannelContactOverlay::slotCl
      Q_UNUSED(checked);
      QModelIndex index = button()->index();
  
 -    if (index.isValid()) {        
 +    if (index.isValid()) {
-         ContactModelItem* contactItem = index.data(ContactsModel::ItemRole).value<ContactModelItem*>();
-         if (contactItem) {
-             emit activated(contactItem);
+         Tp::AccountPtr account = index.data(ContactsModel::AccountRole).value<Tp::AccountPtr>();
+         Tp::ContactPtr contact = index.data(ContactsModel::ContactRole).value<Tp::ContactPtr>();
+         if (account && contact) {
+             emit activated(account, contact);
          }
      }
  }

-- 
ktp-contact-list packaging