From 430b8d21493092690a3c27c8c285202312f776bd Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Sun, 26 May 2013 13:49:48 +0200
Subject: Refactoring and slight generalisation of the new Battery feature

---
 src/Plugins/Monitors/Batt.hs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'src/Plugins/Monitors/Batt.hs')

diff --git a/src/Plugins/Monitors/Batt.hs b/src/Plugins/Monitors/Batt.hs
index 27007f9..dc18c54 100644
--- a/src/Plugins/Monitors/Batt.hs
+++ b/src/Plugins/Monitors/Batt.hs
@@ -149,14 +149,6 @@ readBatteries opts bfs =
 runBatt :: [String] -> Monitor String
 runBatt = runBatt' ["BAT0","BAT1","BAT2"]
 
-statusTemplate:: String -> [String] -> Monitor String
-statusTemplate s vs = do
-  t <- getConfigValue template
-  setConfigValue (s ++ "<acstatus>") template
-  r <- parseTemplate vs
-  setConfigValue t template
-  return r
-
 runBatt' :: [String] -> [String] -> Monitor String
 runBatt' bfs args = do
   opts <- io $ parseOpts args
@@ -167,7 +159,7 @@ runBatt' bfs args = do
     Result x w t s ->
       do l <- fmtPercent x
          let ts =  [fmtTime $ floor t, fmtWatts w opts suffix d]
-         s' <- statusTemplate s (l ++ "":ts)
+         s' <- parseTemplate' (s ++ "<acstatus>") (l ++ "":ts)
          parseTemplate (l ++ s':ts)
     NA -> return "N/A"
   where fmtPercent :: Float -> Monitor [String]
-- 
cgit v1.2.3