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

The following commit has been merged in the master branch:
commit d5940e72562fc2f9ffac6b033e4826729b5f5577
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Mar 8 17:52:08 2013 +0000

    Don't add pointless margin to presence applet
    
    Makes icon appear the same size as other icons in sys-tray
    Remove duplicate setMinimumSize
    
    REVIEW:109375
    BUG: 309852
---
 presence/src/presence-applet.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/presence/src/presence-applet.cpp b/presence/src/presence-applet.cpp
index acd6635..07569b2 100644
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@ -57,7 +57,6 @@ TelepathyPresenceApplet::TelepathyPresenceApplet(QObject *parent, const QVariant
     setupContextMenuActions();
 
     setAspectRatioMode(Plasma::ConstrainedSquare);
-    setMinimumSize(16, 16);
     setBackgroundHints(NoBackground);
     resize(150, 150);
 
@@ -65,7 +64,7 @@ TelepathyPresenceApplet::TelepathyPresenceApplet(QObject *parent, const QVariant
     connect(m_icon, SIGNAL(clicked()), this, SLOT(startContactList()));
 
     QGraphicsLinearLayout *layout = new QGraphicsLinearLayout();
-    layout->setContentsMargins(2, 2, 2, 2);
+    layout->setContentsMargins(0,0,0,0);
     layout->setSpacing(0);
     layout->setOrientation(Qt::Horizontal);
     layout->addItem(m_icon);

-- 
ktp-contact-applet packaging