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

The following commit has been merged in the master branch:
commit 8f06d3c32b17a727114b17a9d4a81d634627453a
Author: Siraj Razick <siraj at kdemail.net>
Date:   Thu Feb 26 14:31:57 2009 +0000

    Fix the icon behavior: icon now properly centers on the pannel, and responds to mouse clicks and displays the accounts list dialog
    
    svn path=/trunk/playground/base/plasma/applets/presence/; revision=932393
---
 presence/src/presence.cpp | 15 ++++++++++-----
 presence/src/presence.h   |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/presence/src/presence.cpp b/presence/src/presence.cpp
index 4b05a1e..a71fe41 100644
--- a/presence/src/presence.cpp
+++ b/presence/src/presence.cpp
@@ -21,8 +21,9 @@
 
 #include "presenceitemdelegate.h"
 
-#include <plasma/theme.h>
-#include <plasma/widgets/iconwidget.h>
+#include <Plasma/Dialog>
+#include <Plasma/IconWidget>
+#include <Plasma/Theme>
 
 #include <KColorScheme>
 #include <KDebug>
@@ -38,6 +39,7 @@
 #include <QtGui/QStandardItemModel>
 #include <QtGui/QTreeView>
 #include <QtGui/QGraphicsProxyWidget>
+#include <QGraphicsLinearLayout>
 #include <QtGui/QVBoxLayout>
 
 
@@ -53,7 +55,9 @@ PresenceApplet::PresenceApplet(QObject * parent, const QVariantList & args)
     m_accountsModel(0),
     m_accountsView(0),
     m_layout(0)
-{ }
+{
+    setBackgroundHints(StandardBackground);
+}
 
 PresenceApplet::~PresenceApplet()
 {
@@ -74,8 +78,8 @@ void PresenceApplet::init()
 
     // Set up the icon.
     Q_ASSERT(!m_icon);  // Pointer should still be assigned to 0.
-    m_icon = new Plasma::IconWidget(this);
-    m_icon->setIcon(KIcon("user-offline"));
+    m_icon = new Plasma::IconWidget(KIcon("user-offline",NULL), QString());
+    setPopupIcon(m_icon->icon());
 
     // The icon has been changed.
     iconChanged();
@@ -396,6 +400,7 @@ void PresenceApplet::updateMasterPresence()
     }
 
     // Call the method to update the masterPresenceIcon.
+    setPopupIcon(m_icon->icon());
     iconChanged();
 }
 
diff --git a/presence/src/presence.h b/presence/src/presence.h
index 89cfcdc..fea725b 100644
--- a/presence/src/presence.h
+++ b/presence/src/presence.h
@@ -25,7 +25,7 @@
 
 namespace Plasma
 {
-	class IconWidget;
+    class IconWidget;
 }
 
 #include <QtCore/QString>

-- 
ktp-contact-applet packaging