diff options
| author | Don Sanders <don.sanders@nokia.com> | 2011-06-10 19:06:21 +0300 |
|---|---|---|
| committer | Don Sanders <don.sanders@nokia.com> | 2011-06-10 19:06:21 +0300 |
| commit | 96b848bfb72b28753646e5b5ada2c70e08f6d4e9 (patch) | |
| tree | cf6fbccfd705bbc24115c34f545d699dfbd44772 | |
| parent | 67d096d95cb47d773e91b852db47fc605446596c (diff) | |
| parent | 8565b3c7ea895d1a755400f360f4e9b7ed0a6c8b (diff) | |
Resolve conflicts.
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | src/libraries/qmfclient/qmailmessage.cpp | 2 |
2 files changed, 3 insertions, 5 deletions
@@ -1,10 +1,6 @@ Latest Changes --------------- -201123 - * Fixes: NB#261810 Random crashes observed upon tapping send in reply/forward editor - * Fixes: NB#263850 Preview of the message shown with junk characters/links if message has Inlined image - 201122 * Fixes: NB#259331 Does not show new emails immediately * Fixes: NB#249858 Random crash observed with assert @@ -17,6 +13,8 @@ Latest Changes * Fixes: NB#195729 smtp authentication error not shown when account is configured with wrong settings * Fixes: NB#264025 Messageserver crash while setting POP account * Fixes: NB#264045 Messageserver crash while disabling other mail account + * Fixes: NB#261810 Random crashes observed + * Fixes: NB#263850 Preview of the message shown with junk characters/links 201121 * Fixes: NB#232541 Calendar icon not displayed diff --git a/src/libraries/qmfclient/qmailmessage.cpp b/src/libraries/qmfclient/qmailmessage.cpp index e83e0d09..cc8c5951 100644 --- a/src/libraries/qmfclient/qmailmessage.cpp +++ b/src/libraries/qmfclient/qmailmessage.cpp @@ -8232,7 +8232,7 @@ void QMailMessage::refreshPreview() QMailMessagePartContainer *part; - // TODO: don't load entire body into memory
+ // TODO: don't load entire body into memory // TODO: parse html correctly, e.g. closing brackets in quotes in tags if ((part = findPlainTextContainer()) && part->hasBody()) { |