[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=30c7788

The following commit has been merged in the master branch:
commit 30c7788d4fe35c4b7dad1218d3fd3f42e0d24f5e
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Fri Jul 11 08:57:12 2008 +0000

    Store the master status message even when no widget exists.
    
    svn path=/trunk/playground/base/plasma/applets/presence/; revision=830798
---
 presence/src/presence.cpp | 5 ++++-
 presence/src/presence.h   | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/presence/src/presence.cpp b/presence/src/presence.cpp
index 5aa94fc..7018a16 100644
--- a/presence/src/presence.cpp
+++ b/presence/src/presence.cpp
@@ -32,7 +32,6 @@
 #include <QtTapioca/PresenceState>
 
 #include <QtCore/QList>
-#include <QtCore/QString>
 
 #include <QtGui/QHeaderView>
 #include <QtGui/QLabel>
@@ -131,6 +130,7 @@ PresenceApplet::widget()
         m_masterStatusLayout->addWidget(m_masterStatusMessageLabel);
 
         iconChanged();
+        masterStatusMessageChanged(m_masterStatusMessage);
 
         // Set up the rest of the view/layout etc. stuff.
         Q_ASSERT(!m_messageEdit);  // Pointer should still be assigned to 0.
@@ -418,6 +418,9 @@ PresenceApplet::masterStatusMessageChanged(const QString & message)
     {
         m_masterStatusMessageLabel->setText(message);
     }
+
+    // Store the master presence message as a member var.
+    m_masterStatusMessage = message;
 }
 
 #include "presence.moc"
diff --git a/presence/src/presence.h b/presence/src/presence.h
index 0e58072..b2c27cd 100644
--- a/presence/src/presence.h
+++ b/presence/src/presence.h
@@ -24,6 +24,8 @@
 
 #include <plasma/dataengine.h>
 
+#include <QtCore/QString>
+
 class KColorScheme;
 class KLineEdit;
 
@@ -72,6 +74,8 @@ private:
     QVBoxLayout * m_layout;
     QWidget * m_widget;
 
+    QString m_masterStatusMessage;
+
 };
 
 K_EXPORT_PLASMA_APPLET(presence, PresenceApplet)

-- 
ktp-contact-applet packaging