summaryrefslogtreecommitdiff
path: root/sunshine/connection.py
diff options
context:
space:
mode:
authorKrzysztof Klinikowski <kkszysiu@gmail.com>2010-01-16 23:38:48 +0100
committerKrzysztof Klinikowski <kkszysiu@gmail.com>2010-01-16 23:38:48 +0100
commit75f7a5af8f43a7ebf46fc61c0bc97ca6ec6c60d4 (patch)
tree1c1d5d69ec74da505dad661cf2c3fea58cec8b27 /sunshine/connection.py
parent4663395479875da09bbd3f91b4e5b1ca175a5391 (diff)
Better contacts handling after importing.
Diffstat (limited to 'sunshine/connection.py')
-rw-r--r--sunshine/connection.py22
1 files changed, 12 insertions, 10 deletions
diff --git a/sunshine/connection.py b/sunshine/connection.py
index 86bd0c4..caa988c 100644
--- a/sunshine/connection.py
+++ b/sunshine/connection.py
@@ -188,7 +188,7 @@ class SunshineConnection(telepathy.server.Connection,
self.profile.onLoginFailure = self.on_loginFailed
self.profile.onContactStatusChange = self.on_updateContact
self.profile.onMessageReceived = self.on_messageReceived
- self.profile.onStatusNoticiesRecv = self.on_StatusNoticiesRecv
+ #self.profile.onStatusNoticiesRecv = self.on_StatusNoticiesRecv
#lets try to make file with contacts etc ^^
self.configfile = SunshineConfig(int(parameters['account']))
@@ -462,7 +462,6 @@ class SunshineConnection(telepathy.server.Connection,
logger.info("Failed to get page with server IP adress.")
self.getServerAdress(uin)
- @async
def on_contactsImported(self):
logger.info("No contacts in the XML contacts file yet. Contacts imported.")
@@ -472,11 +471,15 @@ class SunshineConnection(telepathy.server.Connection,
self.makeTelepathyContactsChannel()
self.makeTelepathyGroupChannels()
+ for contact in self.profile.contacts:
+ handle_id = self.get_handle_id_by_name('contact', str(contact.uin))
+ if handle_id != 0:
+ self.get_contact_alias(handle_id)
+
self._status = telepathy.CONNECTION_STATUS_CONNECTED
self.StatusChanged(telepathy.CONNECTION_STATUS_CONNECTED,
telepathy.CONNECTION_STATUS_REASON_REQUESTED)
- @async
def on_loginSuccess(self):
logger.info("Connected")
@@ -489,15 +492,14 @@ class SunshineConnection(telepathy.server.Connection,
self.makeTelepathyContactsChannel()
self.makeTelepathyGroupChannels()
+
+ self._status = telepathy.CONNECTION_STATUS_CONNECTED
+ self.StatusChanged(telepathy.CONNECTION_STATUS_CONNECTED,
+ telepathy.CONNECTION_STATUS_REASON_REQUESTED)
- self._status = telepathy.CONNECTION_STATUS_CONNECTED
- self.StatusChanged(telepathy.CONNECTION_STATUS_CONNECTED,
- telepathy.CONNECTION_STATUS_REASON_REQUESTED)
-
- def on_StatusNoticiesRecv(self):
- logger.info("Status noticies received.")
+ #def on_StatusNoticiesRecv(self):
+ # logger.info("Status noticies received.")
- @async
def on_loginFailed(self):
logger.info("Method on_loginFailed called.")
self._status = telepathy.CONNECTION_STATUS_DISCONNECTED