[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=044c3a2

The following commit has been merged in the master branch:
commit 044c3a2c99431109d0f1ffde1092749fff8d6c26
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue Feb 17 12:20:22 2015 +0100

    personId got renamed to personUri in KPeople
---
 person/contents/ui/main.qml            | 4 ++--
 person/contents/ui/settingsGeneral.qml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/person/contents/ui/main.qml b/person/contents/ui/main.qml
index 2dc52df..2dcc956 100644
--- a/person/contents/ui/main.qml
+++ b/person/contents/ui/main.qml
@@ -30,7 +30,7 @@ PlasmaCore.IconItem {
 
     PersonData {
         id: p
-        personId: plasmoid.configuration.personId
+        personUri: plasmoid.configuration.personId
     }
 
     PlasmaCore.ToolTipArea {
@@ -55,7 +55,7 @@ PlasmaCore.IconItem {
         Repeater {
             model: PersonActions {
                 id: actions
-                personId: plasmoid.configuration.personId
+                personUri: plasmoid.configuration.personId
             }
             delegate: PlasmaComponents.Button {
                 text: display
diff --git a/person/contents/ui/settingsGeneral.qml b/person/contents/ui/settingsGeneral.qml
index 7ea4c83..86eb0d1 100644
--- a/person/contents/ui/settingsGeneral.qml
+++ b/person/contents/ui/settingsGeneral.qml
@@ -38,7 +38,7 @@ ColumnLayout
         model: PersonsModel {}
         textRole: "display"
         onActivated: {
-            configRoot.cfg_personId = model.get(index, PersonsModel.PersonIdRole);
+            configRoot.cfg_personId = model.get(index, PersonsModel.PersonUriRole);
         }
     }
 
@@ -54,8 +54,8 @@ ColumnLayout
             return;
 
         for(var i=0; i<combo.count; ++i) {
-            var f = combo.model.get(i, PersonsModel.PersonIdRole);
             if (f == configRoot.cfg_personId) {
+            var f = combo.model.get(i, PersonsModel.PersonUriRole);
                 combo.currentIndex = combo.find(combo.model.get(i, Qt.DisplayRole));
             }
         }

-- 
ktp-contact-applet packaging