diff options
author | Tomás Touceda <chiiph@leap.se> | 2013-07-25 15:44:54 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2013-07-25 15:44:54 -0300 |
commit | 3d4819112c609ea8103b66f636a946e0a26b33f6 (patch) | |
tree | d713905047712f382016e2a310779f142ac546ec | |
parent | c715e5fbd3f48f9a3555be659ccfe859f97c9d7c (diff) | |
parent | 139e699238515204c498c9ce9377289ed3a4b097 (diff) |
Merge remote-tracking branch 'drebs/bug/3261-fix-events-callback' into develop
-rw-r--r-- | src/leap/crypto/srpauth.py | 4 | ||||
-rw-r--r-- | src/leap/gui/mainwindow.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/leap/crypto/srpauth.py b/src/leap/crypto/srpauth.py index 53f6012d..fc0533fc 100644 --- a/src/leap/crypto/srpauth.py +++ b/src/leap/crypto/srpauth.py @@ -387,7 +387,7 @@ class SRPAuth(QtCore.QObject): events_signal( proto.CLIENT_UID, content=uid, - reqckb=lambda resp: None) # make the rpc call async + reqcbk=lambda req, res: None) # make the rpc call async return M2 @@ -428,7 +428,7 @@ class SRPAuth(QtCore.QObject): events_signal( proto.CLIENT_SESSION_ID, content=session_id, - reqckb=lambda resp: None) # make the rpc call async + reqcbk=lambda req, res: 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 1a82d600..1d0d3120 100644 --- a/src/leap/gui/mainwindow.py +++ b/src/leap/gui/mainwindow.py @@ -119,10 +119,10 @@ class MainWindow(QtGui.QMainWindow): # register leap events register(signal=proto.UPDATER_NEW_UPDATES, callback=self._new_updates_available, - reqcbk=lambda resp: None) # make rpc call async + reqcbk=lambda req, resp: None) # make rpc call async register(signal=proto.RAISE_WINDOW, callback=self._on_raise_window_event, - reqcbk=lambda resp: None) # make rpc call async + reqcbk=lambda req, resp: None) # make rpc call async self._quit_callback = quit_callback |