Changeset 14:312a60e100c4 for wokkel/client.py

Timestamp:

Feb 29, 2008, 4:27:36 PM (14 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Convert:

svn:b33ecbfc-034c-dc11-8662-000475d9059e/trunk@42

Message:

Make sure the deferred is fired by the stream manager, so that the latter
can do its initializations, first.

File:

• wokkel/client.py (modified) (2 diffs)

wokkel/client.py

@@ -21 +21 @@
     from wokkel.compat import XmlStreamFactoryMixin
 
-
-from wokkel.subprotocols import StreamManager
+from wokkel.subprotocols import StreamManager, XMPPHandler
 
 class CheckAuthInitializer(object):
@@ -136 +135 @@
         XmlStreamFactoryMixin.__init__(self, self.authenticator)
 
-        self.deferred = defer.Deferred()
+        deferred = defer.Deferred()
+        self.deferred = deferred
 
-        self.addBootstrap(xmlstream.STREAM_AUTHD_EVENT, self.deferred.callback)
-        self.addBootstrap(xmlstream.INIT_FAILED_EVENT, self.deferred.errback)
+        self.addBootstrap(xmlstream.INIT_FAILED_EVENT, deferred.errback)
+
+        class ConnectionInitializedHandler(XMPPHandler):
+            def connectionInitialized(self):
+                deferred.callback(None)
 
         self.streamManager = StreamManager(self)
+        self.addHandler(ConnectionInitializedHandler())
 
     def clientConnectionFailed(self, connector, reason):