6 files changed, 22 insertions, 70 deletions
diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
index 0e564e0fe..b5bd5b7d8 100644
--- a/kdesktop/CMakeLists.txt
+++ b/kdesktop/CMakeLists.txt
@@ -17,7 +17,6 @@ add_subdirectory( patterns )
 add_subdirectory( programs )
 add_subdirectory( init )
 add_subdirectory( kwebdesktop )
-add_subdirectory( dbus/interfaces )
 add_subdirectory( dbus/screensaver )
 
 
@@ -32,6 +31,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdmlib
   ${CMAKE_SOURCE_DIR}/kcontrol/background
   ${CMAKE_SOURCE_DIR}/libkonq
+  ${CMAKE_CURRENT_BINARY_DIR}/dbus/screensaver
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
   ${DBUS_INCLUDE_DIRS}
@@ -99,16 +99,13 @@ set( ${target}_SRCS
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
   LINK
-    ${CMAKE_THREAD_LIBS_INIT} kdesktopsettings-static bgnd-static dmctl-static
-    dbusscreensaverservice-static dbusscreensaveriface-static
+    ${CMAKE_THREAD_LIBS_INIT} kdesktopsettings-static 
+    bgnd-static dmctl-static dbusscreensaverservice-static
     konq-shared tdeutils-shared tdesu-shared ${TDEHW_LIBRARIES}
     ${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext ${CMAKE_DL_LIBS}
     ${XSS_LIBRARIES} ${DBUS_1_TQT_LIBRARIES}
 )
 
-add_dependencies(${target} dbusscreensaveriface-static dbusscreensaverservice-static )
-
-
 ##### kdesktopsettings (static) #################
 
 tde_add_library( kdesktopsettings STATIC_PIC
diff --git a/kdesktop/dbus/interfaces/CMakeLists.txt b/kdesktop/dbus/interfaces/CMakeLists.txt
deleted file mode 100644
index b3d57afee..000000000
--- a/kdesktop/dbus/interfaces/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-#################################################
-#
-#  (C) 2024 Emanoil Kotsev
-#  deloptes (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-include_directories(
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${TQT_INCLUDE_DIRS}
-  ${TDE_INCLUDE_DIR}
-  ${DBUS_TQT_INCLUDE_DIRS}
-)
-
-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 )
-
-##### DbusScreenSaver #########################
-add_custom_command( 
-    OUTPUT  ${ScreenSaver_HDRS} ${ScreenSaver_SRCS}
-    COMMAND ${DBUSXML2QT3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.ScreenSaver.xml 2>/dev/null
-)
-
-tde_add_library( dbusscreensaveriface STATIC_PIC AUTOMOC
-  SOURCES ${ScreenSaver_SRCS}
-  LINK ${DBUS_TQT_LIBRARIES} 
-)
diff --git a/kdesktop/dbus/interfaces/org.freedesktop.ScreenSaver.xml b/kdesktop/dbus/interfaces/org.freedesktop.ScreenSaver.xml
index 015655aa8..8e3c3ca85 100644
--- a/kdesktop/dbus/interfaces/org.freedesktop.ScreenSaver.xml
+++ b/kdesktop/dbus/interfaces/org.freedesktop.ScreenSaver.xml
@@ -6,19 +6,6 @@
     </signal>
     <method name="Lock">
     </method>
-<!-- keep for future use
-    <method name="SimulateUserActivity">
-    </method>
-    <method name="GetActive">
-      <arg type="b" direction="out"/>
-    </method>
-    <method name="GetActiveTime">
-      <arg name="seconds" type="u" direction="out"/>
-    </method>
-    <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"/>
@@ -31,15 +18,5 @@
     <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"/>
-      <arg name="cookie" type="u" direction="out"/>
-    </method>
-    <method name="UnThrottle">
-      <arg name="cookie" type="u" direction="in"/>
-    </method>
- -->
   </interface>
 </node>
 \ No newline at end of file
diff --git a/kdesktop/dbus/screensaver/CMakeLists.txt b/kdesktop/dbus/screensaver/CMakeLists.txt
index aa6d61a60..7d21e2f83 100644
--- a/kdesktop/dbus/screensaver/CMakeLists.txt
+++ b/kdesktop/dbus/screensaver/CMakeLists.txt
@@ -17,11 +17,14 @@ include_directories(
   ${DBUS_TQT_INCLUDE_DIRS}
 )
 
-
-##### headers ###################################
-
-install( FILES dbusscreensaverservice.h screensaverInterfaceImpl.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kdesktop/dbus 
+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 )
+
+##### DbusScreenSaver #########################
+add_custom_command( 
+    OUTPUT  ${ScreenSaver_HDRS} ${ScreenSaver_SRCS}
+    COMMAND ${DBUSXML2QT3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/kdesktop/dbus/interfaces/org.freedesktop.ScreenSaver.xml 2>/dev/null
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/kdesktop/dbus/screensaver
 )
 
 ##### dbusscreensaverservice ####################
@@ -29,10 +32,16 @@ install( FILES dbusscreensaverservice.h screensaverInterfaceImpl.h
 set( target dbusscreensaverservice )
 
 set( ${target}_SRCS
-  dbusscreensaverservice.cpp screensaverInterfaceImpl.cpp
+  dbusscreensaverservice.cpp screensaverInterfaceImpl.cpp 
 )
 
 tde_add_library( ${target} STATIC_PIC AUTOMOC
-  SOURCES ${${target}_SRCS}
+  SOURCES ${${target}_SRCS} ${ScreenSaver_SRCS}
   LINK ${DBUS_TQT_LIBRARIES} 
 )
+
+##### headers ###################################
+
+install( FILES dbusscreensaverservice.h screensaverInterfaceImpl.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/kdesktop/dbus 
+)
diff --git a/kdesktop/dbus/screensaver/dbusscreensaverservice.h b/kdesktop/dbus/screensaver/dbusscreensaverservice.h
index 03713a4b1..4f4feb7ec 100644
--- a/kdesktop/dbus/screensaver/dbusscreensaverservice.h
+++ b/kdesktop/dbus/screensaver/dbusscreensaverservice.h
@@ -25,8 +25,8 @@
 #include <tqmap.h>
 #include <tqdbusconnection.h>
 
-#include "dbus/interfaces/screensaverNode.h"
-#include "dbus/interfaces/dbusbaseNode.h"
+#include "screensaverNode.h"
+#include "dbusbaseNode.h"
 #include "screensaverInterfaceImpl.h"
 
 class ScreenSaverService: public org::freedesktop::screensaverNode
diff --git a/kdesktop/dbus/screensaver/screensaverInterfaceImpl.h b/kdesktop/dbus/screensaver/screensaverInterfaceImpl.h
index 03f85712a..0cec20720 100644
--- a/kdesktop/dbus/screensaver/screensaverInterfaceImpl.h
+++ b/kdesktop/dbus/screensaver/screensaverInterfaceImpl.h
@@ -27,7 +27,7 @@
 #include <tqmap.h>
 #include <tqdbusconnection.h>
 
-#include "dbus/interfaces/screensaverInterface.h"
+#include "screensaverInterface.h"
 
 #define DBUS_SCREENSAVER_SERVICE      "TDEDbusScreenSaver"
 #define DBUS_SCREENSAVER_SERVICE_NAME "org.freedesktop.ScreenSaver"