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

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

    Port contact list applet to new API
---
 .../contents/ui/ContactList.qml                        | 18 +++++++++---------
 .../contents/ui/ListContactDelegate.qml                |  2 +-
 .../org.kde.ktp-contactlist/contents/ui/main.qml       |  5 +++++
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml
index 307563c..fd5d735 100644
--- a/contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml
+++ b/contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml
@@ -27,10 +27,6 @@ Item {
     id: contactListContainer
     anchors.fill: parent
 
-    KTp.ContactList {
-        id: contactList
-    }
-
     PlasmaComponents.TextField {
         id: filterLineEdit
         anchors {
@@ -48,7 +44,7 @@ Item {
         Keys.onReturnPressed: contactsList.currentItem.clicked();
 
         Binding {
-            target: contactList.model
+            target: contactsModel
             property: "globalFilterString"
             value: filterLineEdit.text
         }
@@ -66,7 +62,14 @@ Item {
             id: contactsList
 
             clip: true
-            model: contactList.model
+            model: KTp.ContactsModel {
+                id: contactsModel
+                accountManager: telepathyManager.accountManager;
+                presenceTypeFilterFlags: KTp.ContactsModel.HideAllOffline;
+                sortRoleString: sortRoleString = "presenceType";
+            }
+
+
             boundsBehavior: Flickable.StopAtBounds
 
             delegate: ListContactDelegate {}
@@ -83,9 +86,6 @@ Item {
     }
 
     Component.onCompleted: {
-        contactList.model.presenceTypeFilterFlags = KTp.AccountsFilterModel.HideAllOffline
-        contactList.model.sortRoleString = "presenceType"
-
         plasmoid.popupEvent.connect(popupEventSlot);
     }
 }
diff --git a/contactlist/org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml
index aec65b3..9549501 100644
--- a/contactlist/org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml
+++ b/contactlist/org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml
@@ -28,7 +28,7 @@ PlasmaComponents.ListItem {
 
     height: Math.ceil(nickLabel.height*1.5)
 
-    onClicked: contactList.startChat(model.account, model.contact)
+    onClicked: telepathyManager.startChat(model.account, model.contact, "org.freedesktop.Telepathy.Client.KTp.chatPlasmoid")
 
     ExtraComponents.QPixmapItem {
         id: avatarLabel
diff --git a/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
index 89a9262..b2bde28 100644
--- a/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
+++ b/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
@@ -18,6 +18,8 @@
  ***************************************************************************/
 
 import QtQuick 1.1
+import org.kde.telepathy 0.1 as KTp
+
 
 Item {
     id: main;
@@ -32,5 +34,8 @@ Item {
 
     Component.onCompleted: {
         plasmoid.aspectRatioMode = IgnoreAspectRatio;
+
+        telepathyManager.addContactListFeatures();
+        telepathyManager.becomeReady();
     }
 }

-- 
ktp-contact-applet packaging