Async connect/disconnect. Moved everything to a new Async and Timeout which cleans...

[theonering] / src / handle.py

diff --git a/src/handle.py b/src/handle.py
index 02e5137..9baf35b 100644 (file)
--- a/src/handle.py
+++ b/src/handle.py
@@ -4,7 +4,7 @@ import weakref
 import telepathy
 
 import tp
-import util.misc as util_misc
+import util.misc as misc_utils
 
 
 _moduleLogger = logging.getLogger("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):