2 files changed, 9 insertions, 7 deletions
diff --git a/kdesktop/dbus/interfaces/CMakeLists.txt b/kdesktop/dbus/interfaces/CMakeLists.txt
index 9fb887326..8e2d29c17 100644
--- a/kdesktop/dbus/interfaces/CMakeLists.txt
+++ b/kdesktop/dbus/interfaces/CMakeLists.txt
@@ -12,23 +12,21 @@
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${TDE_INCLUDE_DIR}
   ${DBUS_TQT_INCLUDE_DIRS}
 )
 
-set( INTROSPECTIONPATH ${CMAKE_SOURCE_DIR}/kdesktop/dbus/screensaver )
-
 set( ScreenSaver_HDRS dbusbaseNode.h introspectableInterface.h screensaverInterface.h screensaverNode.h screensaverProxy.h)
 set( ScreenSaver_SRCS dbusbaseNode.cpp introspectableInterface.cpp screensaverInterface.cpp screensaverNode.cpp screensaverProxy.cpp )
 
-##### ScreenSaver #########################
+##### DbusScreenSaver #########################
 add_custom_command( 
     OUTPUT  ${ScreenSaver_HDRS} ${ScreenSaver_SRCS}
-    COMMAND ${DBUSXML2QT3_EXECUTABLE} ${INTROSPECTIONPATH}/org.freedesktop.ScreenSaver.xml 2>/dev/null
-    DEPENDS ${INTROSPECTIONPATH}/org.freedesktop.ScreenSaver.xml
+    COMMAND ${DBUSXML2QT3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.ScreenSaver.xml 2>/dev/null
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} 
 )
 
-tde_add_library( screensaverinterfaces STATIC_PIC AUTOMOC
+tde_add_library( dbusscreensaveriface STATIC_PIC AUTOMOC
   SOURCES ${ScreenSaver_SRCS}
   LINK ${DBUS_TQT_LIBRARIES} 
 )
@@ -37,7 +35,7 @@ tde_add_library( screensaverinterfaces STATIC_PIC AUTOMOC
 
 install(
     DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    DESTINATION ${INCLUDE_INSTALL_DIR}
+    DESTINATION ${INCLUDE_INSTALL_DIR}/kdesktop/dbus/interfaces/
     USE_SOURCE_PERMISSIONS
     FILES_MATCHING PATTERN PATTERN "*.h"
     PATTERN "CMakeFiles" EXCLUDE
diff --git a/kdesktop/dbus/interfaces/org.freedesktop.ScreenSaver.xml b/kdesktop/dbus/interfaces/org.freedesktop.ScreenSaver.xml
index 1f7b09b28..015655aa8 100644
--- a/kdesktop/dbus/interfaces/org.freedesktop.ScreenSaver.xml
+++ b/kdesktop/dbus/interfaces/org.freedesktop.ScreenSaver.xml
@@ -6,6 +6,7 @@
     </signal>
     <method name="Lock">
     </method>
+<!-- keep for future use
     <method name="SimulateUserActivity">
     </method>
     <method name="GetActive">
@@ -17,6 +18,7 @@
     <method name="GetSessionIdleTime">
       <arg name="seconds" type="u" direction="out"/>
     </method>
+ -->
     <method name="SetActive">
       <arg type="b" direction="out"/>
       <arg name="e" type="b" direction="in"/>
@@ -29,6 +31,7 @@
     <method name="UnInhibit">
       <arg name="cookie" type="u" direction="in"/>
     </method>
+<!-- keep for future use
     <method name="Throttle">
       <arg name="application_name" type="s" direction="in"/>
       <arg name="reason_for_inhibit" type="s" direction="in"/>
@@ -37,5 +40,6 @@
     <method name="UnThrottle">
       <arg name="cookie" type="u" direction="in"/>
     </method>
+ -->
   </interface>
 </node>
 \ No newline at end of file