[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=1cf2333

The following commit has been merged in the master branch:
commit 1cf233307aab60c487cab28cb2060ba2e17ebac5
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Apr 21 22:54:42 2013 +0100

    Port Chat applet to new declarative API
---
 .../contents/ui/ConversationDelegateButton.qml     |  3 +-
 chat/org.kde.ktp-chat/contents/ui/main.qml         | 34 ++++++++++++++--------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
index e76149b..619b19a 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
@@ -56,9 +56,8 @@ PlasmaComponents.ToolButton
         property bool dragging: false
 
         anchors.fill: parent
-        DeclarativeKTpActions { id: actions }
         onDrop: if (event.mimeData.url!="") {
-            actions.startFileTransfer(parent.account, parent.contact, event.mimeData.url)
+            telepathyManager.startFileTransfer(parent.account, parent.contact, event.mimeData.url);
             dragging=false
         }
         onDragEnter: dragging=true
diff --git a/chat/org.kde.ktp-chat/contents/ui/main.qml b/chat/org.kde.ktp-chat/contents/ui/main.qml
index 0f18b8b..641414a 100644
--- a/chat/org.kde.ktp-chat/contents/ui/main.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/main.qml
@@ -19,7 +19,7 @@
 */
 
 import QtQuick 1.0
-import org.kde.telepathy 0.1
+import org.kde.telepathy 0.1 as KTp
 import org.kde.plasma.components 0.1 as PlasmaComponents
 import org.kde.plasma.core 0.1 as PlasmaCore
 import org.kde.qtextracomponents 0.1 as ExtraComponents
@@ -45,18 +45,27 @@ Grid {
     rows:    flow===Flow.LeftToRight ?  1 : -1
     columns: flow===Flow.LeftToRight ? -1 :  1
 
-    TelepathyTextObserver { id: handler }
-    HideWindowComponent { id: windowHide }
+
+    KTp.ConversationsModel {
+        id: conversationsModel
+    }
+
+    KTp.HideWindowComponent {
+        id: windowHide
+    }
+
     Binding {
         target: plasmoid
         property: "status"
-        value: (base.currentIndex >= 0                     ? AcceptingInputStatus
-                : handler.conversations.totalUnreadCount>0 ? NeedsAttentionStatus
-                : conversationsView.count>0                ? ActiveStatus
-                                                           : PassiveStatus)
+        value: (base.currentIndex >= 0                  ? AcceptingInputStatus
+                : conversationsModel.totalUnreadCount>0 ? NeedsAttentionStatus
+                : conversationsView.count>0             ? ActiveStatus
+                                                        : PassiveStatus)
     }
 
     Component.onCompleted: {
+        telepathyManager.addTextChatFeatures();
+        telepathyManager.registerClient(conversationsModel, "KTp.ChatPlasmoid");
         plasmoid.aspectRatioMode = plasmoid.IgnoreAspectRatio
         plasmoid.addEventListener('activate', function() {
             base.currentIndex = handler.conversations.nextActiveConversation(base.currentIndex+1 % handler.conversations)
@@ -78,11 +87,11 @@ Grid {
             account: model.account
             contact: model.contact
         }
-        model: FilteredPinnedContactsProxyModel {
-            sourceModel: PinnedContactsModel {
+        model: KTp.FilteredPinnedContactsProxyModel {
+            sourceModel: KTp.PinnedContactsModel {
                 id: pinnedModel
-                conversations: handler.conversations
-                accountManager: handler.accountManager
+                conversations: conversationsModel
+                accountManager: telepathyManager.accountManager
 
                 Component.onCompleted: plasmoid.addEventListener('ConfigChanged',
                                         function() {
@@ -111,6 +120,7 @@ Grid {
             height: base.itemHeight
             popupSide: base.popupSide
         }
-        model: handler.conversations
+        model: conversationsModel
     }
 }
+

-- 
ktp-contact-applet packaging