From 31ef889762d84ae735e849a8ca451beea82139f9 Mon Sep 17 00:00:00 2001
From: ndwarshuis <ndwar@yavin4.ch>
Date: Sun, 21 Nov 2021 00:53:45 -0500
Subject: [PATCH] REF clean up screensaver

---
 lib/XMonad/Internal/DBus/Screensaver.hs | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/lib/XMonad/Internal/DBus/Screensaver.hs b/lib/XMonad/Internal/DBus/Screensaver.hs
index aa04b28..28453e5 100644
--- a/lib/XMonad/Internal/DBus/Screensaver.hs
+++ b/lib/XMonad/Internal/DBus/Screensaver.hs
@@ -6,10 +6,7 @@ module XMonad.Internal.DBus.Screensaver
   , callToggle
   , callQuery
   , matchSignal
-  , ssPath
-  , ssDep
   , ssSignalDep
-  , SSControls(..)
   ) where
 
 import           Control.Monad               (void)
@@ -33,13 +30,6 @@ type SSState = Bool -- true is enabled
 ssExecutable :: String
 ssExecutable = "xset"
 
-ssDep :: Dependency
-ssDep = Executable ssExecutable
-
-ssSignalDep :: Dependency
-ssSignalDep = DBusEndpoint xmonadBus $ Endpoint ssPath interface
-  $ Signal_ memState
-
 toggle :: IO SSState
 toggle = do
   st <- query
@@ -103,14 +93,12 @@ bodyGetCurrentState _   = Nothing
 --------------------------------------------------------------------------------
 -- | Exported haskell API
 
-newtype SSControls = SSControls { ssToggle :: FeatureIO }
-
 exportScreensaver :: Client -> FeatureIO
 exportScreensaver client = Feature
   { ftrAction = cmd
   , ftrName = "screensaver interface"
   , ftrWarning = Default
-  , ftrChildren = [ssDep, DBusBus xmonadBus]
+  , ftrChildren = [Executable ssExecutable, DBusBus xmonadBus]
   }
   where
     cmd = export client ssPath defaultInterface
@@ -149,3 +137,7 @@ callQuery = do
 
 matchSignal :: (Maybe SSState -> IO ()) -> IO SignalHandler
 matchSignal cb = addMatchCallback ruleCurrentState $ cb . bodyGetCurrentState
+
+ssSignalDep :: Dependency
+ssSignalDep = DBusEndpoint xmonadBus $ Endpoint ssPath interface
+  $ Signal_ memState