|
[-]
[+]
|
Changed |
kidletime.spec
|
|
|
|
[-]
[+]
|
Changed |
kidletime-5.10.0.tar.xz/CMakeLists.txt
^
|
| @@ -3,7 +3,7 @@
project(KIdleTime)
# ECM setup
-find_package(ECM 5.9.0 REQUIRED NO_MODULE)
+find_package(ECM 5.10.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
include(FeatureSummary)
@@ -13,7 +13,7 @@
include(ECMSetupVersion)
include(ECMGenerateHeaders)
-set(KF5_VERSION "5.9.0") # handled by release scripts
+set(KF5_VERSION "5.10.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KIDLETIME
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kidletime_version.h"
@@ -44,6 +44,7 @@
if(X11_FOUND)
find_package(XCB COMPONENTS XCB SYNC)
find_package(X11_XCB)
+ set(HAVE_X11 TRUE)
if (X11_XSync_FOUND AND XCB_XCB_FOUND AND X11_XCB_FOUND AND XCB_SYNC_FOUND)
# One cannot just use "set(HAVE_XSYNC X11_XSync_FOUND AND XCB_XCB_FOUND...)"
# Doing so would create a list because the value passed to set() is not evaluated.
@@ -63,6 +64,8 @@
if(NOT HAVE_XSCREENSAVER AND NOT HAVE_XSYNC)
message(FATAL_ERROR "\nNeither the XSync (libXext) nor XScreensaver (libXss) development package was found.\nPlease install one of them (XSync is recommended)")
endif()
+else()
+ set(HAVE_X11 FALSE)
endif()
# Subdirectories
|
|
[-]
[+]
|
Changed |
kidletime-5.10.0.tar.xz/src/config-kidletime.h.cmake
^
|
| @@ -1,6 +1,10 @@
/* config-kidletime.h. Generated by cmake from config-kidletime.h.cmake */
+/* Define if you have the XScreensaver extension */
#cmakedefine01 HAVE_XSCREENSAVER
/* Define if you have the XSync extension */
#cmakedefine01 HAVE_XSYNC
+
+/* Define if you have X11 */
+#cmakedefine01 HAVE_X11
|
|
[-]
[+]
|
Changed |
kidletime-5.10.0.tar.xz/src/kidletime.cpp
^
|
| @@ -40,6 +40,9 @@
#include <QPointer>
#include <QSet>
+#if HAVE_X11
+#include <QX11Info>
+#endif
class KIdleTimeHelper
{
@@ -187,17 +190,23 @@
#if HAVE_XSYNC
#if HAVE_XSCREENSAVER
- if (XSyncBasedPoller::instance()->isAvailable()) {
- poller = XSyncBasedPoller::instance();
- } else {
- poller = new XScreensaverBasedPoller();
+ if (QX11Info::isPlatformX11()) {
+ if (XSyncBasedPoller::instance()->isAvailable()) {
+ poller = XSyncBasedPoller::instance();
+ } else {
+ poller = new XScreensaverBasedPoller();
+ }
}
#else
- poller = XSyncBasedPoller::instance();
+ if (QX11Info::isPlatformX11()) {
+ poller = XSyncBasedPoller::instance();
+ }
#endif
#else
#if HAVE_XSCREENSAVER
- poller = new XScreensaverBasedPoller();
+ if (QX11Info::isPlatformX11()) {
+ poller = new XScreensaverBasedPoller();
+ }
#endif
#endif
@@ -209,7 +218,7 @@
poller = new WindowsPoller();
#endif
- if (!poller->isAvailable()) {
+ if (poller && !poller->isAvailable()) {
poller = 0;
}
if (!poller.isNull()) {
|
|
[-]
[+]
|
Changed |
kidletime.yaml
^
|
| @@ -1,5 +1,5 @@
Name : kidletime
-Version : 5.9.0
+Version : 5.10.0
Release : 1
Group : System/Base
License : GPLv2+
|
