Move krootbacking executable from kdeartwork to kdebase

Reenable HAL media manager
Fix system tray with ARGB visuals (again)
Beautify logout process


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1249834 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 27 insertions, 10 deletions

diff --git a/kioslave/media/mediamanager/CMakeLists.txt b/kioslave/media/mediamanager/CMakeLists.txt
index ae35f45f2..58854b630 100644
--- a/kioslave/media/mediamanager/CMakeLists.txt
+++ b/kioslave/media/mediamanager/CMakeLists.txt
@@ -19,10 +19,12 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${HAL_INCLUDE_DIRS}
 )
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
+  ${DBUS_TQT_LIBRARY_DIRS}
 )
 
 
@@ -35,14 +37,29 @@ install( FILES mediamanager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
 
 set( target kded_mediamanager )
 
-set( ${target}_SRCS
-  mediamanager.cpp mediamanager.skel medialist.cpp
-  backendbase.cpp fstabbackend.cpp removablebackend.cpp
-  mediadirnotify.cpp mediadirnotify.skel
-)
+if( WITH_HAL )
+  set( ${target}_SRCS
+    mediamanager.cpp mediamanager.skel medialist.cpp
+    backendbase.cpp fstabbackend.cpp removablebackend.cpp
+    mediadirnotify.cpp mediadirnotify.skel
+    halbackend.cpp linuxcdpolling.cpp
+  )
 
-tde_add_kpart( ${target} AUTOMOC
-  SOURCES ${${target}_SRCS}
-  LINK mediacommon-static kdeinit_kded-shared
-  DESTINATION ${PLUGIN_INSTALL_DIR}
-)
+  tde_add_kpart( ${target} AUTOMOC
+    SOURCES ${${target}_SRCS}
+    LINK mediacommon-static kdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES}
+    DESTINATION ${PLUGIN_INSTALL_DIR}
+  )
+else( )
+  set( ${target}_SRCS
+    mediamanager.cpp mediamanager.skel medialist.cpp
+    backendbase.cpp fstabbackend.cpp removablebackend.cpp
+    mediadirnotify.cpp mediadirnotify.skel
+  )
+
+  tde_add_kpart( ${target} AUTOMOC
+    SOURCES ${${target}_SRCS}
+    LINK mediacommon-static kdeinit_kded-shared
+    DESTINATION ${PLUGIN_INSTALL_DIR}
+  )
+endif( )