summaryrefslogtreecommitdiffhomepage
path: root/src/lib/Xmobar
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/Xmobar')
-rw-r--r--src/lib/Xmobar/Plugins.hs5
-rw-r--r--src/lib/Xmobar/Plugins/BufferedPipeReader.hs2
-rw-r--r--src/lib/Xmobar/Plugins/CommandReader.hs2
-rw-r--r--src/lib/Xmobar/Plugins/Date.hs2
-rw-r--r--src/lib/Xmobar/Plugins/DateZone.hs4
-rw-r--r--src/lib/Xmobar/Plugins/EWMH.hs2
-rw-r--r--src/lib/Xmobar/Plugins/Locks.hs2
-rw-r--r--src/lib/Xmobar/Plugins/MBox.hs2
-rw-r--r--src/lib/Xmobar/Plugins/Mail.hs2
-rw-r--r--src/lib/Xmobar/Plugins/MarqueePipeReader.hs3
-rw-r--r--src/lib/Xmobar/Plugins/Monitors.hs2
-rw-r--r--src/lib/Xmobar/Plugins/Monitors/Common.hs3
-rw-r--r--src/lib/Xmobar/Plugins/StdinReader.hs2
-rw-r--r--src/lib/Xmobar/Plugins/XMonadLog.hs2
14 files changed, 17 insertions, 18 deletions
diff --git a/src/lib/Xmobar/Plugins.hs b/src/lib/Xmobar/Plugins.hs
index 284a9f5..716624f 100644
--- a/src/lib/Xmobar/Plugins.hs
+++ b/src/lib/Xmobar/Plugins.hs
@@ -14,9 +14,6 @@
--
-----------------------------------------------------------------------------
-module Xmobar.Plugins
- ( Exec (..)
- , tenthSeconds
- ) where
+module Xmobar.Plugins (Exec (..)) where
import Xmobar.Commands
diff --git a/src/lib/Xmobar/Plugins/BufferedPipeReader.hs b/src/lib/Xmobar/Plugins/BufferedPipeReader.hs
index 13f64ac..9bb421e 100644
--- a/src/lib/Xmobar/Plugins/BufferedPipeReader.hs
+++ b/src/lib/Xmobar/Plugins/BufferedPipeReader.hs
@@ -20,7 +20,7 @@ import Control.Concurrent.STM
import System.IO
import System.IO.Unsafe(unsafePerformIO)
-import Xmobar.Plugins
+import Xmobar.Commands
import Xmobar.Utils(hGetLineSafe)
import Xmobar.System.Signal
import Xmobar.System.Environment
diff --git a/src/lib/Xmobar/Plugins/CommandReader.hs b/src/lib/Xmobar/Plugins/CommandReader.hs
index e90fa62..87cf5a4 100644
--- a/src/lib/Xmobar/Plugins/CommandReader.hs
+++ b/src/lib/Xmobar/Plugins/CommandReader.hs
@@ -16,7 +16,7 @@
module Xmobar.Plugins.CommandReader where
import System.IO
-import Xmobar.Plugins
+import Xmobar.Commands
import Xmobar.Utils (hGetLineSafe)
import System.Process(runInteractiveCommand, getProcessExitCode)
diff --git a/src/lib/Xmobar/Plugins/Date.hs b/src/lib/Xmobar/Plugins/Date.hs
index fdc6a56..fd7acae 100644
--- a/src/lib/Xmobar/Plugins/Date.hs
+++ b/src/lib/Xmobar/Plugins/Date.hs
@@ -19,7 +19,7 @@
module Xmobar.Plugins.Date (Date(..)) where
-import Xmobar.Plugins
+import Xmobar.Commands
#if ! MIN_VERSION_time(1,5,0)
import System.Locale
diff --git a/src/lib/Xmobar/Plugins/DateZone.hs b/src/lib/Xmobar/Plugins/DateZone.hs
index f386202..d3d4341 100644
--- a/src/lib/Xmobar/Plugins/DateZone.hs
+++ b/src/lib/Xmobar/Plugins/DateZone.hs
@@ -22,8 +22,8 @@
module Xmobar.Plugins.DateZone (DateZone(..)) where
-import Xmobar.Plugins
-
+import Xmobar.Commands
+import Xmobar.Commands(tenthSeconds)
#ifdef DATEZONE
import Control.Concurrent.STM
diff --git a/src/lib/Xmobar/Plugins/EWMH.hs b/src/lib/Xmobar/Plugins/EWMH.hs
index d4e9c88..ab5dc32 100644
--- a/src/lib/Xmobar/Plugins/EWMH.hs
+++ b/src/lib/Xmobar/Plugins/EWMH.hs
@@ -22,7 +22,7 @@ import Control.Monad.State
import Control.Monad.Reader
import Graphics.X11 hiding (Modifier, Color)
import Graphics.X11.Xlib.Extras
-import Xmobar.Plugins
+import Xmobar.Commands
#ifdef UTF8
#undef UTF8
import Codec.Binary.UTF8.String as UTF8
diff --git a/src/lib/Xmobar/Plugins/Locks.hs b/src/lib/Xmobar/Plugins/Locks.hs
index 63a7297..c086464 100644
--- a/src/lib/Xmobar/Plugins/Locks.hs
+++ b/src/lib/Xmobar/Plugins/Locks.hs
@@ -19,7 +19,7 @@ import Data.List
import Data.Bits
import Control.Monad
import Graphics.X11.Xlib.Extras
-import Xmobar.Plugins
+import Xmobar.Commands
import Xmobar.Plugins.Kbd
import Xmobar.Utils (nextEvent')
diff --git a/src/lib/Xmobar/Plugins/MBox.hs b/src/lib/Xmobar/Plugins/MBox.hs
index 20e63cf..ba50207 100644
--- a/src/lib/Xmobar/Plugins/MBox.hs
+++ b/src/lib/Xmobar/Plugins/MBox.hs
@@ -16,7 +16,7 @@
module Xmobar.Plugins.MBox (MBox(..)) where
import Prelude
-import Xmobar.Plugins
+import Xmobar.Commands
#ifdef INOTIFY
import Xmobar.Utils (changeLoop, expandHome)
diff --git a/src/lib/Xmobar/Plugins/Mail.hs b/src/lib/Xmobar/Plugins/Mail.hs
index d8946bf..8c0321f 100644
--- a/src/lib/Xmobar/Plugins/Mail.hs
+++ b/src/lib/Xmobar/Plugins/Mail.hs
@@ -15,7 +15,7 @@
module Xmobar.Plugins.Mail where
-import Xmobar.Plugins
+import Xmobar.Commands
#ifdef INOTIFY
import Xmobar.Utils (expandHome, changeLoop)
diff --git a/src/lib/Xmobar/Plugins/MarqueePipeReader.hs b/src/lib/Xmobar/Plugins/MarqueePipeReader.hs
index 48f5355..f106a21 100644
--- a/src/lib/Xmobar/Plugins/MarqueePipeReader.hs
+++ b/src/lib/Xmobar/Plugins/MarqueePipeReader.hs
@@ -16,8 +16,9 @@ module Xmobar.Plugins.MarqueePipeReader where
import System.IO (openFile, IOMode(ReadWriteMode), Handle)
import Xmobar.System.Environment
-import Xmobar.Plugins (tenthSeconds, Exec(alias, start))
+import Xmobar.Plugins (Exec(alias, start))
import Xmobar.Utils(hGetLineSafe)
+import Xmobar.Commands(tenthSeconds)
import System.Posix.Files (getFileStatus, isNamedPipe)
import Control.Concurrent(forkIO, threadDelay)
import Control.Concurrent.STM (TChan, atomically, writeTChan, tryReadTChan, newTChan)
diff --git a/src/lib/Xmobar/Plugins/Monitors.hs b/src/lib/Xmobar/Plugins/Monitors.hs
index 64d38f0..b263bd8 100644
--- a/src/lib/Xmobar/Plugins/Monitors.hs
+++ b/src/lib/Xmobar/Plugins/Monitors.hs
@@ -17,7 +17,7 @@
module Xmobar.Plugins.Monitors where
-import Xmobar.Plugins
+import Xmobar.Commands
import Xmobar.Plugins.Monitors.Common (runM, runMD)
#ifdef WEATHER
diff --git a/src/lib/Xmobar/Plugins/Monitors/Common.hs b/src/lib/Xmobar/Plugins/Monitors/Common.hs
index 272690b..d024336 100644
--- a/src/lib/Xmobar/Plugins/Monitors/Common.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/Common.hs
@@ -76,7 +76,8 @@ import Text.ParserCombinators.Parsec
import System.Console.GetOpt
import Control.Exception (SomeException,handle)
-import Xmobar.Plugins
+import Xmobar.Commands
+
-- $monitor
type Monitor a = ReaderT MConfig IO a
diff --git a/src/lib/Xmobar/Plugins/StdinReader.hs b/src/lib/Xmobar/Plugins/StdinReader.hs
index ad8e60c..ff96b2b 100644
--- a/src/lib/Xmobar/Plugins/StdinReader.hs
+++ b/src/lib/Xmobar/Plugins/StdinReader.hs
@@ -23,7 +23,7 @@ import System.Posix.Process
import System.Exit
import System.IO
import Control.Exception (SomeException(..), handle)
-import Xmobar.Plugins
+import Xmobar.Commands
import Xmobar.Actions (stripActions)
import Xmobar.Utils (hGetLineSafe)
diff --git a/src/lib/Xmobar/Plugins/XMonadLog.hs b/src/lib/Xmobar/Plugins/XMonadLog.hs
index 95dc558..908d2a4 100644
--- a/src/lib/Xmobar/Plugins/XMonadLog.hs
+++ b/src/lib/Xmobar/Plugins/XMonadLog.hs
@@ -20,7 +20,7 @@ module Xmobar.Plugins.XMonadLog (XMonadLog(..)) where
import Control.Monad
import Graphics.X11
import Graphics.X11.Xlib.Extras
-import Xmobar.Plugins
+import Xmobar.Commands
#ifdef UTF8
#undef UTF8
import Codec.Binary.UTF8.String as UTF8