Clean up imports.

[dead/halcyon.git] / src / Configuration.hs

diff --git a/src/Configuration.hs b/src/Configuration.hs
index f73bc615a7d81adbd8c2c2eca0aea3afc92ab5f9..786586557226406b8828e644228f3cb03204d290 100644 (file)
--- a/src/Configuration.hs
+++ b/src/Configuration.hs
@@ -6,11 +6,11 @@
 module Configuration (
   Cfg(..),
   default_config,
-  merge_optional
-)
+  merge_optional )
 where
 
-import qualified OptionalConfiguration as OC
+import qualified OptionalConfiguration as OC ( OptionalCfg(..) )
+import Usernames ( Usernames(..) )
 
 data Cfg =
   Cfg { consumer_key :: String,
@@ -24,7 +24,7 @@ data Cfg =
         from_address :: Maybe String,
         to_address :: Maybe String,
         verbose :: Bool,
-        usernames :: [String] }
+        usernames :: Usernames }
     deriving (Show)
 
 
@@ -41,7 +41,7 @@ default_config =
         from_address = Nothing,
         to_address = Nothing,
         verbose = False,
-        usernames = [] }
+        usernames = Usernames [] }
 
 merge_optional :: Cfg -> OC.OptionalCfg -> Cfg
 merge_optional cfg opt_cfg =
@@ -71,6 +71,6 @@ merge_optional cfg opt_cfg =
     merge' (Just _) (Just y) = Just y
 
     -- If there are any optional usernames, use only those.
-    all_usernames = if (null (OC.usernames opt_cfg))
-                      then (usernames cfg)
-                      else (OC.usernames opt_cfg)
+    all_usernames = if (null (get_usernames (OC.usernames opt_cfg)))
+                    then (usernames cfg)
+                    else (OC.usernames opt_cfg)