[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=9f94d76

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

    [person] Also update the config var to personUri
    
    Given this wasn't really working, it should be safe
---
 person/contents/config/main.xml        |  2 +-
 person/contents/ui/main.qml            |  4 ++--
 person/contents/ui/settingsGeneral.qml | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/person/contents/config/main.xml b/person/contents/config/main.xml
index 69929cc..1e74d18 100644
--- a/person/contents/config/main.xml
+++ b/person/contents/config/main.xml
@@ -6,7 +6,7 @@
   <kcfgfile name=""/>
 
   <group name="Appearance">
-      <entry name="personId" type="String" />
+      <entry name="personUri" type="String" />
   </group>
 
 </kcfg>
diff --git a/person/contents/ui/main.qml b/person/contents/ui/main.qml
index 2dcc956..871c1c0 100644
--- a/person/contents/ui/main.qml
+++ b/person/contents/ui/main.qml
@@ -30,7 +30,7 @@ PlasmaCore.IconItem {
 
     PersonData {
         id: p
-        personUri: plasmoid.configuration.personId
+        personUri: plasmoid.configuration.personUri
     }
 
     PlasmaCore.ToolTipArea {
@@ -55,7 +55,7 @@ PlasmaCore.IconItem {
         Repeater {
             model: PersonActions {
                 id: actions
-                personUri: plasmoid.configuration.personId
+                personUri: plasmoid.configuration.personUri
             }
             delegate: PlasmaComponents.Button {
                 text: display
diff --git a/person/contents/ui/settingsGeneral.qml b/person/contents/ui/settingsGeneral.qml
index 86eb0d1..25f6df0 100644
--- a/person/contents/ui/settingsGeneral.qml
+++ b/person/contents/ui/settingsGeneral.qml
@@ -26,7 +26,7 @@ import org.kde.people 1.0
 ColumnLayout
 {
     id: configRoot
-    property string cfg_personId
+    property string cfg_personUri
 
     Label {
         text: i18n("Selected Person:")
@@ -38,7 +38,7 @@ ColumnLayout
         model: PersonsModel {}
         textRole: "display"
         onActivated: {
-            configRoot.cfg_personId = model.get(index, PersonsModel.PersonUriRole);
+            configRoot.cfg_personUri = model.get(index, PersonsModel.PersonUriRole);
         }
     }
 
@@ -46,16 +46,16 @@ ColumnLayout
         Layout.fillHeight: true
     }
 
-    onCfg_personIdChanged: {
+    onCfg_personUriChanged: {
         restore();
     }
     function restore() {
-        if (configRoot.cfg_personId == "")
+        if (configRoot.cfg_personUri == "")
             return;
 
         for(var i=0; i<combo.count; ++i) {
-            if (f == configRoot.cfg_personId) {
             var f = combo.model.get(i, PersonsModel.PersonUriRole);
+            if (f == configRoot.cfg_personUri) {
                 combo.currentIndex = combo.find(combo.model.get(i, Qt.DisplayRole));
             }
         }

-- 
ktp-contact-applet packaging