[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=f21a516

The following commit has been merged in the master branch:
commit f21a51613725f391967e59fd57c8afee637d8bfe
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun May 22 23:03:26 2011 +0100

    Tidied up code in onContextMenuRequested
    
    Fixes crash on right click on header of groups model.
    
    BUG: 273807
---
 main-widget.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 10ec0fb..db5c89b 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -721,17 +721,16 @@ void MainWidget::onCustomContextMenuRequested(const QPoint &)
     QModelIndex index = m_contactsListView->currentIndex();
 
     Tp::ContactPtr contact;
-    if (m_groupContactsAction->isChecked()) {
-        contact = m_groupsModel->data(m_modelFilter->mapToSource(index), AccountsModel::ItemRole).value<ContactModelItem*>()->contact();
-    } else {
-        contact = m_model->contactForIndex(m_modelFilter->mapToSource(index));
-    }
+    QVariant item = index.data(AccountsModel::ItemRole);
 
-    if (contact.isNull()) {
-        kDebug() << "Contact is nulled";
+    //only handle contacts;
+    if(item.userType() != qMetaTypeId<ContactModelItem*>()) {
         return;
     }
 
+    contact = item.value<ContactModelItem*>()->contact();
+
+
     Tp::AccountPtr account;
     if (m_groupContactsAction->isChecked()) {
         account = qobject_cast<AccountsModelItem*>(m_groupsModel->data(m_modelFilter->mapToSource(index), AccountsModel::ItemRole).value<ContactModelItem*>()->parent())->account();

-- 
ktp-contact-list packaging