Converted to SocketLike and quitListening interfaces.

Paving the way for conversion to conduits-based server over HaXml.

1 files changed, 4 insertions, 5 deletions

diff --git a/Presence/main.hs b/Presence/main.hs
index 74589a41..a0a80569 100644
--- a/Presence/main.hs
+++ b/Presence/main.hs
@@ -27,7 +27,6 @@ import UTmp
 import FGConsole
 import XMPPServer
 import Data.HList
-import Network.Socket (sClose)
 import Control.Exception
 import LocalPeerCred
 import System.Posix.User
@@ -223,16 +222,16 @@ start ip4or6 = do
             utmp_file
             dologin
 #endif
-    sockLocals <- listenForXmppClients ip4or6 (UnixSessions tracked) 5222 HNil
-    sockRemotes <- listenForRemotePeers ip4or6 (UnixSessions tracked) 5269 HNil
+    clients <- listenForXmppClients ip4or6 (UnixSessions tracked) 5222 HNil
+    peers   <- listenForRemotePeers ip4or6 (UnixSessions tracked) 5269 HNil
 
     threadDelay 1000 -- wait a moment to obtain current tty
     dologin ()
     putStrLn "\nHit enter to terminate...\n"
     getLine
     killThread remotes
-    sClose sockLocals
-    sClose sockRemotes
+    quitListening clients
+    quitListening peers
     -- threadDelay 1000
     putStrLn "closed listener."
     unmonitorTTY mtty