2 files changed, 3 insertions, 28 deletions
diff --git a/hw/xquartz/xpr/xprAppleWM.c b/hw/xquartz/xpr/xprAppleWM.c
index 8c4f5efb8..126661766 100644
--- a/hw/xquartz/xpr/xprAppleWM.c
+++ b/hw/xquartz/xpr/xprAppleWM.c
@@ -82,7 +82,6 @@ xprSetWindowLevel(WindowPtr pWin, int level)
     return Success;
 }
 
-#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 3
 static int
 xprAttachTransient(WindowPtr pWinChild, WindowPtr pWinParent)
 {
@@ -114,7 +113,6 @@ xprAttachTransient(WindowPtr pWinChild, WindowPtr pWinParent)
 
     return Success;
 }
-#endif
 
 static int
 xprFrameDraw(WindowPtr pWin,
@@ -146,16 +144,8 @@ static AppleWMProcsRec xprAppleWMProcs = {
     xp_frame_get_rect,
     xp_frame_hit_test,
     xprFrameDraw,
-#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 3
     xp_set_dock_proxy,
     xprAttachTransient
-#elif defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 2
-    xp_set_dock_proxy,
-    NULL
-#else
-    NULL,
-    NULL
-#endif
 };
 
 void
diff --git a/hw/xquartz/xpr/xprEvent.c b/hw/xquartz/xpr/xprEvent.c
index e193a2747..eb321a52f 100644
--- a/hw/xquartz/xpr/xprEvent.c
+++ b/hw/xquartz/xpr/xprEvent.c
@@ -74,24 +74,9 @@ QuartzModeEventHandler(int screenNum, XQuartzEvent *e, DeviceIntPtr dev)
 
     case kXquartzBringAllToFront:
         DEBUG_LOG("kXquartzBringAllToFront\n");
-        /* There's no need to do xp_window_bring_all_to_front on Leopard,
-         * and we don't care about the result, so just do it async.
-         */
-#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 6
-#  if defined(XPLUGIN_VERSION_MIN_REQUIRED) && XPLUGIN_VERSION_MIN_REQUIRED < 6
-        if (&xp_window_bring_all_to_front) {
-#  endif
-            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-                xp_window_bring_all_to_front();
-            });
-#  if defined(XPLUGIN_VERSION_MIN_REQUIRED) && XPLUGIN_VERSION_MIN_REQUIRED < 6
-        } else {
-            RootlessOrderAllWindows(e->data[0]);
-        }
-#  endif
-#else
-        RootlessOrderAllWindows(e->data[0]);
-#endif
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+            xp_window_bring_all_to_front();
+        });
 
         return TRUE;