Changeset 8649 for branches/gajim_0.11.1/src/common

Timestamp:

08/31/07 09:53:01 (15 months ago)

Author:

asterix

Message:

fix the to attribute of stream initiation in zeroconf network. see #3057

Files:

• branches/gajim_0.11.1/src/common/zeroconf/client_zeroconf.py (modified) (2 diffs)

branches/gajim_0.11.1/src/common/zeroconf/client_zeroconf.py

@@ -180 +180 @@
                 self.Dispatcher._metastream.setNamespace(self.Namespace)
                 # XXX TLS support
-                #~ self._metastream.setAttr('version', '1.0')
+                self.Dispatcher._metastream.setAttr('version', '1.0')
                 self.Dispatcher._metastream.setAttr('xmlns:stream', NS_STREAMS)
                 self.Dispatcher._metastream.setAttr('from', self.conn_holder.zeroconf.name)
-                self.Dispatcher._metastream.setAttr('to', self.to)
+                if self.to:
+                        self.Dispatcher._metastream.setAttr('to', self.to)
                 self.Dispatcher.send("<?xml version='1.0'?>%s>" % str(self.Dispatcher._metastream)[:-2])
         
@@ -194 +195 @@
                         return
                 if self.sock_type == TYPE_SERVER:
+                        if attrs.has_key('from'):
+                                self.to = attrs['from']
                         self.send_stream_header()
                         while self.stanzaqueue: