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

The following commit has been merged in the master branch:
commit d2c9bfd206a9af6b4e9295790c917cc57a312c3e
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Wed Apr 1 21:47:59 2015 +0200

    Unmerge a single contact from person when single contact is selected
    
    Rather than always remove the whole Person
---
 main-widget.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 44c448d..5e400d1 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -717,8 +717,14 @@ void MainWidget::onMetacontactToggleTriggered()
         //we're removing contacts from person
         QStringList contacts;
         const QModelIndex &index = selection.first();
-        const QString &personUri = index.data(KTp::PersonIdRole).toString();
-        KPeople::unmergeContact(personUri);
+        QString uri;
+
+        if (index.parent().isValid() && index.parent().data(KTp::RowTypeRole).toInt() == KTp::PersonRowType) {
+            uri = index.data(KTp::IdRole).toString();
+        } else {
+            uri = index.data(KTp::PersonIdRole).toString();
+        }
+        KPeople::unmergeContact(uri);
     }
 #endif
 }

-- 
ktp-contact-list packaging