Providing focus to the lists for faster search

[gc-dialer] / src / session.py

diff --git a/src/session.py b/src/session.py
index 3f8a6c6..8dbdba0 100644 (file)
--- a/src/session.py
+++ b/src/session.py
@@ -222,7 +222,7 @@ class Session(QtCore.QObject):
                return self._draft
 
        def login(self, username, password):
-               assert self.state == self.LOGGEDOUT_STATE, "Can only log-in when logged out"
+               assert self.state == self.LOGGEDOUT_STATE, "Can only log-in when logged out (currently %s" % self.state
                assert username != "", "No username specified"
                if self._cachePath is not None:
                        cookiePath = os.path.join(self._cachePath, "%s.cookies" % username)
@@ -239,21 +239,21 @@ class Session(QtCore.QObject):
                le.start(username, password)
 
        def logout(self):
-               assert self.state != self.LOGGEDOUT_STATE, "Can only logout if logged in"
+               assert self.state != self.LOGGEDOUT_STATE, "Can only logout if logged in (currently %s" % self.state
                self._pool.stop()
                self._loggedInTime = self._LOGGEDOUT_TIME
                self._backend[0].persist()
                self._save_to_cache()
 
        def clear(self):
-               assert self.state == self.LOGGEDOUT_STATE, "Can only clear when logged out"
+               assert self.state == self.LOGGEDOUT_STATE, "Can only clear when logged out (currently %s" % self.state
                self._backend[0].logout()
                del self._backend[0]
                self._clear_cache()
                self._draft.clear()
 
        def logout_and_clear(self):
-               assert self.state != self.LOGGEDOUT_STATE, "Can only logout if logged in"
+               assert self.state != self.LOGGEDOUT_STATE, "Can only logout if logged in (currently %s" % self.state
                self._pool.stop()
                self._loggedInTime = self._LOGGEDOUT_TIME
                self.clear()
@@ -305,7 +305,7 @@ class Session(QtCore.QObject):
        def _set_dnd(self, dnd):
                # I'm paranoid about our state geting out of sync so we set no matter
                # what but act as if we have the cannonical state
-               assert self.state == self.LOGGEDIN_STATE, "DND requires being logged in"
+               assert self.state == self.LOGGEDIN_STATE, "DND requires being logged in (currently %s" % self.state
                oldDnd = self._dnd
                try:
                        with notify_busy(self._errorLog, "Setting DND Status"):
@@ -341,15 +341,14 @@ class Session(QtCore.QObject):
        def _set_callback_number(self, callback):
                # I'm paranoid about our state geting out of sync so we set no matter
                # what but act as if we have the cannonical state
-               assert self.state == self.LOGGEDIN_STATE, "Callbacks configurable only when logged in"
+               assert self.state == self.LOGGEDIN_STATE, "Callbacks configurable only when logged in (currently %s" % self.state
                oldCallback = self._callback
                try:
-                       with notify_busy(self._errorLog, "Setting Callback"):
-                               yield (
-                                       self._backend[0].set_callback_number,
-                                       (callback, ),
-                                       {},
-                               )
+                       yield (
+                               self._backend[0].set_callback_number,
+                               (callback, ),
+                               {},
+                       )
                except Exception, e:
                        self.error.emit(str(e))
                        return
@@ -362,9 +361,8 @@ class Session(QtCore.QObject):
                        self._loggedInTime = self._LOGGINGIN_TIME
                        self.stateChange.emit(self.LOGGINGIN_STATE)
                        finalState = self.LOGGEDOUT_STATE
+                       isLoggedIn = False
                        try:
-                               isLoggedIn = False
-
                                if not isLoggedIn and self._backend[0].is_quick_login_possible():
                                        isLoggedIn = yield (
                                                self._backend[0].is_authed,
@@ -395,11 +393,13 @@ class Session(QtCore.QObject):
                                        oldUsername = self._username
                                        self._username = username
                                        finalState = self.LOGGEDIN_STATE
-                                       self.loggedIn.emit()
                                        if oldUsername != self._username:
                                                needOps = not self._load()
                                        else:
                                                needOps = True
+
+                                       self.loggedIn.emit()
+
                                        if needOps:
                                                loginOps = self._loginOps[:]
                                        else:
@@ -407,10 +407,16 @@ class Session(QtCore.QObject):
                                        del self._loginOps[:]
                                        for asyncOp in loginOps:
                                                asyncOp.start()
+                               else:
+                                       self._loggedInTime = self._LOGGEDOUT_TIME
+                                       self.error.emit("Error logging in")
                        except Exception, e:
+                               self._loggedInTime = self._LOGGEDOUT_TIME
                                self.error.emit(str(e))
                        finally:
                                self.stateChange.emit(finalState)
+                       if isLoggedIn and self._callback:
+                               self.set_callback_number(self._callback)
 
        def _load(self):
                updateContacts = len(self._contacts) != 0