[Telepathy-commits] [telepathy-python/master] Don't allow queueing for the CM bus name and throw dbus.exceptions.NameExistsException.

[Jonny Lamb]

Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 src/server/connmgr.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/server/connmgr.py b/src/server/connmgr.py
index c8fb5ed..65b950f 100644
--- a/src/server/connmgr.py
+++ b/src/server/connmgr.py
@@ -34,15 +34,15 @@ class ConnectionManager(_ConnectionManager):
         bus_name = 'org.freedesktop.Telepathy.ConnectionManager.%s' % name
         object_path = '/org/freedesktop/Telepathy/ConnectionManager/%s' % name
         _ConnectionManager.__init__(self,
-                                    dbus.service.BusName(bus_name, dbus.Bus()),
+                                    dbus.service.BusName(bus_name, dbus.Bus(), do_not_queue=True),
                                     object_path)
 
         self._connections = set()
         self._protos = {}
 
     def __del__(self):
-        print str(self._object_path), "deleted"
-        dbus.service.Object.__del__(self)
+        if hasattr(self, '_object_path'):
+            print str(self._object_path), "deleted"
 
     def connected(self, conn):
         """
-- 
1.5.6.5