Merge pull request #3 from nemomobile-packages/vdv-devel

[qmf] Don't try to destruct/cancel SSO session for accounts saved outside SSO
sailfishos · Jul 18, 2013 · 2279337 · 2279337
2 parents c83060d + a1712e6
commit 2279337
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/qmf/src/plugins/messageservices/imap/imapclient.cpp b/qmf/src/plugins/messageservices/imap/imapclient.cpp
@@ -1677,6 +1677,7 @@ void ImapClient::setAccount(const QMailAccountId &id)
              qMailLog(IMAP) << Q_FUNC_INFO << "SSO identity is found for account id: "<< id;
          } else {
              delete _ssoSessionManager;
+             _ssoSessionManager = 0;
              qMailLog(IMAP) << Q_FUNC_INFO << "SSO identity is not found for account id: "<< id
                             << ", accounts configuration will be used";
          }
@@ -1987,6 +1988,7 @@ void ImapClient::removeSsoIdentity(const QMailAccountId &accountId)
         if (_ssoSessionManager) {
             _ssoSessionManager->removeSsoIdentity();
             delete _ssoSessionManager;
+            _ssoSessionManager = 0;
         }
     }
 }

diff --git a/qmf/src/plugins/messageservices/pop/popclient.cpp b/qmf/src/plugins/messageservices/pop/popclient.cpp
@@ -259,6 +259,7 @@ void PopClient::setAccount(const QMailAccountId &id)
             qMailLog(POP) << Q_FUNC_INFO << "SSO identity is found for account id: "<< id;
         } else {
             delete ssoSessionManager;
+            ssoSessionManager = 0;
             qMailLog(POP) << Q_FUNC_INFO << "SSO identity is not found for account id: "<< id
                           << ", accounts configuration will be used";
         }
@@ -1367,6 +1368,7 @@ void PopClient::removeSsoIdentity(const QMailAccountId &accountId)
         if (ssoSessionManager) {
             ssoSessionManager->removeSsoIdentity();
             delete ssoSessionManager;
+            ssoSessionManager = 0;
         }
     }
 }

diff --git a/qmf/src/plugins/messageservices/smtp/smtpclient.cpp b/qmf/src/plugins/messageservices/smtp/smtpclient.cpp
@@ -180,6 +180,7 @@ void SmtpClient::setAccount(const QMailAccountId &id)
             qMailLog(SMTP) << Q_FUNC_INFO << "SSO identity is found for account id: "<< id;
         } else {
             delete ssoSessionManager;
+            ssoSessionManager = 0;
             qMailLog(SMTP) << Q_FUNC_INFO << "SSO identity is not found for account id: "<< id
                            << ", accounts configuration will be used";
         }
@@ -1091,6 +1092,7 @@ void SmtpClient::removeSsoIdentity(const QMailAccountId &accountId)
         if (ssoSessionManager) {
             ssoSessionManager->removeSsoIdentity();
             delete ssoSessionManager;
+            ssoSessionManager = 0;
         }
     }
 }