From 50112bac81685f6a2ddff936d429f7e1745e5816 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Wed, 25 Nov 2009 22:18:47 -0600 Subject: [PATCH] Added presence support and cleaned up the exceptions --- src/connection.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/connection.py b/src/connection.py index eb2abc6..9071996 100644 --- a/src/connection.py +++ b/src/connection.py @@ -8,6 +8,7 @@ import gtk_toolbox import gvoice import handle import aliasing +import simple_presence import channel_manager @@ -16,7 +17,8 @@ _moduleLogger = logging.getLogger("connection") class TheOneRingConnection( telepathy.server.Connection, - aliasing.AliasingMixin + aliasing.AliasingMixin, + simple_presence.SimplePresenceMixin, ): # Overriding a base class variable @@ -44,6 +46,7 @@ class TheOneRingConnection( constants._telepathy_implementation_name_ ) aliasing.AliasingMixin.__init__(self) + simple_presence.SimplePresenceMixin.__init__(self) self._manager = weakref.proxy(manager) self._credentials = ( @@ -155,7 +158,7 @@ class TheOneRingConnection( _moduleLogger.info("RequestChannel Media") channel = channelManager.channel_for_call(handle, suppressHandler) else: - raise telepathy.NotImplemented("unknown channel type %s" % type) + raise telepathy.errors.NotImplemented("unknown channel type %s" % type) _moduleLogger.info("RequestChannel Object Path: %s" % channel._object_path) return channel._object_path @@ -180,7 +183,7 @@ class TheOneRingConnection( _moduleLogger.info("RequestHandles List: %s" % name) h = handle.create_handle(self, 'list', name) else: - raise telepathy.NotAvailable('Handle type unsupported %d' % handleType) + raise telepathy.errors.NotAvailable('Handle type unsupported %d' % handleType) handles.append(h.id) self.add_client_handle(h, sender) return handles -- 1.7.9.5