diff options
| author | Guillaume Desmottes <cassidy@cass-wks.(none)> | 2007-11-14 11:52:46 (GMT) |
|---|---|---|
| committer | Guillaume Desmottes <cassidy@cass-wks.(none)> | 2007-11-14 11:52:46 (GMT) |
| commit | b6ac5c857886bf5d2a9dd992b9c78adde0425a92 (patch) | |
| tree | afb3882ddf88131153c266e5de3a2bd59034f657 | |
| parent | f3472aa064d612e03d70b640f13ed3b8eda74822 (diff) | |
Try to reconnect Gabble if initial attempt failed (#4907)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | src/telepathy_plugin.py | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -1,3 +1,5 @@ +* #4907: Try to reconnect Gabble if initial attempt failed (cassidy) + Snapshot 89c33bcf93 * #4660: Fix regression when sharing an activity (cassidy) diff --git a/src/telepathy_plugin.py b/src/telepathy_plugin.py index b0bbf46..1a10c29 100644 --- a/src/telepathy_plugin.py +++ b/src/telepathy_plugin.py @@ -216,6 +216,7 @@ class TelepathyPlugin(gobject.GObject): gobject.source_remove(self._backoff_id) self._backoff_id = gobject.timeout_add(self._RECONNECT_TIMEOUT, self._reconnect_cb) + self._conn = None self._conn[CONN_INTERFACE].Connect(reply_handler=connect_reply, error_handler=connect_error) @@ -242,7 +243,7 @@ class TelepathyPlugin(gobject.GObject): If the connection disappears, stop the plugin. """ - if not dbus_name: + if not dbus_name and self._conn is not None: _logger.warning( 'D-Bus name %s disappeared, this probably means %s crashed', self._conn.service_name, self._TP_CONN_MANAGER) |