diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-26 23:07:30 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-26 23:07:30 -0400 |
| commit | 7f634962298bd086c485dd4080dc930cb3603491 (patch) | |
| tree | 37655a26d7ea9170bf32651585e2f6bd8f5992c2 /Assistant | |
| parent | 117df9c3714f2366d4f10d63fce41a608d96308e (diff) | |
gnutls segfault fixed
Adjust build deps to ensure that only a fixed version of the library will
be used.
Also, removed the bound thread stuff, which I now think was (probably)
a red herring.
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/Threads/PushNotifier.hs | 2 | ||||
| -rw-r--r-- | Assistant/XMPP.hs | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Assistant/Threads/PushNotifier.hs b/Assistant/Threads/PushNotifier.hs index 8c71138d7..9f15d5419 100644 --- a/Assistant/Threads/PushNotifier.hs +++ b/Assistant/Threads/PushNotifier.hs @@ -35,7 +35,7 @@ pushNotifierThread st dstatus pushnotifier = NamedThread thisThread $ do fulljid <- bindJID jid liftIO $ debug thisThread ["XMPP connected", show fulljid] s <- getSession - _ <- liftIO $ forkOS $ void $ runXMPP s $ + _ <- liftIO $ forkIO $ void $ runXMPP s $ receivenotifications sendnotifications where diff --git a/Assistant/XMPP.hs b/Assistant/XMPP.hs index d71bd7eaf..75d948cbd 100644 --- a/Assistant/XMPP.hs +++ b/Assistant/XMPP.hs @@ -28,11 +28,10 @@ data XMPPCreds = XMPPCreds } deriving (Read, Show) -{- Note that this must be run in a bound thread; gnuTLS requires it. -} connectXMPP :: XMPPCreds -> (JID -> XMPP a) -> IO (Either SomeException ()) connectXMPP c a = case parseJID (xmppJID c) of Nothing -> error "bad JID" - Just jid -> runInBoundThread $ connectXMPP' jid c a + Just jid -> connectXMPP' jid c a {- Do a SRV lookup, but if it fails, fall back to the cached xmppHostname. -} connectXMPP' :: JID -> XMPPCreds -> (JID -> XMPP a) -> IO (Either SomeException ()) |