bin/xmobar.hs

@@ -46,12 +46,14 @@ main = getArgs >>= parse
 parse :: [String] -> IO ()
 parse [] = run
 parse ["--deps"] = withCache printDeps
-parse ["--test"] = withCache $ withDBus_ evalConfig
+parse ["--test"] = void $ withCache . evalConfig =<< connectDBus
 parse _ = usage
 
 run :: IO ()
-run = withCache $ withDBus_ $ \db -> do
+run = withCache $ do
+  db <- connectDBus
   c <- evalConfig db
+  disconnectDBus db
   liftIO $ do
     -- this is needed to see any printed messages
     hFlush stdout
@@ -66,13 +68,11 @@ evalConfig db = do
   return $ config bf ifs ios cs d
 
 printDeps :: FIO ()
-printDeps = withDBus_ $ \db ->
+printDeps = do
-  mapM_ (liftIO . putStrLn . T.unpack) $
+  db <- io connectDBus
-    sort $
+  let ps = sort $ nub $ fmap showFulfillment $ concatMap dumpFeature $ allFeatures db
-      nub $
+  io $ mapM_ (putStrLn . T.unpack) ps
-        fmap showFulfillment $
+  io $ disconnectDBus db
-          concatMap dumpFeature $
-            allFeatures db
 
 usage :: IO ()
 usage =

lib/XMonad/Internal/DBus/Control.hs

@@ -6,8 +6,6 @@
 module XMonad.Internal.DBus.Control
   ( Client
   , DBusState (..)
-  , withDBus
-  , withDBus_
   , connectDBus
   , connectDBusX
   , disconnectDBus
@@ -36,12 +34,6 @@ data DBusState = DBusState
   , dbSysClient :: Maybe SysClient
   }
 
-withDBus_ :: MonadUnliftIO m => (DBusState -> m a) -> m ()
-withDBus_ = void . withDBus
-
-withDBus :: MonadUnliftIO m => (DBusState -> m a) -> m a
-withDBus = bracket connectDBus disconnectDBus
-
 -- | Connect to the DBus
 connectDBus :: MonadUnliftIO m => m DBusState
 connectDBus = do