X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FOptionalConfiguration.hs;h=072f25beafc4cfd3ffd1b3b4e0c62e43edaa9943;hb=refs%2Fheads%2Fmaster;hp=3dc26bdccc94dbc65ff3bb26527e9bb026c15d5d;hpb=573cbd586b1322adc779aed5d83dcb89b06b4fb4;p=list-remote-forwards.git

diff --git a/src/OptionalConfiguration.hs b/src/OptionalConfiguration.hs
index 3dc26bd..bfd4da7 100644
--- a/src/OptionalConfiguration.hs
+++ b/src/OptionalConfiguration.hs
@@ -20,15 +20,13 @@ import qualified Data.Configurator as DC (
   lookup )
 
 import Data.Maybe ( fromMaybe )
-import Data.Monoid ( Monoid(..) )
 import Data.Data ( Data )
-import Data.Typeable ( Typeable )
 import Paths_list_remote_forwards ( getSysconfDir )
 import System.Directory ( getHomeDirectory )
 import System.FilePath ( (</>) )
 import System.IO.Error ( catchIOError )
 
-import MxList ( MxList(..) )
+import MxList ( MxList(MxList, get_mxs) )
 
 -- | The same as Configuration, except everything is optional. It's easy to
 --   merge two of these by simply dropping the Nothings in favor of
@@ -45,7 +43,7 @@ data OptionalConfiguration =
     password :: Maybe String,
     port     :: Maybe Int,
     username :: Maybe String }
-  deriving (Show, Data, Typeable)
+  deriving (Show, Data)
 
 
 -- | Combine two Maybes into one, essentially mashing them