[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=66d4073

The following commit has been merged in the master branch:
commit 66d4073e147a598aaac4e7bddbacc12ef0246f1e
Author: Siraj Razick <siraj at kdemail.net>
Date:   Mon Mar 2 16:38:18 2009 +0000

    Fix the infinitely status changing bug with mission control
    
    svn path=/trunk/playground/base/plasma/applets/presence/; revision=934268
---
 presence/src/presence.cpp | 9 +++++++--
 presence/src/presence.h   | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/presence/src/presence.cpp b/presence/src/presence.cpp
index d73a428..931ba9f 100644
--- a/presence/src/presence.cpp
+++ b/presence/src/presence.cpp
@@ -223,14 +223,19 @@ void PresenceApplet::dataUpdated(const QString & source,
 
     // rief: setup account presence
     Telepathy::SimplePresence currentPresence
-    	= data.value("current_presence").value<Telepathy::SimplePresence>();
+        = data.value("current_presence").value<Telepathy::SimplePresence>();
+    if (m_currentPresence == currentPresence.status) {
+        return;
+    }
+
+    m_currentPresence = currentPresence.status;
+
     presence_type->setData(static_cast<uint>(currentPresence.type),
     						Qt::DisplayRole);
     presence_state->setData(currentPresence.status, Qt::DisplayRole);
     message->setData(currentPresence.statusMessage, Qt::DisplayRole);
     accountItem->setData(source, Qt::DisplayRole);
 
-   
     /*
      * so, we need to look in the first column
      * to see if we can find a row with that value
diff --git a/presence/src/presence.h b/presence/src/presence.h
index ac0ce18..89034b9 100644
--- a/presence/src/presence.h
+++ b/presence/src/presence.h
@@ -85,6 +85,7 @@ private:
     QWidget *m_widget;
     Telepathy::Client::AccountManager* m_accountManager;
     bool m_userSet;
+    QString m_currentPresence;
 
     QString m_masterStatusMessage;
 

-- 
ktp-contact-applet packaging