X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Faliasing.py;h=8476e9c04d8dadfef0ec233484e4e85adc174310;hp=22fa414d1828d3f2b821b900bb94d3db14254bcd;hb=f455941b014224a3b6dd83acd3123223b173324b;hpb=1c892d1b9bf14b28eb54ce3590ed2ee29d5e3d25

diff --git a/src/aliasing.py b/src/aliasing.py
index 22fa414..8476e9c 100644
--- a/src/aliasing.py
+++ b/src/aliasing.py
@@ -1,5 +1,6 @@
 import logging
 
+import dbus
 import telepathy
 
 import tp
@@ -7,10 +8,10 @@ import util.misc as misc_utils
 import handle
 
 
-_moduleLogger = logging.getLogger('aliasing')
+_moduleLogger = logging.getLogger(__name__)
 
 
-def _make_pretty_with_areacodde(phonenumber):
+def _make_pretty_with_areacode(phonenumber):
 	prettynumber = "(%s)" % (phonenumber[0:3], )
 	if 3 < len(phonenumber):
 		prettynumber += " %s" % (phonenumber[3:6], )
@@ -27,13 +28,14 @@ def _make_pretty_local(phonenumber):
 
 
 def _make_pretty_international(phonenumber):
+	prettynumber = phonenumber
 	if phonenumber.startswith("0"):
 		prettynumber = "+%s " % (phonenumber[0:3], )
 		if 3 < len(phonenumber):
-			prettynumber += _make_pretty_with_areacodde(phonenumber[3:])
-	if phonenumber.startswith("1"):
+			prettynumber += _make_pretty_with_areacode(phonenumber[3:])
+	elif phonenumber.startswith("1"):
 		prettynumber = "1 "
-		prettynumber += _make_pretty_with_areacodde(phonenumber[1:])
+		prettynumber += _make_pretty_with_areacode(phonenumber[1:])
 	return prettynumber
 
 
@@ -80,7 +82,7 @@ def make_pretty(phonenumber):
 	elif 8 < len(phonenumber) and phonenumber[0] in ("0", "1"):
 		prettynumber = _make_pretty_international(phonenumber)
 	elif 7 < len(phonenumber):
-		prettynumber = _make_pretty_with_areacodde(phonenumber)
+		prettynumber = _make_pretty_with_areacode(phonenumber)
 	elif 3 < len(phonenumber):
 		prettynumber = _make_pretty_local(phonenumber)
 	else:
@@ -126,9 +128,12 @@ class AliasingMixin(tp.ConnectionInterfaceAliasing):
 	def GetAliases(self, contactHandleIds):
 		_moduleLogger.debug("Called GetAliases")
 
-		idToAlias = dict(
-			(handleId, self._get_alias(handleId))
-			for handleId in contactHandleIds
+		idToAlias = dbus.Dictionary(
+			(
+				(handleId, self._get_alias(handleId))
+				for handleId in contactHandleIds
+			),
+			signature="us",
 		)
 		return idToAlias
 
@@ -136,6 +141,7 @@ class AliasingMixin(tp.ConnectionInterfaceAliasing):
 	def SetAliases(self, aliases):
 		_moduleLogger.debug("Called SetAliases")
 		# first validate that no other handle types are included
+		handleId, alias = None, None
 		for handleId, alias in aliases.iteritems():
 			h = self.get_handle_by_id(telepathy.HANDLE_TYPE_CONTACT, handleId)
 			if isinstance(h, handle.ConnectionHandle):