X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Faliasing.py;h=96c4dc310f3e807b2d15ea7690cff3aad122acfc;hb=7e81315ee610f630a3d17d07ab3bee9c50497bce;hp=2ac7d9876abcc449cd2a5057c7e5a86aeab6cd55;hpb=df3ad0bda8f2b08389254d76e189cc845e4c768e;p=theonering

diff --git a/src/aliasing.py b/src/aliasing.py
index 2ac7d98..96c4dc3 100644
--- a/src/aliasing.py
+++ b/src/aliasing.py
@@ -108,7 +108,7 @@ class AliasingMixin(tp.ConnectionInterfaceAliasing):
 		"""
 		raise NotImplementedError("Abstract property called")
 
-	def handle(self, handleType, handleId):
+	def get_handle_by_id(self, handleType, handleId):
 		"""
 		@abstract
 		"""
@@ -167,8 +167,8 @@ class AliasingMixin(tp.ConnectionInterfaceAliasing):
 			return userAlias
 		else:
 			number = h.phoneNumber
-			if number:
+			try:
 				contactAlias = self.session.addressbook.get_contact_name(number)
-			else:
+			except KeyError:
 				contactAlias = make_pretty(number)
 			return contactAlias