function declaration for a function that no longer exists

[chaz/openbox] / src / BaseDisplay.cc

diff --git a/src/BaseDisplay.cc b/src/BaseDisplay.cc
index 8f3b39b17e827c1ebdaa753429d0e36639647473..5aecac891772c891e1609d394c907c9b27f3adb9 100644 (file)
--- 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
 
@@ -494,20 +493,22 @@ ScreenInfo::ScreenInfo(BaseDisplay *d, unsigned int num) {
          on a pre-screen basis anyways.
       */
       xinerama_active = XineramaIsActive(d->getXDisplay());
-      /*
-         If Xinerama is being used, there there is only going to be one screen
-         present. We still, of course, want to use the screen class, but that is
-         why no screen number is used in this function call. There should never
-         be more than one screen present with Xinerama active.
-      */
-      int num;
-      XineramaScreenInfo *info = XineramaQueryScreens(d->getXDisplay(), &num);
-      if (num > 0 && info) {
-        for (int i = 0; i < num; ++i) {
-          xinerama_areas.push_back(Rect(info[i].x_org, info[i].y_org,
-                                        info[i].width, info[i].height));
+      if (xinerama_active) {
+        /*
+           If Xinerama is being used, there there is only going to be one screen
+           present. We still, of course, want to use the screen class, but that
+           is why no screen number is used in this function call. There should
+           never be more than one screen present with Xinerama active.
+        */
+        int num;
+        XineramaScreenInfo *info = XineramaQueryScreens(d->getXDisplay(), &num);
+        if (num > 0 && info) {
+          for (int i = 0; i < num; ++i) {
+            xinerama_areas.push_back(Rect(info[i].x_org, info[i].y_org,
+                                          info[i].width, info[i].height));
+          }
+          XFree(info);
         }
-        XFree(info);
       }
     }
   }