Merge pull request #843 from iogrt/ungrab

deprecate `XMonad.Util.Ungrab`
xmonad · Dec 9, 2023 · 5c30cad · 5c30cad
2 parents a34287d + 22372ab
commit 5c30cad
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -93,6 +93,9 @@
     - The function `readKeySequence` now returns a non-empty list if it
       succeeded.
 
+  * Deprecate `XMonad.Util.Ungrab`; it was moved to `XMonad.Operations`
+    in core.
+
 ### New Modules
 
   * `XMonad.Layout.CenterMainFluid`

diff --git a/XMonad/Config/Mate.hs b/XMonad/Config/Mate.hs
@@ -1,5 +1,7 @@
 {-# OPTIONS_GHC -fno-warn-missing-signatures #-}
-
+-- TODO: Remove when we depend on a version of xmonad that has unGrab.
+{-# OPTIONS_GHC -Wno-deprecations  #-}
+{-# OPTIONS_GHC -Wno-dodgy-imports #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module       : XMonad.Config.Mate
@@ -28,15 +30,14 @@ module XMonad.Config.Mate (
     desktopLayoutModifiers
     ) where
 
-import XMonad
-import XMonad.Config.Desktop
-import XMonad.Util.Run (safeSpawn)
-import XMonad.Util.Ungrab
-import XMonad.Prelude (toUpper)
-
+import System.Environment (getEnvironment)
 import qualified Data.Map as M
 
-import System.Environment (getEnvironment)
+import XMonad hiding (unGrab)
+import XMonad.Config.Desktop
+import XMonad.Prelude (toUpper)
+import XMonad.Util.Run (safeSpawn)
+import XMonad.Util.Ungrab (unGrab)
 
 -- $usage
 -- To use this module, start with the following @~\/.xmonad\/xmonad.hs@:

diff --git a/XMonad/Util/Ungrab.hs b/XMonad/Util/Ungrab.hs
@@ -13,7 +13,7 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonad.Util.Ungrab
+module XMonad.Util.Ungrab {-# DEPRECATED "Use XMonad.Operations.unGrab instead" #-}
     ( -- * Usage:
       -- $usage
       unGrab