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

The following commit has been merged in the master branch:
commit eb021fe2263a5a53a7ddf2a80032410519457526
Author: Dariusz Mikulski <dariusz.mikulski at gmail.com>
Date:   Mon Jan 12 20:38:37 2009 +0000

    update to new Plasma API
    
    svn path=/trunk/playground/base/plasma/applets/presence/; revision=910200
---
 presence/CMakeLists.txt   | 20 +++++++++++++++++---
 presence/src/presence.cpp | 11 ++++++++---
 presence/src/presence.h   | 11 ++++++++---
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/presence/CMakeLists.txt b/presence/CMakeLists.txt
index 7403bf1..2c2fb89 100644
--- a/presence/CMakeLists.txt
+++ b/presence/CMakeLists.txt
@@ -1,7 +1,17 @@
+SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
 project(plasma-presence)
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR}
-                    ${CMAKE_CURRENT_SOURCE_DIR}
+find_package(KDE4 REQUIRED)
+find_package (TelepathyQt4 REQUIRED)
+include(KDE4Defaults)
+
+add_definitions(${KDE4_DEFINITIONS})
+
+include_directories(
+	${CMAKE_CURRENT_SOURCE_DIR}
+	${CMAKE_CURRENT_BINARY_DIR}
+	${KDE4_INCLUDES}
+	${TELEPATHY_QT4_INCLUDE_DIR}
 )
 
 set(presence_SRCS
@@ -9,7 +19,11 @@ set(presence_SRCS
     presenceitemdelegate.cpp)
 
 kde4_add_plugin(plasma_applet_presence ${presence_SRCS})
-target_link_libraries(plasma_applet_presence plasmaappletdialog ${KDE4_PLASMA_LIBS} decibel ${KDE4_KDEUI_LIBS} QtTapioca)
+target_link_libraries(plasma_applet_presence 
+	${KDE4_PLASMA_LIBS} 
+	${KDE4_KDEUI_LIBS}
+	${TELEPATHY_QT4_LIBRARIES}
+)
 
 install(TARGETS plasma_applet_presence DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES plasma-applet-presence.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/presence/src/presence.cpp b/presence/src/presence.cpp
index 5160075..f2c1b15 100644
--- a/presence/src/presence.cpp
+++ b/presence/src/presence.cpp
@@ -22,7 +22,8 @@
 #include "presenceitemdelegate.h"
 
 #include <plasma/theme.h>
-#include <plasma/widgets/icon.h>
+#include <plasma/widgets/iconwidget.h>
+#include <plasma/dialog.h>
 
 #include <Decibel/Types>
 
@@ -42,7 +43,7 @@
 #include <QtGui/QVBoxLayout>
 
 PresenceApplet::PresenceApplet(QObject * parent, const QVariantList & args)
-  : PlasmaAppletDialog(parent, args),
+  : Plasma::Applet(parent, args),
     m_engine(0),
     m_colorScheme(0),
     m_masterStatusLayout(0),
@@ -72,7 +73,7 @@ PresenceApplet::initialize()
 
     // Set up the icon.
     Q_ASSERT(!m_icon);  // Pointer should still be assigned to 0.
-    m_icon = new Plasma::Icon(KIcon("user-offline"), QString(), this);
+    m_icon = new Plasma::IconWidget(KIcon("user-offline"), QString(), this);
 
     // The icon has been changed.
     iconChanged();
@@ -194,6 +195,9 @@ PresenceApplet::dataUpdated(const QString & source,
     //online->setData(Plasma::Theme::self()->textColor(), Qt::ForegroundRole);
     //status->setData(Plasma::Theme::self()->textColor(), Qt::ForegroundRole);
     //message->setData(Plasma::Theme::self()->textColor(), Qt::ForegroundRole);
+
+    // FIXME: TelepathyQt4
+/*
     QtTapioca::PresenceState currentPresence
         = data.value("current_presence").value<QtTapioca::PresenceState>();
 
@@ -202,6 +206,7 @@ PresenceApplet::dataUpdated(const QString & source,
     presence_state->setData(currentPresence.name(), Qt::DisplayRole);
     message->setData(data.value("status_message").toString(),
                      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 e302dea..c3e84ce 100644
--- a/presence/src/presence.h
+++ b/presence/src/presence.h
@@ -20,10 +20,14 @@
 #ifndef PLASMA_APPLET_PRESENCE_H
 #define PLASMA_APPLET_PRESENCE_H
 
-#include <plasmaappletdialog.h>
-
+#include <plasma/applet.h>
 #include <plasma/dataengine.h>
 
+namespace Plasma
+{
+	class IconWidget;
+}
+
 #include <QtCore/QString>
 
 class KColorScheme;
@@ -36,7 +40,7 @@ class QTreeView;
 class QVBoxLayout;
 class QWidget;
 
-class PresenceApplet : public PlasmaAppletDialog
+class PresenceApplet : public Plasma::Applet
 {
     Q_OBJECT
 
@@ -61,6 +65,7 @@ private:
     void updateMasterPresence();
 
     Plasma::DataEngine * m_engine;
+    Plasma::IconWidget *m_icon;
 
     KColorScheme * m_colorScheme;
 

-- 
ktp-contact-applet packaging