diff options
| author | Emanoil Kotsev <deloptes@gmail.com> | 2025-01-12 16:46:43 +0000 |
|---|---|---|
| committer | Emanoil Kotsev <deloptes@gmail.com> | 2025-01-12 16:58:06 +0000 |
| commit | 704bebebdda3412e1556a73f8cb9fda7ae70e75f (patch) | |
| tree | 71470400b69f7b9d070c458e53a5a262767111f3 | |
| parent | ae241fe04b4bfd3f42e795c978cc8f73db307327 (diff) | |
| download | tdebase-704bebebdda3412e1556a73f8cb9fda7ae70e75f.tar.gz tdebase-704bebebdda3412e1556a73f8cb9fda7ae70e75f.zip | |
fixing dbus-1-tqt checkfeat/dbusscreensaver
removed install directories for the interfaces
disabled the check for screensaver status when calling Inhibit
Signed-off-by: Emanoil Kotsev <deloptes@gmail.com>
| -rw-r--r-- | ConfigureChecks.cmake | 7 | ||||
| -rw-r--r-- | kdesktop/dbus/interfaces/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | kdesktop/dbus/screensaver/screensaverInterfaceImpl.cpp | 4 |
3 files changed, 3 insertions, 18 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index c98603477..6550eeae8 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -440,14 +440,7 @@ endif( ) # dbus-1-tqt (kdesktop) if( BUILD_KDESKTOP ) - - pkg_search_module( DBUS_1_TQT dbus-1-tqt ) - if( NOT DBUS_1_TQT_FOUND ) - tde_message_fatal( "dbus-1-tqt is required, but was not found on your system" ) - endif( ) - tde_setup_dbus( dbus-1-tqt ) - endif( ) 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)) |