diff --git a/source/Network/Xmpp/Tls.hs b/source/Network/Xmpp/Tls.hs index d627986..7854171 100644 --- a/source/Network/Xmpp/Tls.hs +++ b/source/Network/Xmpp/Tls.hs @@ -184,9 +184,7 @@ wrapExceptions :: IO a -> IO (Either XmppFailure a) wrapExceptions f = Ex.catches (liftM Right $ f) [ Ex.Handler $ return . Left . XmppIOException , Ex.Handler $ wrap . XmppTlsError - , Ex.Handler $ wrap . XmppTlsConnectionNotEstablished - , Ex.Handler $ wrap . XmppTlsTerminated - , Ex.Handler $ wrap . XmppTlsHandshakeFailed + , Ex.Handler $ wrap . XmppTlsException , Ex.Handler $ return . Left ] where diff --git a/source/Network/Xmpp/Types.hs b/source/Network/Xmpp/Types.hs index ac73cb1..6e4f568 100644 --- a/source/Network/Xmpp/Types.hs +++ b/source/Network/Xmpp/Types.hs @@ -532,9 +532,7 @@ data StreamErrorInfo = StreamErrorInfo } deriving (Show, Eq) data XmppTlsError = XmppTlsError TLSError - | XmppTlsConnectionNotEstablished TLSException - | XmppTlsTerminated TLSException - | XmppTlsHandshakeFailed TLSException + | XmppTlsException TLSException deriving (Show, Eq, Typeable) -- | Signals an XMPP stream error or another unpredicted stream-related