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

The following commit has been merged in the master branch:
commit b09bef242680d258a2531a24058a9baf560eb076
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Fri Apr 3 18:22:53 2015 +0200

    KPeople merging requires Contact URI, not ID
    
    CCBUG: 345769
---
 main-widget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 5e400d1..e098259 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -720,7 +720,7 @@ void MainWidget::onMetacontactToggleTriggered()
         QString uri;
 
         if (index.parent().isValid() && index.parent().data(KTp::RowTypeRole).toInt() == KTp::PersonRowType) {
-            uri = index.data(KTp::IdRole).toString();
+            uri = index.data(KTp::ContactUriRole).toString();
         } else {
             uri = index.data(KTp::PersonIdRole).toString();
         }

-- 
ktp-contact-list packaging