Align the mailbox counts in the summary report to the same column.

[mailbox-count.git] / src / OptionalConfiguration.hs

diff --git a/src/OptionalConfiguration.hs b/src/OptionalConfiguration.hs
index d2b6a051a3e8593024c7c9dceffadf41a4fa9e2e..0bd093b457acc174d4ed5637824c51a3eb17026d 100644 (file)
--- a/src/OptionalConfiguration.hs
+++ b/src/OptionalConfiguration.hs
@@ -10,7 +10,8 @@
 
 module OptionalConfiguration (
   OptionalConfiguration(..),
-  from_rc )
+  from_rc,
+  merge_maybes )
 where
 
 import qualified Data.Configurator as DC (
@@ -33,7 +34,6 @@ import System.IO.Error ( catchIOError )
 --
 data OptionalConfiguration =
   OptionalConfiguration {
-    both     :: Maybe Bool,
     database :: Maybe String,
     detail   :: Maybe Bool,
     host     :: Maybe String,
@@ -70,12 +70,10 @@ instance Monoid OptionalConfiguration where
              Nothing
              Nothing
              Nothing
-             Nothing
 
   -- | Combine @cfg1@ and @cfg2@, giving precedence to @cfg2@.
   cfg1 `mappend` cfg2 =
     OptionalConfiguration
-      (merge_maybes (both cfg1) (both cfg2))
       (merge_maybes (database cfg1) (database cfg2))
       (merge_maybes (detail cfg1) (detail cfg2))
       (merge_maybes (host cfg1) (host cfg2))
@@ -106,7 +104,6 @@ from_rc = do
   let user_config_path = home </> ".mailbox-countrc"
   cfg <- DC.load [ DC.Optional global_config_path,
                    DC.Optional user_config_path ]
-  cfg_both <- DC.lookup cfg "both"
   cfg_database <- DC.lookup cfg "database"
   cfg_detail <- DC.lookup cfg "detail"
   cfg_host <- DC.lookup cfg "host"
@@ -115,7 +112,6 @@ from_rc = do
   cfg_username <- DC.lookup cfg "username"
 
   return $ OptionalConfiguration
-             cfg_both
              cfg_database
              cfg_detail
              cfg_host