From bcc6da4ac69a312ce5fd2308b2ea3d0b65e9129d Mon Sep 17 00:00:00 2001
From: Morgan Collett <morgan.collett@gmail.com>
Date: Wed, 31 Oct 2007 19:14:22 +0000
Subject: #2412: Handle the connection manager disconnecting and closing the connection other than PS closing it

---
diff --git a/src/buddy.py b/src/buddy.py
index 1f7a0ca..f533b22 100644
--- a/src/buddy.py
+++ b/src/buddy.py
@@ -342,8 +342,11 @@ class Buddy(ExportedGObject):
             if act.room_details[0] == tp_client:
                 act.buddy_apparently_left(self)
 
-        self.TelepathyHandleRemoved(conn.service_name, conn.object_path,
-                                    handle)
+        # if the Connection Manager disconnected other than
+        # PS stopping it, then we don't have a connection.
+        if conn:
+            self.TelepathyHandleRemoved(conn.service_name,
+                                        conn.object_path, handle)
         # the Owner can't disappear - that would be silly
         if not self._handles and not self._owner:
             self.emit('disappeared')
--
cgit v0.9.1