1 files changed, 6 insertions, 5 deletions

diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index ba542909..ace36f80 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -97,14 +97,14 @@ astring (AttValue [Left s]) = [s]
 tagcontent tag content = Prelude.concatMap (\(CElem (Elem _ _ c) _)->c) 
                               $ Prelude.filter (bindElem tag) content
 
-iqresult host id (Just rsrc) = L.unlines $
+iq_bind_reply id jid = L.unlines $
     [ "<iq type='result' id='" <++> id <++> "'>"
     , "<bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'>"
-    , "<jid>" <++> id <++> "@" <++> host <++> "/" <++> rsrc <++> "</jid>"
+    , "<jid>" <++> jid <++> "</jid>"
     , "</bind>"
     , "</iq> "
     ]
-iqresult host id Nothing = L.unlines $
+iq_session_reply host id = L.unlines $
     [ "<iq type='result'"
     , "    id='" <++> id <++> "'"
     , "    from='" <++> host <++> "'"
@@ -136,10 +136,11 @@ iqresponse host (Elem _ attrs content) = do
         let string (CString _ s _) = [s]
         mplus (do
                 rsrc <- listToMaybe . Prelude.concatMap string . tagcontent "resource" . tagcontent "bind" $ content
-                Just $ iqresult host id (Just (pack rsrc)) )
+                let jid = "TODO" <++> "@" <++> host <++> "/" <++> pack rsrc
+                Just $ iq_bind_reply id jid )
               (do
                 guard (hasElem "session" content)
-                Just (iqresult host id Nothing))
+                Just (iq_session_reply host id))
                 
       "get" -> {- trace ("iq-get "++show (attrs,content)) $ -} do
         (tag,as) <- lookup (N "xmlns") (anytagattrs content)