From 225e3ce275fea3a1735e894722a63167853dd0a9 Mon Sep 17 00:00:00 2001 From: Emanoil Kotsev Date: Sun, 12 Jan 2025 16:46:43 +0000 Subject: fixing dbus-1-tqt check removed install directories for the interfaces disabled the check for screensaver status when calling Inhibit Signed-off-by: Emanoil Kotsev --- kdesktop/dbus/interfaces/CMakeLists.txt | 10 ---------- kdesktop/dbus/screensaver/screensaverInterfaceImpl.cpp | 4 +++- 2 files changed, 3 insertions(+), 11 deletions(-) (limited to 'kdesktop') diff --git a/kdesktop/dbus/interfaces/CMakeLists.txt b/kdesktop/dbus/interfaces/CMakeLists.txt index 8e2d29c17..5d8780bbd 100644 --- a/kdesktop/dbus/interfaces/CMakeLists.txt +++ b/kdesktop/dbus/interfaces/CMakeLists.txt @@ -30,13 +30,3 @@ tde_add_library( dbusscreensaveriface STATIC_PIC AUTOMOC SOURCES ${ScreenSaver_SRCS} LINK ${DBUS_TQT_LIBRARIES} ) - -##### install headers ################################### - -install( - DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DESTINATION ${INCLUDE_INSTALL_DIR}/kdesktop/dbus/interfaces/ - USE_SOURCE_PERMISSIONS - FILES_MATCHING PATTERN PATTERN "*.h" - PATTERN "CMakeFiles" EXCLUDE -) diff --git a/kdesktop/dbus/screensaver/screensaverInterfaceImpl.cpp b/kdesktop/dbus/screensaver/screensaverInterfaceImpl.cpp index 4c3b8155c..e4d7c7064 100644 --- a/kdesktop/dbus/screensaver/screensaverInterfaceImpl.cpp +++ b/kdesktop/dbus/screensaver/screensaverInterfaceImpl.cpp @@ -93,7 +93,9 @@ bool ScreenSaverInterfaceImpl::SetActive(bool& arg0, bool e, TQT_DBusError& dbus bool ScreenSaverInterfaceImpl::Inhibit(const TQString& application_name, const TQString& reason_for_inhibit, TQ_UINT32& cookie, TQT_DBusError& dbuserror) { //this is to make sure we have the actual state - it could have been changed meanwhile - isScreenSaverEnabled = screenSaverIsEnabled(); + //however some other application like kplayer may have disabled the screensaver + //when we call this function + //isScreenSaverEnabled = screenSaverIsEnabled(); if (isScreenSaverEnabled && m_cookies.isEmpty()) // disable only once { if (!forceScreenSaver(false)) -- cgit v1.2.1