[SCM] ktp-contact-applet packaging branch, master, updated. debian/16.04.2-1-67-g066859a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=2da2d25

The following commit has been merged in the master branch:
commit 2da2d251e26be335afd4df1877aaf503c24518dd
Author: Kai Uwe Broulik <kde at privat.broulik.de>
Date:   Thu Sep 22 09:25:28 2016 +0200

    [Contact List Applet] Drop custom compact representation
    
    All it did was show an icon with a MouseArea, we can just set the plasmoid.icon instead
    
    REVIEW: 128976
---
 .../contents/ui/Presence.qml                       | 34 ----------------------
 .../org.kde.ktp-contactlist/contents/ui/main.qml   |  4 +--
 2 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/contactlist/org.kde.ktp-contactlist/contents/ui/Presence.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/Presence.qml
deleted file mode 100644
index 575d97f..0000000
--- a/contactlist/org.kde.ktp-contactlist/contents/ui/Presence.qml
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2014 by Aleix Pol Gonzalez <aleixpol at kde.org>           *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
-
-import QtQuick 2.0
-import org.kde.kquickcontrolsaddons 2.0
-import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.components 2.0 as PlasmaComponents
-import org.kde.telepathy 0.1
-
-PlasmaCore.IconItem
-{
-    id: panelIconWidget
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: plasmoid.expanded = !plasmoid.expanded
-    }
-}
diff --git a/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
index 43b8c8e..cc4a7ba 100644
--- a/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
+++ b/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
@@ -30,10 +30,8 @@ Item
     Plasmoid.switchHeight: 300
 
     Plasmoid.fullRepresentation: ContactList {}
-    Plasmoid.compactRepresentation: Presence {
-        source: ktpPresence.currentPresenceIconName
-    }
 
+    Plasmoid.icon: ktpPresence.currentPresenceIconName
     Plasmoid.busy: ktpPresence.isChangingPresence
 
     KTp.PresenceModel {

-- 
ktp-contact-applet packaging