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

The following commit has been merged in the master branch:
commit 552472880e034183e5aadd70ba2f34bd61ae7173
Author: Aleix Pol <aleixpol at kde.org>
Date:   Thu Feb 26 18:09:33 2015 +0100

    Iterate over pins
    
    When pressing a pinned contact, prefer the same plasmoid to a separate
    chatting UI.
    Fix loading and saving of pin states
---
 chat/org.kde.ktp-chat/contents/ui/FullChatList.qml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/FullChatList.qml b/chat/org.kde.ktp-chat/contents/ui/FullChatList.qml
index 3788946..b8763d7 100644
--- a/chat/org.kde.ktp-chat/contents/ui/FullChatList.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/FullChatList.qml
@@ -91,7 +91,9 @@ Grid {
         delegate: ConversationDelegateButton {
             width: base.itemWidth
             height: base.itemHeight
-            onClicked: telepathyManager.startChat(account, contact)
+            onClicked: {
+                telepathyManager.startChat(account, contact, "org.freedesktop.Telepathy.Client.KTp.chatPlasmoid")
+            }
             avatar: decoration
             overlay: ExtraComponents.QIconItem {
                     anchors.fill: parent
@@ -106,11 +108,14 @@ Grid {
                 id: pinnedModel
                 conversations: conversationsModel
                 accountManager: telepathyManager.accountManager
-                state: plasmoid.configuration.pinnedContacts
 
-                Component.onDestruction: {
-                    console.log("saving state", pinnedModel.state)
-                    plasmoid.configuration.pinnedContacts = pinnedModel.state;
+                Component.onCompleted: {
+                    state = plasmoid.configuration.pinnedContacts
+                }
+
+                onStateChanged: {
+                    console.log("saving state", plasmoid.configuration.pinnedContacts)
+                    plasmoid.configuration.pinnedContacts = pinnedModel.state
                 }
             }
         }

-- 
ktp-contact-applet packaging