[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace] /: Exclude XRandR 1.3 specific bits from
From:       Dario Freddi <drf () kde ! org>
Date:       2011-09-30 20:23:00
Message-ID: 20110930202300.A9091A60B9 () git ! kde ! org
[Download RAW message or body]

Git commit 2d7eee312c43e9566e899f1ed7432f53b54a4f47 by Dario Freddi.
Committed on 30/09/2011 at 22:22.
Pushed by dafre into branch 'master'.

Exclude XRandR 1.3 specific bits from compilation if XRandR 1.3 is not found

BUG: 271526

M  +3    -0    config-X11.h.cmake
M  +8    -2    powerdevil/daemon/backends/upower/xrandrbrightness.cpp

http://commits.kde.org/kde-workspace/2d7eee312c43e9566e899f1ed7432f53b54a4f47

diff --git a/config-X11.h.cmake b/config-X11.h.cmake
index 67c174c..b7975d5 100644
--- a/config-X11.h.cmake
+++ b/config-X11.h.cmake
@@ -36,3 +36,6 @@
 
 /* Define if you have the XSync extension */
 #cmakedefine HAVE_XSYNC 1
+
+/* Define if you have XRandR 1.3 */
+#cmakedefine HAS_RANDR_1_3 1
diff --git a/powerdevil/daemon/backends/upower/xrandrbrightness.cpp \
b/powerdevil/daemon/backends/upower/xrandrbrightness.cpp index 0077fe9..7112da8 \
                100644
--- a/powerdevil/daemon/backends/upower/xrandrbrightness.cpp
+++ b/powerdevil/daemon/backends/upower/xrandrbrightness.cpp
@@ -19,6 +19,8 @@
 
 #include "xrandrbrightness.h"
 
+#include <config-X11.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -53,10 +55,14 @@ XRandrBrightness::XRandrBrightness()
         return;
     }
 
-    if (minor > 2)
+#ifdef HAS_RANDR_1_3
+    if (minor > 2) {
         m_resources = XRRGetScreenResourcesCurrent(QX11Info::display(), \
                QX11Info::appRootWindow()); // version 1.3, faster version
-    else
+    } else
+#endif
+    {
         m_resources = XRRGetScreenResources(QX11Info::display(), \
QX11Info::appRootWindow()); +    }
 
     if (!m_resources)
     {


[prev in list] [next in list] [prev in thread] [next in thread]