From: Dana Jansens <danakj@orodu.net>
Date: Mon, 22 Jul 2002 01:21:07 +0000 (+0000)
Subject: make work without --enable-xinerama
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=f7122039db43e473b4e7adade8b484eea071d802;p=chaz%2Fopenbox

make work without --enable-xinerama
---

diff --git a/src/BaseDisplay.cc b/src/BaseDisplay.cc
index 8f3b39b1..320f2ba1 100644
--- a/src/BaseDisplay.cc
+++ b/src/BaseDisplay.cc
@@ -236,19 +236,18 @@ BaseDisplay::BaseDisplay(const char *app_name, const char *dpy_name) {
   shape.extensions = False;
 #endif // SHAPE
 
-  xinerama.extensions = False;
 #ifdef    XINERAMA
   if (XineramaQueryExtension(display, &xinerama.event_basep,
-                             &xinerama.error_basep)) {
-    if (XineramaQueryVersion(display, &xinerama.major,
-                             &xinerama.minor)) {
+                             &xinerama.error_basep) &&
+      XineramaQueryVersion(display, &xinerama.major, &xinerama.minor)) {
 #ifdef    DEBUG
-      fprintf(stderr,
-              "BaseDisplay::BaseDisplay: Found Xinerama version %d.%d\n",
-              xinerama.major, xinerama.minor);
+    fprintf(stderr,
+            "BaseDisplay::BaseDisplay: Found Xinerama version %d.%d\n",
+            xinerama.major, xinerama.minor);
 #endif // DEBUG
-      xinerama.extensions = True;
-    }
+    xinerama.extensions = True;
+  } else {
+    xinerama.extensions = False;
   }
 #endif // XINERAMA