[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=8b0888a

The following commit has been merged in the master branch:
commit 8b0888aa0d2a8be5beb23b097f4c6506e93379e7
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Sun Jan 20 17:00:04 2013 +0100

    Make ContactList applet a PopupApplet
    
    REVIEW: 108499
    BUG: 301323
---
 contactlist/org.kde.ktp-contactlist/contents/ui/main.qml | 7 +++++--
 contactlist/org.kde.ktp-contactlist/metadata.desktop     | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
index e974191..1d410e6 100644
--- a/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
+++ b/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
@@ -22,9 +22,12 @@ import QtQuick 1.1
 Item {
     id: main;
 
+    property int minimumWidth: 200;
+    property int minimumHeight: 300;
+
     width: 200
     height: 300
-    
+
     // contact listview
     ContactList {
         id: contactList;
@@ -34,7 +37,7 @@ Item {
 //         anchors.leftMargin:10
 //         anchors.rightMargin:10
     }
-    
+
     Component.onCompleted: {
         plasmoid.aspectRatioMode = IgnoreAspectRatio;
     }
diff --git a/contactlist/org.kde.ktp-contactlist/metadata.desktop b/contactlist/org.kde.ktp-contactlist/metadata.desktop
index 9c38d59..02bf3b0 100644
--- a/contactlist/org.kde.ktp-contactlist/metadata.desktop
+++ b/contactlist/org.kde.ktp-contactlist/metadata.desktop
@@ -85,5 +85,5 @@ X-KDE-PluginInfo-Website=http://telepathy.freedesktop.org/
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true
-X-KDE-ServiceTypes=Plasma/Applet
+X-KDE-ServiceTypes=Plasma/Applet,Plasma/PopupApplet
 Type=Service

-- 
ktp-contact-applet packaging