From 4e86d1bd29890cfb7bc02f5bcf434e175d810d1a Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Thu, 25 Jul 2013 13:28:53 -0300
Subject: Make calls to leap.common.events asynchronous.
---
src/leap/crypto/srpauth.py | 8 ++++++--
src/leap/gui/mainwindow.py | 9 ++++-----
2 files changed, 10 insertions(+), 7 deletions(-)
(limited to 'src')
diff --git a/src/leap/crypto/srpauth.py b/src/leap/crypto/srpauth.py
index 6474bdbb..53f6012d 100644
--- a/src/leap/crypto/srpauth.py
+++ b/src/leap/crypto/srpauth.py
@@ -385,7 +385,9 @@ class SRPAuth(QtCore.QObject):
raise SRPAuthBadDataFromServer(self.tr("Problem getting data "
"from server"))
- events_signal(proto.CLIENT_UID, content=uid)
+ events_signal(
+ proto.CLIENT_UID, content=uid,
+ reqckb=lambda resp: None) # make the rpc call async
return M2
@@ -424,7 +426,9 @@ class SRPAuth(QtCore.QObject):
"verification "
"failed"))
- events_signal(proto.CLIENT_SESSION_ID, content=session_id)
+ events_signal(
+ proto.CLIENT_SESSION_ID, content=session_id,
+ reqckb=lambda resp: None) # make the rpc call async
self.set_session_id(session_id)
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index baa5f385..1a82d600 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -117,13 +117,12 @@ class MainWindow(QtGui.QMainWindow):
QtGui.QMainWindow.__init__(self)
# register leap events
-
- # XXX ------- this is blocking -----------
register(signal=proto.UPDATER_NEW_UPDATES,
- callback=self._new_updates_available)
+ callback=self._new_updates_available,
+ reqcbk=lambda resp: None) # make rpc call async
register(signal=proto.RAISE_WINDOW,
- callback=self._on_raise_window_event)
- # XXX ------- this is blocking -----------
+ callback=self._on_raise_window_event,
+ reqcbk=lambda resp: None) # make rpc call async
self._quit_callback = quit_callback
--
cgit v1.2.3