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

Timestamp:

08/31/07 09:56:38 (15 months ago)

Author:

asterix

Message:

fix reconnect feature with zeroconf. fixes #3068 and #3076

Files:

• branches/gajim_0.11.1/src/common/zeroconf/connection_zeroconf.py (modified) (4 diffs)

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

@@ -65 +65 @@
                 self.call_resolve_timeout = False
                 
-                #self.time_to_reconnect = None
+                self.time_to_reconnect = None
                 #self.new_account_info = None
                 self.bookmarks = []
@@ -128 +128 @@
 
         def _reconnect(self):
+                # Do not try to reco while we are already trying
+                self.time_to_reconnect = None
                 gajim.log.debug('reconnect')
 
@@ -199 +201 @@
                 self.status = 'offline'
                 self.disconnect()
+
+        def _disconnectedReconnCB(self):
+                '''Called when we are disconnected. Comes from network manager for example
+                we don't try to reconnect, network manager will tell us when we can'''
+                log.debug('disconnectedReconnCB')
+                if gajim.account_is_connected(self.name):
+                        # we cannot change our status to offline or connecting
+                        # after we auth to server
+                        self.old_show = STATUS_LIST[self.connected]
+                self.connected = 0
+                self.dispatch('STATUS', 'offline')
+                # random number to show we wait network manager to send us a reconenct
+                self.time_to_reconnect = 5
+                self.on_purpose = False
 
         def _on_name_conflictCB(self, alt_name):
@@ -301 +317 @@
                 elif show == 'offline' and self.connected:
                         self.disconnect()
+                        self.time_to_reconnect = None
                         
                 # update status