SVN commit 927485 by mart: add systemtraydaemon to the build add the systemtray icon protocol part M +8 -0 CMakeLists.txt M +2 -0 core/manager.cpp A protocols/dbussystemtray (directory) A protocols/dbussystemtray/dbussystemtrayprotocol.cpp [License: GPL (v2+)] A protocols/dbussystemtray/dbussystemtrayprotocol.h [License: GPL (v2+)] A protocols/dbussystemtray/dbussystemtraytask.cpp [License: GPL (v2+)] A protocols/dbussystemtray/dbussystemtraytask.h [License: GPL (v2+)] --- trunk/KDE/kdebase/workspace/plasma/applets/systemtray/CMakeLists.txt #927484:927485 @@ -26,6 +26,9 @@ protocols/jobs/dbusjobprotocol.cpp protocols/jobs/dbusjob.cpp + protocols/dbussystemtray/dbussystemtraytask.cpp + protocols/dbussystemtray/dbussystemtrayprotocol.cpp + ui/applet.cpp ui/compactlayout.cpp ui/extendertask.cpp @@ -34,6 +37,11 @@ ui/jobwidget.cpp ) +add_subdirectory(systemtraydaemon) + +set(systemtraydaemon_xml systemtraydaemon/org.kde.SystemTrayDaemon.xml) +QT4_ADD_DBUS_INTERFACE(systemtray_SRCS ${systemtraydaemon_xml} systemtraydaemon_interface) + kde4_add_plugin(plasma_applet_systemtray ${systemtray_SRCS}) include_directories(${CMAKE_SOURCE_DIR}) target_link_libraries(plasma_applet_systemtray ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${X11_LIBRARIES} ${X11_Xrender_LIB} ${KDE4_SOLID_LIBS}) --- trunk/KDE/kdebase/workspace/plasma/applets/systemtray/core/manager.cpp #927484:927485 @@ -34,6 +34,7 @@ #include "../protocols/fdo/fdoprotocol.h" #include "../protocols/plasmoid/plasmoidtaskprotocol.h" #include "../protocols/jobs/dbusjobprotocol.h" +#include "../protocols/dbussystemtray/dbussystemtrayprotocol.h" namespace SystemTray { @@ -65,6 +66,7 @@ { d->setupProtocol(new PlasmoidProtocol(this)); d->setupProtocol(new SystemTray::FdoProtocol(this)); + d->setupProtocol(new SystemTray::DBusSystemTrayProtocol(this)); } Manager::~Manager()