2 files changed, 16 insertions, 17 deletions

diff --git a/Presence/Server.hs b/Presence/Server.hs
index fd5f1e43..f7f99907 100644
--- a/Presence/Server.hs
+++ b/Presence/Server.hs
@@ -3,9 +3,7 @@
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE TupleSections      #-}
-#ifdef TEST
 {-# LANGUAGE FlexibleInstances #-}
-#endif
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Server
@@ -15,7 +13,7 @@
 -- 
 -- A TCP client/server library.
 --
--- TODO: 
+-- TODO:  XXX: A newer version of this code is in the server.git repo. XXX
 --
 --  * interface tweaks
 --
@@ -163,9 +161,9 @@ data ConnectionEvent b
     -- ^ A 'Connect' command failed.
     | HalfConnection InOrOut
     -- ^ Half of a half-duplex connection is avaliable.
-    | EOF 
+    | EOF
     -- ^ A connection was terminated
-    | RequiresPing 
+    | RequiresPing
     -- ^ 'pingInterval' miliseconds of idle was experienced
 
 #ifdef TEST
@@ -187,7 +185,7 @@ data ConnectionRecord u
 
 -- | This object accepts commands and signals events and maintains
 -- the list of currently listening ports and established connections.
-data Server a u 
+data Server a u
  = Server { serverCommand :: TMVar (ServerInstruction a u)
           , serverEvent :: TChan ((a,u), ConnectionEvent ByteString)
           , serverReleaseKey :: ReleaseKey
@@ -447,7 +445,7 @@ newConnection server params conkey u h inout = do
         getkont <- atomically $ takeTMVar kontvar
         kont <- atomically getkont
         kont
-    
+
     atomically $ do
         current <- fmap (Map.lookup conkey) $ readTVar (conmap server)
         case current of
diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index 272594e7..41d60a07 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -26,8 +26,19 @@ module XMPPServer
     , makeRosterUpdate
     , makeMessage
     , JabberShow(..)
+    , Server
     ) where
 
+import ConnectionKey
+import qualified Control.Concurrent.STM.UpdateStream as Slotted
+import Nesting
+import Server
+import EventUtil
+import ControlMaybe
+import LockedChan
+import PeerResolve
+import Blaze.ByteString.Builder (Builder)
+
 import Debug.Trace
 import System.IO (hFlush,stdout)
 import Control.Monad.Trans.Resource
@@ -70,16 +81,6 @@ import Data.Void (Void)
 import System.Endian (toBE32)
 import Control.Applicative
 
-import ConnectionKey
-import qualified Control.Concurrent.STM.UpdateStream as Slotted
-import Nesting
-import Server
-import EventUtil
-import ControlMaybe
-import LockedChan
-import PeerResolve
-import Blaze.ByteString.Builder (Builder)
-
 peerport :: PortNumber
 peerport = 5269
 clientport :: PortNumber