diff options
| author | Emanoil Kotsev <[email protected]> | 2025-01-12 16:46:43 +0000 |
|---|---|---|
| committer | Emanoil Kotsev <[email protected]> | 2025-02-18 23:22:40 +0000 |
| commit | ebc43fc7d45f0a8b79abb6bf7565ef18e32e42a1 (patch) | |
| tree | 024274f7f13bed0e4eb00fdd61a6f59a4497cf5e /kdesktop | |
| parent | 31692a4bd815a9e7e17786b5ed49d1d568034e58 (diff) | |
| download | tdebase-ebc43fc7d45f0a8b79abb6bf7565ef18e32e42a1.tar.gz tdebase-ebc43fc7d45f0a8b79abb6bf7565ef18e32e42a1.zip | |
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 <[email protected]>
Diffstat (limited to 'kdesktop')
| -rw-r--r-- | kdesktop/dbus/interfaces/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | kdesktop/dbus/screensaver/screensaverInterfaceImpl.cpp | 4 |
2 files changed, 3 insertions, 11 deletions
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)) |