[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=94c1a96

The following commit has been merged in the master branch:
commit 94c1a9652e19f1116272e0fa9176b0ed92748b08
Author: Abner Silva <abner.silva at kdemail.net>
Date:   Wed Jul 22 23:16:24 2009 +0000

    Merge branch 'new-presence'
    
    Conflicts:
    	accountwidget.cpp
    	presence.cpp
    
    svn path=/trunk/playground/base/plasma/applets/presence/; revision=1001342
---
 presence/src/presence.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/presence/src/presence.cpp b/presence/src/presence.cpp
index 342868d..44da618 100644
--- a/presence/src/presence.cpp
+++ b/presence/src/presence.cpp
@@ -49,7 +49,7 @@ PresenceApplet::PresenceApplet(QObject *parent, const QVariantList &args)
     setBackgroundHints(StandardBackground);
     setAspectRatioMode(IgnoreAspectRatio);
     //setHasConfigurationInterface(true);
-    setPassivePopup(false);
+    setPassivePopup(true);
 
     setPopupIcon("user-offline");
 
@@ -90,6 +90,8 @@ QGraphicsWidget *PresenceApplet::graphicsWidget()
     if (!m_widget) {
         m_widget = new QGraphicsWidget(this);
         m_layout = new QGraphicsLinearLayout(Qt::Vertical, m_widget);
+        m_layout->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+        m_widget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
         m_widget->setLayout (m_layout);
     }
 
@@ -105,9 +107,9 @@ void PresenceApplet::onSourceAdded(const QString &source)
         account->setId(source);
         connect(account, SIGNAL(presenceChanged(const QString&, const QString&)),
                 this, SLOT(onPresenceChanged(const QString&, const QString&)));
-        m_layout->addItem(account);
         m_accounts[source] = account;
         m_engine->connectSource(source, this);
+        m_layout->addItem(account);
     }
 }
 

-- 
ktp-contact-applet packaging