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

The following commit has been merged in the master branch:
commit ed6339fb7eaae9c52b0a1d439c13f432c439a7ef
Author: Dariusz Mikulski <dariusz.mikulski at gmail.com>
Date:   Mon Jan 12 23:18:07 2009 +0000

    setup presence for account
    
    svn path=/trunk/playground/base/plasma/applets/presence/; revision=910286
---
 presence/src/presence.cpp | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/presence/src/presence.cpp b/presence/src/presence.cpp
index 20bf386..e8a9205 100644
--- a/presence/src/presence.cpp
+++ b/presence/src/presence.cpp
@@ -192,17 +192,14 @@ void PresenceApplet::dataUpdated(const QString & source,
     presence_state->setData(Plasma::Theme::defaultTheme()->color(Plasma::Theme::BackgroundColor));
     message->setData(Plasma::Theme::defaultTheme()->color(Plasma::Theme::BackgroundColor));
 
-    // FIXME: TelepathyQt4
-/*
-    QtTapioca::PresenceState currentPresence
-        = data.value("current_presence").value<QtTapioca::PresenceState>();
-
-    presence_type->setData(static_cast<int>(currentPresence.type()),
-                           Qt::DisplayRole);
-    presence_state->setData(currentPresence.name(), Qt::DisplayRole);
-    message->setData(data.value("status_message").toString(),
-                     Qt::DisplayRole);
-*/
+    // rief: setup account presence
+    Telepathy::SimplePresence currentPresence
+    	= data.value("current_presence").value<Telepathy::SimplePresence>();
+    presence_type->setData(static_cast<uint>(currentPresence.type),
+    						Qt::DisplayRole);
+    presence_state->setData(currentPresence.status, Qt::DisplayRole);
+    message->setData(currentPresence.statusMessage, Qt::DisplayRole);
+
     /*
      * so, we need to look in the first column
      * to see if we can find a row with that value

-- 
ktp-contact-applet packaging