Revert "Rework reconnection logic so RECONNECT_TIME is interpreted as a minimum, to avoid eating CPU if Avahi or NM becomes unstable (or if dbus-python has the buggy pre-0.82 watch_name_owner() implementation)."

It stops PS connecting.

This reverts commit c9c66a6b53699090f6b863cfa249395ffca653d6.

1 files changed, 5 insertions, 9 deletions

diff --git a/src/linklocal_plugin.py b/src/linklocal_plugin.py
index 10924e1..b60eb15 100644
--- a/src/linklocal_plugin.py
+++ b/src/linklocal_plugin.py
@@ -68,19 +68,15 @@ class LinkLocalPlugin(TelepathyPlugin):
         if unique_name:
             self._have_avahi = True
             if not had_avahi:
-                if self._backoff_id > 0:
-                    _logger.info('Avahi appeared on the system bus (%s) - '
-                                 'will start when retry time is reached')
-                else:
-                    _logger.info('Avahi appeared on the system bus (%s) - '
-                                 'starting...', unique_name)
-                    self.start()
+                _logger.info('Avahi appeared on the system bus (%s) - '
+                             'starting...', unique_name)
+                self.start()
         else:
             self._have_avahi = False
             if had_avahi:
                 _logger.info('Avahi disappeared from the system bus - '
                              'stopping...')
-                self._stop()
+                self.stop()
 
     def cleanup(self):
         TelepathyPlugin.cleanup(self)
@@ -89,7 +85,7 @@ class LinkLocalPlugin(TelepathyPlugin):
         self._watch = None
 
     def _could_connect(self):
-        return TelepathyPlugin._could_connect(self) and self._have_avahi
+        return self._have_avahi
 
     def _get_account_info(self):
         """Retrieve connection manager parameters for this account