From 9bda8ecac043bc84e74a482f3f45a4dc5de3844c Mon Sep 17 00:00:00 2001
From: "caillon%redhat.com" <caillon%redhat.com>
Date: Mon, 19 Apr 2004 20:41:20 +0000
Subject: [PATCH] Fixing Xinerama bustage.  Bug 239227.

---
 gfx/src/gtk/nsScreenGtk.cpp | 6 +-----
 gfx/src/gtk/nsScreenGtk.h   | 5 +++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/gfx/src/gtk/nsScreenGtk.cpp b/gfx/src/gtk/nsScreenGtk.cpp
index f07ecf87d82d..0c80a9656e46 100644
--- a/gfx/src/gtk/nsScreenGtk.cpp
+++ b/gfx/src/gtk/nsScreenGtk.cpp
@@ -43,10 +43,6 @@
 #include <gtk/gtk.h>
 #include <X11/Xatom.h>
 
-#ifdef MOZ_ENABLE_XINERAMA
-#include <X11/extensions/Xinerama.h>
-#endif // MOZ_ENABLE_XINERAMA
-
 nsScreenGtk :: nsScreenGtk (  )
   : mScreenNum(0),
     mRect(0, 0, 0, 0),
@@ -165,7 +161,7 @@ nsScreenGtk :: Init ()
                       workareas[i + 2], workareas[i + 3]);
       if (!mRect.Contains(workarea)) {
         NS_WARNING("Invalid bounds");
-	continue;
+        continue;
       }
 
       mAvailRect.IntersectRect(mAvailRect, workarea);
diff --git a/gfx/src/gtk/nsScreenGtk.h b/gfx/src/gtk/nsScreenGtk.h
index 86e997e96e61..2ef0144b0c51 100644
--- a/gfx/src/gtk/nsScreenGtk.h
+++ b/gfx/src/gtk/nsScreenGtk.h
@@ -41,6 +41,11 @@
 #include "nsIScreen.h"
 #include "nsRect.h"
 
+#ifdef MOZ_ENABLE_XINERAMA
+#include <X11/Xlib.h>
+#include <X11/extensions/Xinerama.h>
+#endif // MOZ_ENABLE_XINERAMA
+
 //------------------------------------------------------------------------
 
 class nsScreenGtk : public nsIScreen