X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fconnection.py;h=80518cc43777ee280f35575baf9e088094711525;hp=c2093702fe51e58edfee330fb400dfb466f3d4cd;hb=8559724ac27bfbfd4711ef952a0f6de038017c2c;hpb=548c58651ec7849619b9d823fdeee169be6c87b5

diff --git a/src/connection.py b/src/connection.py
index c209370..80518cc 100644
--- a/src/connection.py
+++ b/src/connection.py
@@ -238,7 +238,7 @@ class TheOneRingConnection(
 		For org.freedesktop.telepathy.Connection
 		"""
 		_moduleLogger.info("Kicking off disconnect")
-		self._delayed_disconnect()
+		self.disconnect(telepathy.CONNECTION_STATUS_REASON_REQUESTED)
 
 	@misc_utils.log_exception(_moduleLogger)
 	def RequestChannel(self, type, handleType, handleId, suppressHandler):
@@ -277,11 +277,6 @@ class TheOneRingConnection(
 
 		return props
 
-	@gobject_utils.async
-	def _delayed_disconnect(self):
-		self.disconnect(telepathy.CONNECTION_STATUS_REASON_REQUESTED)
-		return False
-
 	def disconnect(self, reason):
 		_moduleLogger.info("Disconnecting")
 
@@ -298,9 +293,10 @@ class TheOneRingConnection(
 			plumber.stop()
 
 		self.__channelManager.close()
+		self.manager.disconnected(self)
+
 		self.session.save(self.__cachePath)
 		self.session.logout()
 		self.session.close()
 
-		self.manager.disconnected(self)
 		_moduleLogger.info("Disconnected")