diff options
| author | Don Sanders <don.sanders@nokia.com> | 2011-06-05 13:20:38 +0300 |
|---|---|---|
| committer | Don Sanders <don.sanders@nokia.com> | 2011-06-05 13:20:38 +0300 |
| commit | afd7519d8027f7920912b69969c39aa0c9854314 (patch) | |
| tree | bc5b21b18fd19a097a11c13c73994c86f2095bde | |
| parent | 8a065a94d925a5daff9abf375f7d6fc87259cc42 (diff) | |
Fix regression caused by adaptive plugins.
Crash when using service of disabled imap account.
| -rw-r--r-- | src/plugins/messageservices/imap/imapservice.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/messageservices/imap/imapservice.cpp b/src/plugins/messageservices/imap/imapservice.cpp index 91d90b96..0f3f5c30 100644 --- a/src/plugins/messageservices/imap/imapservice.cpp +++ b/src/plugins/messageservices/imap/imapservice.cpp @@ -1326,7 +1326,7 @@ QString ImapService::service() const QMailAccountId ImapService::accountId() const { - return _client->account(); + return _accountId; } bool ImapService::hasSource() const @@ -1396,7 +1396,7 @@ void ImapService::errorOccurred(int code, const QString &text) if (!pushEmailEstablished()) return; _source->retrievalTerminated(); - updateStatus(code, text, _client->account()); + updateStatus(code, text, _accountId); emit actionCompleted(false); } @@ -1405,13 +1405,13 @@ void ImapService::errorOccurred(QMailServiceAction::Status::ErrorCode code, cons if (!pushEmailEstablished()) return; _source->retrievalTerminated(); - updateStatus(code, text, _client->account()); + updateStatus(code, text, _accountId); emit actionCompleted(false); } void ImapService::updateStatus(const QString &text) { - updateStatus(QMailServiceAction::Status::ErrNoError, text, _client->account()); + updateStatus(QMailServiceAction::Status::ErrNoError, text, _accountId); } class ImapConfigurator : public QMailMessageServiceConfigurator |