1.0.8-6 Fixing a bug preventing christexaport from logging in

[gc-dialer] / src / dc_glade.py

diff --git a/src/dc_glade.py b/src/dc_glade.py
index 22d7eee..9cc9899 100755 (executable)
--- a/src/dc_glade.py
+++ b/src/dc_glade.py
@@ -416,12 +416,11 @@ class Dialcentral(object):
                @note Thread agnostic
                """
                loggedIn = False
-               if self._credentials == ("", ""):
-                       # Disallow logging in by cookie alone, without credentials
-                       loggedIn = False
 
-               if not loggedIn:
-                       loggedIn = self._phoneBackends[self._defaultBackendId].is_authed()
+               isQuickLoginPossible = self._phoneBackends[self._defaultBackendId].is_quick_login_possible()
+               if self._credentials != ("", "") and isQuickLoginPossible:
+                       if not loggedIn:
+                               loggedIn = self._phoneBackends[self._defaultBackendId].is_authed()
 
                if loggedIn:
                        _moduleLogger.info("Logged into %r through cookies" % self._phoneBackends[self._defaultBackendId])