From 08c75294c6bebe2a1b8e5466bc2d2bde5fcb3059 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed, 13 Feb 2008 15:58:31 +0000
Subject: disconnect the Salut plugin if it's connected while Gabble is already running

---
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)
--
cgit v0.9.1