summaryrefslogtreecommitdiffhomepage
path: root/src/Xmobar
diff options
context:
space:
mode:
authorjao <jao@gnu.org>2020-01-27 00:56:35 +0000
committerjao <jao@gnu.org>2020-01-27 00:56:35 +0000
commit5a7a0298a3e94f49321f7922f987a1a0396850a8 (patch)
tree998ac613e08a115bfcceb7e1d93388a028980e6e /src/Xmobar
parentefb6d6817c092fe08e9b0f1b8a17bddd29d97cdb (diff)
downloadxmobar-5a7a0298a3e94f49321f7922f987a1a0396850a8.tar.gz
xmobar-5a7a0298a3e94f49321f7922f987a1a0396850a8.tar.bz2
Revert "Only require http-conduit when absolutely necessary"
This reverts commit efb6d6817c092fe08e9b0f1b8a17bddd29d97cdb.
Diffstat (limited to 'src/Xmobar')
-rw-r--r--src/Xmobar/Plugins/Monitors/Common/Types.hs11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/Xmobar/Plugins/Monitors/Common/Types.hs b/src/Xmobar/Plugins/Monitors/Common/Types.hs
index ea61a58..8662ba3 100644
--- a/src/Xmobar/Plugins/Monitors/Common/Types.hs
+++ b/src/Xmobar/Plugins/Monitors/Common/Types.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE CPP #-}
-
------------------------------------------------------------------------------
-- |
-- Module: Xmobar.Plugins.Monitors.Types
@@ -29,10 +27,7 @@ module Xmobar.Plugins.Monitors.Common.Types ( Monitor
import Data.IORef (IORef, modifyIORef, newIORef, readIORef)
import Control.Monad.Reader (ReaderT, ask, liftIO)
-#if defined(WEATHER) || defined(UVMETER)
import Network.HTTP.Conduit (Manager, newManager, tlsManagerSettings)
-#endif
-
type Monitor a = ReaderT MConfig IO a
@@ -61,9 +56,7 @@ data MConfig =
, naString :: IORef String
, maxTotalWidth :: IORef Int
, maxTotalWidthEllipsis :: IORef String
-#if defined(WEATHER) || defined(UVMETER)
, manager :: IORef Manager
-#endif
}
-- | from 'http:\/\/www.haskell.org\/hawiki\/MonadState'
@@ -111,12 +104,8 @@ mkMConfig tmpl exprts =
na <- newIORef "N/A"
mt <- newIORef 0
mtel <- newIORef ""
-#if defined(WEATHER) || defined(UVMETER)
man <- newIORef =<< newManager tlsManagerSettings
return $ MC nc l lc h hc t e p d mn mx mel pc pr bb bf bw up na mt mtel man
-#else
- return $ MC nc l lc h hc t e p d mn mx mel pc pr bb bf bw up na mt mtel
-#endif
data Opts = HighColor String
| NormalColor String