From 3c95f5563dd696e98643318bd1c75575ad872148 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 21 Jun 2007 15:02:22 +0000
Subject: Merge double definition of ServerPlugin._connected_cb, fixing the registration bug again

---
diff --git a/src/server_plugin.py b/src/server_plugin.py
index bfbd21e..c589877 100644
--- a/src/server_plugin.py
+++ b/src/server_plugin.py
@@ -128,13 +128,6 @@ class ServerPlugin(TelepathyPlugin):
     def _could_connect(self):
         return bool(self._ip4am.props.address)
 
-    def _connected_cb(self):
-        if self._account['register']:
-            # we successfully register this account
-            self._owner.set_registered(True)
-
-        TelepathyPlugin._connected_cb(self)
-
     def _server_is_trusted(self, hostname):
         """Return True if the server with the given hostname is trusted to
         verify public-key ownership correctly, and only allows users to
@@ -235,6 +228,10 @@ class ServerPlugin(TelepathyPlugin):
         return ret
 
     def _connected_cb(self):
+        if self._account['register']:
+            # we successfully register this account
+            self._owner.set_registered(True)
+
         TelepathyPlugin._connected_cb(self)
 
         publish_handles, local_pending, remote_pending = \
--
cgit v0.9.1