bug fixes

1 files changed, 3 insertions, 4 deletions

diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index a181b3e5..5a5cd9cc 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -795,8 +795,8 @@ makePresenceStanza namespace mjid pstat = do
       , EventContent (ContentText stat)
       , EventEndElement "{jabber:client}show" ]
     
-makeRosterUpdate tojid contact (suborask,relationship) = do
-    let attrs = [attr suborask relationship]
+makeRosterUpdate tojid contact as = do
+    let attrs = map (uncurry attr) as
     stanzaFromList Unrecognized
       [ EventBeginElement "{jabber:client}iq" 
             [ attr "to"   tojid
@@ -1343,13 +1343,12 @@ sendRoster query xmpp replyto = do
     hostname <- xmppTellMyNameToClient xmpp
     let getlist f = do
             bs <- f xmpp k
-            -- js <- mapM parseHostNameJID bs
             return (Set.fromList bs) -- js)
     buddies     <- getlist xmppRosterBuddies
     subscribers <- getlist xmppRosterSubscribers
     solicited   <- getlist xmppRosterSolicited
     subnone0    <- getlist xmppRosterOthers
-    let subnone = subnone0 \\ (Set.union buddies subscribers)
+    let subnone = Set.union solicited subnone0 \\ Set.union buddies subscribers
     let subto = buddies \\ subscribers
     let subfrom = subscribers \\ buddies
     let subboth = Set.intersection buddies subscribers