summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorjao <jao@gnu.org>2018-11-25 22:24:17 +0000
committerjao <jao@gnu.org>2018-11-25 22:24:17 +0000
commitd1fa2bd306cf847311b3cf02e8f2de8bab8ee115 (patch)
tree06e1fed10e6a5d3e4aab5a0f9eddef4e2ab7f9df
parentbc27a68eb346b5e73c530f0f9c3e62e56517e225 (diff)
downloadxmobar-d1fa2bd306cf847311b3cf02e8f2de8bab8ee115.tar.gz
xmobar-d1fa2bd306cf847311b3cf02e8f2de8bab8ee115.tar.bz2
Xmobar.X11.Actions
-rw-r--r--src/Xmobar/App/EventLoop.hs2
-rw-r--r--src/Xmobar/Plugins/StdinReader.hs2
-rw-r--r--src/Xmobar/Plugins/XMonadLog.hs2
-rw-r--r--src/Xmobar/X11/Actions.hs (renamed from src/Xmobar/Actions.hs)2
-rw-r--r--src/Xmobar/X11/Bitmap.hs2
-rw-r--r--src/Xmobar/X11/Draw.hs2
-rw-r--r--src/Xmobar/X11/Parsers.hs2
7 files changed, 7 insertions, 7 deletions
diff --git a/src/Xmobar/App/EventLoop.hs b/src/Xmobar/App/EventLoop.hs
index 8f0b2dc..95ce129 100644
--- a/src/Xmobar/App/EventLoop.hs
+++ b/src/Xmobar/App/EventLoop.hs
@@ -37,9 +37,9 @@ import Data.Map hiding (foldr, map, filter)
import Data.Maybe (fromJust, isJust)
import Xmobar.Config
-import Xmobar.Actions
import Xmobar.Utils
import Xmobar.System.Signal
+import Xmobar.X11.Actions
import Xmobar.Run.Commands
import Xmobar.Run.Runnable
import Xmobar.X11.Parsers
diff --git a/src/Xmobar/Plugins/StdinReader.hs b/src/Xmobar/Plugins/StdinReader.hs
index bed7f5c..1d56ca8 100644
--- a/src/Xmobar/Plugins/StdinReader.hs
+++ b/src/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.Actions (stripActions)
+import Xmobar.X11.Actions (stripActions)
import Xmobar.Utils (hGetLineSafe)
import Xmobar.Run.Commands
diff --git a/src/Xmobar/Plugins/XMonadLog.hs b/src/Xmobar/Plugins/XMonadLog.hs
index a4f17bb..26b6162 100644
--- a/src/Xmobar/Plugins/XMonadLog.hs
+++ b/src/Xmobar/Plugins/XMonadLog.hs
@@ -28,7 +28,7 @@ import Codec.Binary.UTF8.String as UTF8
#endif
import Foreign.C (CChar)
import Xmobar.Utils (nextEvent')
-import Xmobar.Actions (stripActions)
+import Xmobar.X11.Actions (stripActions)
data XMonadLog = XMonadLog
| UnsafeXMonadLog
diff --git a/src/Xmobar/Actions.hs b/src/Xmobar/X11/Actions.hs
index 7901845..03e58ad 100644
--- a/src/Xmobar/Actions.hs
+++ b/src/Xmobar/X11/Actions.hs
@@ -10,7 +10,7 @@
--
-----------------------------------------------------------------------------
-module Xmobar.Actions (Action(..), runAction, stripActions) where
+module Xmobar.X11.Actions (Action(..), runAction, stripActions) where
import System.Process (system)
import Control.Monad (void)
diff --git a/src/Xmobar/X11/Bitmap.hs b/src/Xmobar/X11/Bitmap.hs
index c0dba14..e323606 100644
--- a/src/Xmobar/X11/Bitmap.hs
+++ b/src/Xmobar/X11/Bitmap.hs
@@ -25,7 +25,7 @@ import System.FilePath ((</>))
import System.Mem.Weak ( addFinalizer )
import Xmobar.X11.ColorCache
import Xmobar.X11.Parsers (Widget(..))
-import Xmobar.Actions (Action)
+import Xmobar.X11.Actions (Action)
#ifdef XPM
import Xmobar.X11.XPMFile(readXPMFile)
diff --git a/src/Xmobar/X11/Draw.hs b/src/Xmobar/X11/Draw.hs
index d0c78a8..781ced8 100644
--- a/src/Xmobar/X11/Draw.hs
+++ b/src/Xmobar/X11/Draw.hs
@@ -29,8 +29,8 @@ import Data.Map hiding (foldr, map, filter)
import Graphics.X11.Xlib hiding (textExtents, textWidth)
import Graphics.X11.Xlib.Extras
-import Xmobar.Actions (Action(..))
import qualified Xmobar.X11.Bitmap as B
+import Xmobar.X11.Actions (Action(..))
import Xmobar.X11.Types
import Xmobar.X11.XUtil
import Xmobar.Config
diff --git a/src/Xmobar/X11/Parsers.hs b/src/Xmobar/X11/Parsers.hs
index 8c1abac..c76110d 100644
--- a/src/Xmobar/X11/Parsers.hs
+++ b/src/Xmobar/X11/Parsers.hs
@@ -17,7 +17,7 @@
module Xmobar.X11.Parsers (parseString, Widget(..)) where
import Xmobar.Config
-import Xmobar.Actions
+import Xmobar.X11.Actions
import Control.Monad (guard, mzero)
import Text.ParserCombinators.Parsec