From a155f411693fab94319c44c8419e21a7edbe4fd6 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Wed, 25 Nov 2009 22:17:53 -0600 Subject: [PATCH 1/1] Adding support for aliases for non-contacts and cleaned up the exceptions --- src/aliasing.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/aliasing.py b/src/aliasing.py index 4d6c3a3..9d76629 100644 --- a/src/aliasing.py +++ b/src/aliasing.py @@ -106,7 +106,7 @@ class AliasingMixin(telepathy.server.ConnectionInterfaceAliasing): for handleId, alias in aliases.iteritems(): h = self.handle(telepathy.HANDLE_TYPE_CONTACT, handleId) if not isinstance(h, handle.ConnectionHandle): - raise telepathy.PermissionDenied("No user customizable aliases") + raise telepathy.errors.PermissionDenied("No user customizable aliases") userHandleAndAlias = h, alias if userHandleAndAlias is None: _moduleLogger.debug("No user handle") @@ -127,5 +127,9 @@ class AliasingMixin(telepathy.server.ConnectionInterfaceAliasing): userAlias = make_pretty(callbackNumber) return userAlias else: - contactAlias = self.session.addressbook.get_contact_name(h.contactID) + contactId = h.contactID + if contactId: + contactAlias = self.session.addressbook.get_contact_name(contactId) + else: + contactAlias = make_pretty(h.phoneNumber) return contactAlias -- 1.7.9.5