From 520a2457f97b2f00de58f29ef0ce38d4aff18fbd Mon Sep 17 00:00:00 2001 From: Philipp Balzarek Date: Tue, 9 Apr 2013 17:18:59 +0200 Subject: [PATCH] update types for conduit 1.0 --- source/Network/Xmpp/Stream.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Network/Xmpp/Stream.hs b/source/Network/Xmpp/Stream.hs index 110f0c2..b760483 100644 --- a/source/Network/Xmpp/Stream.hs +++ b/source/Network/Xmpp/Stream.hs @@ -88,7 +88,7 @@ streamUnpickleElem p x = do -- This is the conduit sink that handles the stream XML events. We extend it -- with ErrorT capabilities. -type StreamSink a = ErrorT XmppFailure (Pipe Event Event Void () IO) a +type StreamSink a = ErrorT XmppFailure (ConduitM Event Void IO) a -- Discards all events before the first EventBeginElement. throwOutJunk :: Monad m => Sink Event m () @@ -720,7 +720,7 @@ pushIQ iqID to tp lang body stream = runErrorT $ do liftIO $ errorM "Pontarius.XMPP" $ "pushIQ: Unexpected stanza type." throwError XmppOtherFailure -debugConduit :: Pipe l ByteString ByteString u IO b +debugConduit :: (Show o, MonadIO m) => ConduitM o o m b debugConduit = forever $ do s' <- await case s' of