projects
/
theonering
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7185ab0
)
Adding support for aliases for non-contacts and cleaned up the exceptions
author
Ed Page
<eopage@byu.net>
Thu, 26 Nov 2009 04:17:53 +0000
(22:17 -0600)
committer
Ed Page
<eopage@byu.net>
Thu, 26 Nov 2009 04:17:53 +0000
(22:17 -0600)
src/aliasing.py
patch
|
blob
|
history
diff --git
a/src/aliasing.py
b/src/aliasing.py
index
4d6c3a3
..
9d76629
100644
(file)
--- 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):
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")
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:
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
return contactAlias