diff options
| author | jao <jao@gnu.org> | 2018-11-25 03:21:57 +0000 |
|---|---|---|
| committer | jao <jao@gnu.org> | 2018-11-25 03:21:57 +0000 |
| commit | b909762b396932bf6d768c1f4beae5bbcb50f95a (patch) | |
| tree | ac532dd46a8c21125e618e9d8fdedb82172e3e65 | |
| parent | 658dd00771852286bb9ce007d11db869c237d934 (diff) | |
| download | xmobar-b909762b396932bf6d768c1f4beae5bbcb50f95a.tar.gz xmobar-b909762b396932bf6d768c1f4beae5bbcb50f95a.tar.bz2 | |
XPMFile also in Xmobar.X11
| -rw-r--r-- | readme.md | 10 | ||||
| -rw-r--r-- | src/lib/Xmobar/X11/Bitmap.hs | 2 | ||||
| -rw-r--r-- | src/lib/Xmobar/X11/XPMFile.hsc (renamed from src/lib/Xmobar/XPMFile.hsc) | 4 | ||||
| -rw-r--r-- | xmobar.cabal | 2 |
4 files changed, 9 insertions, 9 deletions
@@ -1587,11 +1587,11 @@ Spencer Janssen, Roman Joost, Jochen Keil, Lennart Kolmodin, Krzysztof Kosciuszkiewicz, Dmitry Kurochkin, Todd Lunter, Vanessa McHale, Robert J. Macomber, Dmitry Malikov, David McLean, Marcin Mikołajczyk, Dino Morelli, Tony Morris, Eric Mrak, Thiago Negri, Edward O'Callaghan, -Svein Ove, Martin Perner, Jens Petersen, Alexander Polakov, Petr -Rockai, Andrew Sackville-West, Markus Scherer, Daniel Schüssler, -Olivier Schneider, Alexander Shabalin, Valentin Shirokov, Peter -Simons, Alexander Solovyov, Will Song, John Soros, Travis Staton, -Artem Tarasov, Samuli Thomasson, Edward Tjörnhammar, Sergei +Svein Ove, Martin Perner, Jens Petersen, Alexander Polakov, Pavan +Rikhi, Petr Rockai, Andrew Sackville-West, Markus Scherer, Daniel +Schüssler, Olivier Schneider, Alexander Shabalin, Valentin Shirokov, +Peter Simons, Alexander Solovyov, Will Song, John Soros, Travis +Staton, Artem Tarasov, Samuli Thomasson, Edward Tjörnhammar, Sergei Trofimovich, Thomas Tuegel, Jan Vornberger, Anton Vorontsov, Daniel Wagner, Zev Weiss, Phil Xiaojun Hu, Edward Z. Yang and Norbert Zeh. diff --git a/src/lib/Xmobar/X11/Bitmap.hs b/src/lib/Xmobar/X11/Bitmap.hs index 7b7afeb..dee3966 100644 --- a/src/lib/Xmobar/X11/Bitmap.hs +++ b/src/lib/Xmobar/X11/Bitmap.hs @@ -28,7 +28,7 @@ import Xmobar.Parsers (Widget(..)) import Xmobar.Actions (Action) #ifdef XPM -import Xmobar.XPMFile(readXPMFile) +import Xmobar.X11.XPMFile(readXPMFile) import Control.Applicative((<|>)) #endif diff --git a/src/lib/Xmobar/XPMFile.hsc b/src/lib/Xmobar/X11/XPMFile.hsc index 03d534f..2daffac 100644 --- a/src/lib/Xmobar/XPMFile.hsc +++ b/src/lib/Xmobar/X11/XPMFile.hsc @@ -2,7 +2,7 @@ ----------------------------------------------------------------------------- -- | -- Module : XPMFile --- Copyright : (C) 2014 Alexander Shabalin +-- Copyright : (C) 2014, 2018 Alexander Shabalin -- License : BSD3 -- -- Maintainer : jao@gnu.org @@ -11,7 +11,7 @@ -- ----------------------------------------------------------------------------- -module Xmobar.XPMFile(readXPMFile) where +module Xmobar.X11.XPMFile(readXPMFile) where #if MIN_VERSION_mtl(2, 2, 1) import Control.Monad.Except(MonadError(..)) diff --git a/xmobar.cabal b/xmobar.cabal index dfa75a8..f250dfd 100644 --- a/xmobar.cabal +++ b/xmobar.cabal @@ -229,7 +229,7 @@ library if flag(with_xpm) || flag(all_extensions) extra-libraries: Xpm - other-modules: Xmobar.XPMFile + other-modules: Xmobar.X11.XPMFile cpp-options: -DXPM if flag(with_weather) || flag(all_extensions) |