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

The following commit has been merged in the master branch:
commit a3fc4f4f46ecca8304eba2e3b5c603145174dc1a
Author: Aleix Pol <aleixpol at kde.org>
Date:   Thu Feb 21 02:33:46 2013 +0100

    Move the ContactPin instance where it belongs
    
    ContactPin is a class that keeps track of the pin state against a contact.
    Don't forward properties and signals, put it where it should be. It's a small
    simplification in the code.
    
    REVIEW: 109070
---
 chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml           | 10 ++++++++--
 chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml |  9 ---------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
index 37c6991..e419c57 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
@@ -27,7 +27,6 @@ import org.kde.plasma.components 0.1 as PlasmaComponents
 FocusScope {
     id: chatWidget
     property Conversation conv
-    property alias pinned: pinButton.checked
 
     signal closeRequested
     signal pinnedClicked
@@ -77,9 +76,16 @@ FocusScope {
                 bottom: parent.bottom
             }
             checkable: true
+            checked: pin.pinned
 
             iconSource: "rating"
-            onClicked: chatWidget.pinnedClicked()
+            onClicked: pin.toggle()
+            ContactPin {
+                id: pin
+                model: pinnedModel
+                contact: chatWidget.conv.target.contact
+                account: chatWidget.conv.target.account
+            }
         }
 
         PlasmaComponents.ToolButton {
diff --git a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
index fc5592a..b82f34e 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
@@ -39,13 +39,6 @@ ConversationDelegateButton {
     
     Component.onCompleted: setVisible(model.conversation.messages.shouldStartOpened)
     
-    ContactPin {
-        id: pin
-        model: pinnedModel
-        contact: conversation.target.contact
-        account: conversation.target.account
-    }
-
     //FIXME: put in a loader to not slow down the model
     PlasmaCore.Dialog {
         id: dialog
@@ -59,8 +52,6 @@ ConversationDelegateButton {
             conv: model.conversation
 
             onCloseRequested: closeConversation()
-            onPinnedClicked: pin.toggle()
-            pinned: pin.pinned
         }
 
         onVisibleChanged: {

-- 
ktp-contact-applet packaging