1 files changed, 19 insertions, 23 deletions

diff --git a/Presence/XMPP.hs b/Presence/XMPP.hs
index 3f81f000..d35e5617 100644
--- a/Presence/XMPP.hs
+++ b/Presence/XMPP.hs
@@ -241,21 +241,25 @@ tagName (EventBeginElement n _) = n
 tagName _                       = ""
 
 handleIQSetBind session cmdChan stanza_id = do
-    whenJust nextElement $ \child -> do
-    let unhandledBind = liftIO $ putStrLn $ "unhandled-bind: "++show child
-    case tagName child of
-        "{urn:ietf:params:xml:ns:xmpp-bind}resource"
-          -> do
-            rsc <- lift content
-            liftIO $ do
-                putStrLn $ "iq-set-bind-resource " ++ show rsc
-                setResource session (L.fromChunks [S.encodeUtf8 rsc])
-                jid <- getJID session
-                atomically $ writeTChan cmdChan (Send $ iq_bind_reply stanza_id (toStrict $ L.decodeUtf8 $ L.show jid) )
-                forCachedPresence session $ \presence -> do
-                    xs <- xmlifyPresenceForClient presence
-                    atomically . writeTChan cmdChan . Send $ xs
-        _ -> unhandledBind
+    mchild <- nextElement
+    case mchild of
+     Just child -> do
+        let unhandledBind = liftIO $ putStrLn $ "unhandled-bind: "++show child
+        case tagName child of
+            "{urn:ietf:params:xml:ns:xmpp-bind}resource"
+              -> do
+                rsc <- lift content
+                liftIO $ do
+                    putStrLn $ "iq-set-bind-resource " ++ show rsc
+                    setResource session (L.fromChunks [S.encodeUtf8 rsc])
+                    jid <- getJID session
+                    atomically $ writeTChan cmdChan (Send $ iq_bind_reply stanza_id (toStrict $ L.decodeUtf8 $ L.show jid) )
+                    forCachedPresence session $ \presence -> do
+                        xs <- xmlifyPresenceForClient presence
+                        atomically . writeTChan cmdChan . Send $ xs
+            _ -> unhandledBind
+     Nothing -> do
+        liftIO $ putStrLn $ "empty bind request!"
 
 
 iq_session_reply host stanza_id =
@@ -598,14 +602,6 @@ fromPeer session = doNestingXML $ do
 
 
 
-{-
-seekRemotePeers :: XMPPConfig config =>
-     config -> TChan Presence -> IO ()
-seekRemotePeers config chan = do
-    putStrLn "unimplemented: seekRemotePeers"
-    -- TODO
-    return ()
--}
 
 data OutBoundMessage = OutBoundPresence Presence | PresenceProbe JID JID
  deriving Prelude.Show