[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=32c57b2

The following commit has been merged in the master branch:
commit 32c57b25c4f814f6e4812f012227d408999272e3
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Sun Jun 19 00:10:11 2011 +0200

    Use proper account/group checking.
    
    REVIEW: 101663
---
 main-widget.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 27a903d..6ad20dd 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -64,6 +64,7 @@
 #include "remove-contact-dialog.h"
 #include "fetch-avatar-job.h"
 #include "groups-model.h"
+#include "groups-model-item.h"
 
 #define PREFERRED_TEXTCHAT_HANDLER "org.freedesktop.Telepathy.Client.KDE.TextUi"
 #define PREFERRED_FILETRANSFER_HANDLER "org.freedesktop.Telepathy.Client.KDE.FileTransfer"
@@ -478,7 +479,9 @@ void MainWidget::onContactListClicked(const QModelIndex& index)
         return;
     }
 
-    if (index.data(AccountsModel::AliasRole).toString().isEmpty()) {
+    if (index.data(AccountsModel::ItemRole).userType() == qMetaTypeId<AccountsModelItem*>()
+        || index.data(AccountsModel::ItemRole).userType() == qMetaTypeId<GroupsModelItem*>()) {
+
         if (m_contactsListView->isExpanded(index)) {
             m_contactsListView->collapse(index);
         } else {
@@ -493,7 +496,7 @@ void MainWidget::onContactListDoubleClick(const QModelIndex& index)
         return;
     }
 
-    if (!index.data(AccountsModel::AliasRole).toString().isEmpty()) {
+    if (index.data(AccountsModel::ItemRole).userType() == qMetaTypeId<ContactModelItem*>()) {
         kDebug() << "Text chat requested for index" << index;
         startTextChannel(index.data(AccountsModel::ItemRole).value<ContactModelItem*>());
     }

-- 
ktp-contact-list packaging