asakul
/
pontarius-xmpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

rename Network.Xmpp.Monad to Network.Xmpp.Connection

master
Philipp Balzarek 13 years ago
parent
1e42a760de
commit
fff335db2d
18 changed files with 60 additions and 60 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      pontarius-xmpp.cabal
  2. 28
      source/Network/Xmpp.hs
  3. 4
      source/Network/Xmpp/Basic.hs
  4. 4
      source/Network/Xmpp/Bind.hs
  5. 2
      source/Network/Xmpp/Concurrent/Monad.hs
  6. 20
      source/Network/Xmpp/Concurrent/Threads.hs
  7. 2
      source/Network/Xmpp/Connection.hs
  8. 8
      source/Network/Xmpp/Sasl.hs
  9. 4
      source/Network/Xmpp/Sasl/Common.hs
  10. 2
      source/Network/Xmpp/Sasl/Mechanisms/DigestMd5.hs
  11. 14
      source/Network/Xmpp/Sasl/Mechanisms/Plain.hs
  12. 6
      source/Network/Xmpp/Session.hs
  13. 4
      source/Network/Xmpp/Stream.hs
  14. 2
      source/Network/Xmpp/TLS.hs
  15. 2
      source/Network/Xmpp/Xep/InbandRegistration.hs
  16. 8
      source/Network/Xmpp/Xep/ServiceDiscovery.hs

2
pontarius-xmpp.cabal
Unescape View File

@ -61,7 +61,7 @@ Library @@ -61,7 +61,7 @@ Library
, Network.Xmpp.IM.Message
, Network.Xmpp.IM.Presence
, Network.Xmpp.Marshal
, Network.Xmpp.Monad
, Network.Xmpp.Connection
, Network.Xmpp.Message
, Network.Xmpp.Pickle
, Network.Xmpp.Presence

28
source/Network/Xmpp.hs
Unescape View File

@ -149,22 +149,22 @@ module Network.Xmpp @@ -149,22 +149,22 @@ module Network.Xmpp
, exampleParams
) where
import Data.XML.Types (Element)
import Data.XML.Types (Element)
import Network.Xmpp.Bind
import Network.Xmpp.Concurrent
import Network.Xmpp.Concurrent.Channels
import Network.Xmpp.Concurrent.Types
import Network.Xmpp.Marshal
import Network.Xmpp.Message
import Network.Xmpp.Monad
import Network.Xmpp.Presence
import Network.Xmpp.Sasl
import Network.Xmpp.Session
import Network.Xmpp.Bind
import Network.Xmpp.Concurrent
import Network.Xmpp.Concurrent.Channels
import Network.Xmpp.Concurrent.Types
import Network.Xmpp.Connection
import Network.Xmpp.Marshal
import Network.Xmpp.Message
import Network.Xmpp.Presence
import Network.Xmpp.Sasl
import Network.Xmpp.Session
-- import Network.Xmpp.Session
import Network.Xmpp.Stream
import Network.Xmpp.TLS
import Network.Xmpp.Types
import Network.Xmpp.Stream
import Network.Xmpp.TLS
import Network.Xmpp.Types
-- -- Sends the session IQ set element and waits for an answer. Throws an error if

4
source/Network/Xmpp/Basic.hs
Unescape View File

@ -16,9 +16,9 @@ module Network.Xmpp.Basic @@ -16,9 +16,9 @@ module Network.Xmpp.Basic
where
import Network.Xmpp.Monad
import Network.Xmpp.Connection
import Network.Xmpp.Sasl
import Network.Xmpp.Session
import Network.Xmpp.Stream
import Network.Xmpp.TLS
import Network.Xmpp.Types
import Network.Xmpp.Session

4
source/Network/Xmpp/Bind.hs
Unescape View File

@ -11,9 +11,9 @@ import Data.Text as Text @@ -11,9 +11,9 @@ import Data.Text as Text
import Data.XML.Pickle
import Data.XML.Types
import Network.Xmpp.Types
import Network.Xmpp.Connection
import Network.Xmpp.Pickle
import Network.Xmpp.Monad
import Network.Xmpp.Types
import Control.Monad.State(modify)

2
source/Network/Xmpp/Concurrent/Monad.hs
Unescape View File

@ -18,7 +18,7 @@ import qualified Data.Map as Map @@ -18,7 +18,7 @@ import qualified Data.Map as Map
import Data.Text(Text)
import Network.Xmpp.Concurrent.Types
import Network.Xmpp.Monad
import Network.Xmpp.Connection

20
source/Network/Xmpp/Concurrent/Threads.hs
Unescape View File

@ -4,21 +4,21 @@ @@ -4,21 +4,21 @@
module Network.Xmpp.Concurrent.Threads where
import Network.Xmpp.Types
import Network.Xmpp.Types
import Control.Applicative((<$>))
import Control.Concurrent
import Control.Concurrent.STM
import Control.Applicative((<$>))
import Control.Concurrent
import Control.Concurrent.STM
import qualified Control.Exception.Lifted as Ex
import Control.Monad
import Control.Monad.IO.Class
import Control.Monad.State.Strict
import Control.Monad
import Control.Monad.IO.Class
import Control.Monad.State.Strict
import qualified Data.ByteString as BS
import Network.Xmpp.Monad
import Network.Xmpp.Concurrent.Types
import Network.Xmpp.Concurrent.Types
import Network.Xmpp.Connection
import GHC.IO (unsafeUnmask)
import GHC.IO (unsafeUnmask)
-- Worker to read stanzas from the stream and concurrently distribute them to
-- all listener threads.

2
source/Network/Xmpp/Monad.hs → source/Network/Xmpp/Connection.hs
Unescape View File

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE OverloadedStrings #-}
module Network.Xmpp.Monad where
module Network.Xmpp.Connection where
import Control.Applicative((<$>))
import Control.Concurrent (forkIO, threadDelay)

8
source/Network/Xmpp/Sasl.hs
Unescape View File

@ -29,15 +29,15 @@ import qualified Data.Text as Text @@ -29,15 +29,15 @@ import qualified Data.Text as Text
import Data.Text (Text)
import qualified Data.Text.Encoding as Text
import Network.Xmpp.Monad
import Network.Xmpp.Connection
import Network.Xmpp.Pickle
import Network.Xmpp.Stream
import Network.Xmpp.Types
import Network.Xmpp.Pickle
import qualified System.Random as Random
import Network.Xmpp.Sasl.Types
import Network.Xmpp.Sasl.Mechanisms
import Network.Xmpp.Sasl.Types
import Network.Xmpp.Sasl.Mechanisms
-- | Uses the first supported mechanism to authenticate, if any. Updates the
-- state with non-password credentials and restarts the stream upon

4
source/Network/Xmpp/Sasl/Common.hs
Unescape View File

@ -22,10 +22,10 @@ import Data.Word (Word8) @@ -22,10 +22,10 @@ import Data.Word (Word8)
import Data.XML.Pickle
import Data.XML.Types
import Network.Xmpp.Monad
import Network.Xmpp.Connection
import Network.Xmpp.Pickle
import Network.Xmpp.Sasl.Types
import Network.Xmpp.Sasl.StringPrep
import Network.Xmpp.Sasl.Types
import qualified System.Random as Random

2
source/Network/Xmpp/Sasl/Mechanisms/DigestMd5.hs
Unescape View File

@ -31,7 +31,7 @@ import qualified Data.ByteString as BS @@ -31,7 +31,7 @@ import qualified Data.ByteString as BS
import Data.XML.Types
import Network.Xmpp.Monad
import Network.Xmpp.Connection
import Network.Xmpp.Pickle
import Network.Xmpp.Stream
import Network.Xmpp.Types

14
source/Network/Xmpp/Sasl/Mechanisms/Plain.hs
Unescape View File

@ -29,24 +29,24 @@ import qualified Data.Text as Text @@ -29,24 +29,24 @@ import qualified Data.Text as Text
import Data.Text (Text)
import qualified Data.Text.Encoding as Text
import Data.XML.Pickle
import Data.XML.Pickle
import qualified Data.ByteString as BS
import Data.XML.Types
import Data.XML.Types
import Network.Xmpp.Monad
import Network.Xmpp.Connection
import Network.Xmpp.Pickle
import Network.Xmpp.Stream
import Network.Xmpp.Types
import Network.Xmpp.Pickle
import qualified System.Random as Random
import Data.Maybe (fromMaybe)
import Data.Maybe (fromMaybe)
import qualified Data.Text as Text
import Network.Xmpp.Sasl.Common
import Network.Xmpp.Sasl.Types
import Network.Xmpp.Sasl.Common
import Network.Xmpp.Sasl.Types
-- TODO: stringprep
xmppPlain :: Text.Text -- ^ Password

6
source/Network/Xmpp/Session.hs
Unescape View File

@ -6,19 +6,19 @@ import Control.Monad.Error @@ -6,19 +6,19 @@ import Control.Monad.Error
import Data.Text as Text
import Data.XML.Pickle
import Data.XML.Types(Element)
import Network
import qualified Network.TLS as TLS
import Network.Xmpp.Bind
import Network.Xmpp.Concurrent.Types
import Network.Xmpp.Connection
import Network.Xmpp.Marshal
import Network.Xmpp.Monad
import Network.Xmpp.Pickle
import Network.Xmpp.Sasl
import Network.Xmpp.Sasl.Mechanisms
import Network.Xmpp.Sasl.Types
import Network.Xmpp.Stream
import Network.Xmpp.Types
import Network
import Network.Xmpp.TLS
import Network.Xmpp.Types
-- | The quick and easy way to set up a connection to an XMPP server
--

4
source/Network/Xmpp/Stream.hs
Unescape View File

@ -19,10 +19,10 @@ import Data.Void (Void) @@ -19,10 +19,10 @@ import Data.Void (Void)
import Data.XML.Pickle
import Data.XML.Types
import Network.Xmpp.Monad
import Network.Xmpp.Connection
import Network.Xmpp.Errors
import Network.Xmpp.Pickle
import Network.Xmpp.Types
import Network.Xmpp.Errors
import Text.XML.Stream.Elements
import Text.XML.Stream.Parse as XP

2
source/Network/Xmpp/TLS.hs
Unescape View File

@ -17,7 +17,7 @@ import Data.Conduit.TLS as TLS @@ -17,7 +17,7 @@ import Data.Conduit.TLS as TLS
import Data.Typeable
import Data.XML.Types
import Network.Xmpp.Monad
import Network.Xmpp.Connection
import Network.Xmpp.Pickle(ppElement)
import Network.Xmpp.Stream
import Network.Xmpp.Types

2
source/Network/Xmpp/Xep/InbandRegistration.hs
Unescape View File

@ -19,7 +19,7 @@ import qualified Data.Text as Text @@ -19,7 +19,7 @@ import qualified Data.Text as Text
import Data.XML.Pickle
import qualified Data.XML.Types as XML
import Network.Xmpp.Monad
import Network.Xmpp.Connection
import Network.Xmpp.Pickle
import Network.Xmpp.Types
import Network.Xmpp.Xep.ServiceDiscovery

8
source/Network/Xmpp/Xep/ServiceDiscovery.hs
Unescape View File

@ -25,12 +25,12 @@ import Data.XML.Pickle @@ -25,12 +25,12 @@ import Data.XML.Pickle
import Data.XML.Types
import Network.Xmpp
import Network.Xmpp.Monad
import Network.Xmpp.Pickle
import Network.Xmpp.Types
import Network.Xmpp.Concurrent
import Network.Xmpp.Concurrent.Types
import Network.Xmpp.Concurrent.Channels
import Network.Xmpp.Concurrent.Types
import Network.Xmpp.Connection
import Network.Xmpp.Pickle
import Network.Xmpp.Types
data DiscoError = DiscoNoQueryElement
| DiscoIQError IQError

Write Preview
Loading…
Cancel
Save