diff options
| author | Valerio Valerio <valerio.valerio@nokia.com> | 2012-01-20 13:28:28 +0200 |
|---|---|---|
| committer | Valerio Valerio <valerio.valerio@nokia.com> | 2012-01-20 13:28:28 +0200 |
| commit | e5f1fd7139f24571b325c0cb357b6d95ed504eb5 (patch) | |
| tree | 24f0ce4182f63c67acf490b3aa072862c2f63026 /src/plugins/messageservices | |
| parent | 4582636586ed1e29b2f893f1ed626db9d95b23fa (diff) | |
Conversation support improvements from MeeGo QMF - patch 3.conversations_improvements
Diffstat (limited to 'src/plugins/messageservices')
| -rw-r--r-- | src/plugins/messageservices/imap/imapstructure.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/messageservices/smtp/smtpauthenticator.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/messageservices/imap/imapstructure.cpp b/src/plugins/messageservices/imap/imapstructure.cpp index 37fd8589..8663157a 100644 --- a/src/plugins/messageservices/imap/imapstructure.cpp +++ b/src/plugins/messageservices/imap/imapstructure.cpp @@ -299,7 +299,7 @@ QMailMessageContentDisposition fromDispositionDescription(const QString &desc, c } if (!size.isEmpty() && disposition.size() == -1) { - // We prefer the Content-Disposition/Size to the body size. + // We use the body size only if Content-Disposition/Size is not available. // From RFC3501 INTERNET MESSAGE ACCESS PROTOCOL - VERSION 4rev1: // body size // A number giving the size of the body in octets. Note that diff --git a/src/plugins/messageservices/smtp/smtpauthenticator.cpp b/src/plugins/messageservices/smtp/smtpauthenticator.cpp index 855e6a68..e9a494c4 100644 --- a/src/plugins/messageservices/smtp/smtpauthenticator.cpp +++ b/src/plugins/messageservices/smtp/smtpauthenticator.cpp @@ -56,7 +56,7 @@ QByteArray SmtpAuthenticator::getAuthentication(const QMailAccountConfiguration: { QByteArray result(QMailAuthenticator::getAuthentication(svcCfg, capabilities)); if (!result.isEmpty()) - return result.prepend("AUTH ");; + return result.prepend("AUTH "); #ifndef QT_NO_OPENSSL SmtpConfiguration smtpCfg(svcCfg); |