X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fhandle.py;h=0db35fe033438e6580808cd8e065fe8aadb8cefb;hp=02e51378a8d60143fe34b828ffc6405ba4feda40;hb=a1bd487c1aec50d1f2c6379ff5a67f2da85d0be9;hpb=6ef9231c94a33ecc288d5927d0c8e22917be7f0f

diff --git a/src/handle.py b/src/handle.py
index 02e5137..0db35fe 100644
--- a/src/handle.py
+++ b/src/handle.py
@@ -4,10 +4,10 @@ import weakref
 import telepathy
 
 import tp
-import util.misc as util_misc
+import util.misc as misc_utils
 
 
-_moduleLogger = logging.getLogger("handle")
+_moduleLogger = logging.getLogger(__name__)
 
 
 class TheOneRingHandle(tp.Handle):
@@ -42,7 +42,7 @@ class ConnectionHandle(TheOneRingHandle):
 class ContactHandle(TheOneRingHandle):
 
 	def __init__(self, connection, id, phoneNumber):
-		self._phoneNumber = util_misc.normalize_number(phoneNumber)
+		self._phoneNumber = misc_utils.normalize_number(phoneNumber)
 
 		handleType = telepathy.HANDLE_TYPE_CONTACT
 		handleName = self._phoneNumber
@@ -52,14 +52,6 @@ class ContactHandle(TheOneRingHandle):
 	def phoneNumber(self):
 		return self._phoneNumber
 
-	@property
-	def contact_name(self):
-		return self._conn.session.addressbook.get_contact_name(self.phoneNumber)
-
-	@property
-	def contactDetails(self):
-		return self._conn.session.addressbook.get_phone_type(self.phoneNumber)
-
 
 class ListHandle(TheOneRingHandle):
 
@@ -80,7 +72,7 @@ def create_handle_factory():
 
 	cache = weakref.WeakValueDictionary()
 
-	def create_handle(connection, type, *args):
+	def _create_handle(connection, type, *args):
 		Handle = _HANDLE_TYPE_MAPPING[type]
 		key = Handle, connection.username, args
 		try:
@@ -92,11 +84,12 @@ def create_handle_factory():
 			cache[key] = handle
 			isNewHandle = True
 		connection._handles[handle.get_type(), handle.get_id()] = handle
-		handleStatus = "Is New!" if isNewHandle else "From Cache"
-		_moduleLogger.debug("Created Handle: %r (%s)" % (handle, handleStatus))
+		if isNewHandle:
+			handleStatus = "Is New!" if isNewHandle else "From Cache"
+			_moduleLogger.debug("Created Handle: %r (%s)" % (handle, handleStatus))
 		return handle
 
-	return create_handle
+	return _create_handle
 
 
 create_handle = create_handle_factory()