summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/lib/Xmobar/Plugins/BufferedPipeReader.hs4
-rw-r--r--src/lib/Xmobar/Plugins/MarqueePipeReader.hs2
-rw-r--r--src/lib/Xmobar/Plugins/PipeReader.hs2
-rw-r--r--src/lib/Xmobar/System/Environment.hs (renamed from src/lib/Xmobar/Environment.hs)4
-rw-r--r--xmobar.cabal6
5 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/Xmobar/Plugins/BufferedPipeReader.hs b/src/lib/Xmobar/Plugins/BufferedPipeReader.hs
index ce6a783..13f64ac 100644
--- a/src/lib/Xmobar/Plugins/BufferedPipeReader.hs
+++ b/src/lib/Xmobar/Plugins/BufferedPipeReader.hs
@@ -20,10 +20,10 @@ import Control.Concurrent.STM
import System.IO
import System.IO.Unsafe(unsafePerformIO)
-import Xmobar.Environment
import Xmobar.Plugins
import Xmobar.Utils(hGetLineSafe)
import Xmobar.System.Signal
+import Xmobar.System.Environment
data BufferedPipeReader = BufferedPipeReader String [(Int, Bool, String)]
deriving (Read, Show)
@@ -45,7 +45,7 @@ instance Exec BufferedPipeReader where
writer chan str rst
where
- initV :: IO ( TChan (Int, Bool, String), TVar (Maybe String), TVar Bool )
+ initV :: IO (TChan (Int, Bool, String), TVar (Maybe String), TVar Bool)
initV = atomically $ do
tc <- newTChan
ts <- newTVar Nothing
diff --git a/src/lib/Xmobar/Plugins/MarqueePipeReader.hs b/src/lib/Xmobar/Plugins/MarqueePipeReader.hs
index ad1ae40..48f5355 100644
--- a/src/lib/Xmobar/Plugins/MarqueePipeReader.hs
+++ b/src/lib/Xmobar/Plugins/MarqueePipeReader.hs
@@ -15,7 +15,7 @@
module Xmobar.Plugins.MarqueePipeReader where
import System.IO (openFile, IOMode(ReadWriteMode), Handle)
-import Xmobar.Environment
+import Xmobar.System.Environment
import Xmobar.Plugins (tenthSeconds, Exec(alias, start))
import Xmobar.Utils(hGetLineSafe)
import System.Posix.Files (getFileStatus, isNamedPipe)
diff --git a/src/lib/Xmobar/Plugins/PipeReader.hs b/src/lib/Xmobar/Plugins/PipeReader.hs
index 593a4a7..5e22408 100644
--- a/src/lib/Xmobar/Plugins/PipeReader.hs
+++ b/src/lib/Xmobar/Plugins/PipeReader.hs
@@ -16,8 +16,8 @@ module Xmobar.Plugins.PipeReader where
import System.IO
import Xmobar.Plugins(Exec(..))
-import Xmobar.Environment(expandEnv)
import Xmobar.Utils(hGetLineSafe)
+import Xmobar.System.Environment(expandEnv)
import System.Posix.Files
import Control.Concurrent(threadDelay)
import Control.Exception
diff --git a/src/lib/Xmobar/Environment.hs b/src/lib/Xmobar/System/Environment.hs
index 8a9223a..86197db 100644
--- a/src/lib/Xmobar/Environment.hs
+++ b/src/lib/Xmobar/System/Environment.hs
@@ -11,10 +11,10 @@
-- A function to expand environment variables in strings
--
-----------------------------------------------------------------------------
-module Xmobar.Environment(expandEnv) where
+module Xmobar.System.Environment(expandEnv) where
import Control.Applicative ((<$>))
-import Data.Maybe (fromMaybe)
+import Data.Maybe (fromMaybe)
import System.Environment (lookupEnv)
expandEnv :: String -> IO String
diff --git a/xmobar.cabal b/xmobar.cabal
index e0cc2e8..ee58013 100644
--- a/xmobar.cabal
+++ b/xmobar.cabal
@@ -132,6 +132,7 @@ library
other-modules: Xmobar.Parsers,
Xmobar.Utils,
Xmobar.System.StatFS,
+ Xmobar.System.Environment,
Xmobar.System.Localize,
Xmobar.System.Signal,
Xmobar.X11.Types,
@@ -140,8 +141,7 @@ library
Xmobar.X11.EventLoop,
Xmobar.X11.ColorCache,
Xmobar.X11.Window,
- Xmobar.X11.Draw,
- Xmobar.Environment
+ Xmobar.X11.Draw
extra-libraries: Xrandr Xrender
@@ -310,6 +310,6 @@ test-suite XmobarTest
Xmobar.Commands
Xmobar.Plugins
Xmobar.Plugins.Monitors.Common
- Xmobar.Signal
+ Xmobar.System.Signal
Xmobar.Utils
cpp-options: -DALSA