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

The following commit has been merged in the master branch:
commit b12a52ee05d0bf5738579eeb03e0d0b6d3181cfd
Author: Aleix Pol <aleixpol at kde.org>
Date:   Thu Feb 19 16:28:14 2015 +0100

    Remove workaround
    
    Provide an actionTriggered function instead of doing weird eval() calls.
---
 contactlist/org.kde.ktp-contactlist/contents/ui/main.qml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
index d218224..bd7af77 100644
--- a/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
+++ b/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
@@ -82,12 +82,8 @@ Item
         //TODO: The PresenceModel might change, this will never react to such changes
         for(var i=0; i<presenceModel.count; ++i) {
             var disp = presenceModel.get(i, "display");
-            var actionName = "setStatus"+disp;
+            var actionName = i;
             plasmoid.setAction(actionName, disp, presenceModel.get(i, "iconName"));
-
-            //NOTE: This is done like this only because we don't know better
-            var f = eval("function() { root.setPresence("+i+"); }");
-            plasmoid.action(actionName).triggered.connect(f);
         }
         plasmoid.setActionSeparator("statuses");
 
@@ -114,4 +110,13 @@ Item
     function action_joinChatRoom() { telepathyManager.joinChatRoom(); }
     function action_openContactList() { telepathyManager.toggleContactList(); }
     function action_openIMSettings() {telepathyManager.showSettingsKCM(); }
+
+    function actionTriggered(actionName) {
+        var number = parseInt(actionName)
+        if (number !== null) {
+            root.setPresence(number)
+        } else {
+            console.log("Unknown action", actionName);
+        }
+    }
 }

-- 
ktp-contact-applet packaging