diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2008-02-13 15:58:31 (GMT) |
|---|---|---|
| committer | Morgan Collett <morgan.collett@gmail.com> | 2008-02-15 12:06:27 (GMT) |
| commit | 08c75294c6bebe2a1b8e5466bc2d2bde5fcb3059 (patch) | |
| tree | e82815bc00cf65c0a15118592b034ab97b9fa550 | |
| parent | 8b67ad6cf441aed167d9edd41f80c2d66bc247e5 (diff) | |
disconnect the Salut plugin if it's connected while Gabble is already running
| -rw-r--r-- | src/presenceservice.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/presenceservice.py b/src/presenceservice.py index fa38efd..02a5ba4 100644 --- a/src/presenceservice.py +++ b/src/presenceservice.py @@ -148,9 +148,12 @@ class PresenceService(ExportedGObject): def _tp_status_cb(self, plugin, status, reason): if status == CONNECTION_STATUS_CONNECTED: self._tp_connected(plugin) - if plugin == self._server_plugin and self._ll_plugin: + if (plugin == self._server_plugin and self._ll_plugin) or \ + (plugin == self._ll_plugin and self._server_plugin and \ + self._server_plugin.status == CONNECTION_STATUS_CONNECTED): # For now, Gabble takes precedence over Salut to alleviate # corner cases where laptops on mesh can't talk to ones on APs + _logger.debug("Gabble takes precedence, disconnect Salut") self._ll_plugin.cleanup() else: self._tp_disconnected(plugin) |