From 8dc589f5b03ba3b4a739dec223c439a0e5534271 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Wed, 01 Aug 2007 18:27:25 +0000
Subject: #2214: Gracefully handle blank server field

---
diff --git a/NEWS b/NEWS
index b9d4865..c201628 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+* #2214: Gracefully handle blank server field (dcbw)
+
 Snapshot fbc25c93ad
 
 Snapshot bc7fc5f02d
diff --git a/src/buddy.py b/src/buddy.py
index fcd3ba8..ade1267 100644
--- a/src/buddy.py
+++ b/src/buddy.py
@@ -630,7 +630,7 @@ class GenericOwner(Buddy):
         calls Buddy.__init__
         """
         self._ps = ps
-        self._server = kwargs.pop("server", "olpc.collabora.co.uk")
+        self._server = kwargs.pop("server", None)
         self._key_hash = kwargs.pop("key_hash", None)
         self._registered = kwargs.pop("registered", False)
 
diff --git a/src/presenceservice.py b/src/presenceservice.py
index ec16408..bc49488 100644
--- a/src/presenceservice.py
+++ b/src/presenceservice.py
@@ -108,8 +108,12 @@ class PresenceService(ExportedGObject):
         if 'disable-gabble' in debug_flags:
             self._server_plugin = None
         else:
-            self._server_plugin = ServerPlugin(self._registry, self._owner)
-            self._plugins.append(self._server_plugin)
+            server = self._owner.get_server()
+            if server and len(server):
+                self._server_plugin = ServerPlugin(self._registry, self._owner)
+                self._plugins.append(self._server_plugin)
+            else:
+                self._server_plugin = None
         if 'disable-salut' in debug_flags:
             self._ll_plugin = None
         else:
diff --git a/src/server_plugin.py b/src/server_plugin.py
index 75eadb2..a7571bb 100644
--- a/src/server_plugin.py
+++ b/src/server_plugin.py
@@ -146,7 +146,9 @@ class ServerPlugin(TelepathyPlugin):
         For the moment we assume that the test server, olpc.collabora.co.uk,
         does this verification.
         """
-        return (hostname == 'olpc.collabora.co.uk')
+        # FIXME: just trusting the owner's server for now
+        server = self._owner.get_server()
+        return (server and len(server) and hostname == server)
 
     def identify_contacts(self, tp_chan, handles, identifiers=None):
         """Work out the "best" unique identifier we can for the given handles,
--
cgit v0.9.1