X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailbox-count.git;a=blobdiff_plain;f=src%2FOptionalConfiguration.hs;h=0bd093b457acc174d4ed5637824c51a3eb17026d;hp=6bf4f9b35d7db66df049634a7348ecd27a4b60c1;hb=bc4c3efd191f3cc5b7b9f046775bff706c491a7d;hpb=7a6ba612bdec5ba940dc6f74143ca64a9163fff2

diff --git a/src/OptionalConfiguration.hs b/src/OptionalConfiguration.hs
index 6bf4f9b..0bd093b 100644
--- a/src/OptionalConfiguration.hs
+++ b/src/OptionalConfiguration.hs
@@ -34,7 +34,6 @@ import System.IO.Error ( catchIOError )
 --
 data OptionalConfiguration =
   OptionalConfiguration {
-    both     :: Maybe Bool,
     database :: Maybe String,
     detail   :: Maybe Bool,
     host     :: Maybe String,
@@ -71,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))
@@ -107,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"
@@ -116,7 +112,6 @@ from_rc = do
   cfg_username <- DC.lookup cfg "username"
 
   return $ OptionalConfiguration
-             cfg_both
              cfg_database
              cfg_detail
              cfg_host