summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Fernandez <jfernandez@igalia.com>2011-04-07 17:15:32 +0200
committerDon Sanders <don.sanders@nokia.com>2011-05-23 21:11:08 +0300
commita3816d12d8c2eb0a61a3a494f9a77fe9a438b47e (patch)
tree80b38b0da14f698b25d48119a14ab4410b646ec4
parentab9b99d3e9dbdec6bbc837c5bacaf8d8a11fa3b8 (diff)
Fixes: NB#196171 - Actual thumbnails are never shown in Attachments list view from email editor and viewer view.
Conflicts: debian/changelog
-rw-r--r--src/libraries/qmfclient/qmailmessage.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libraries/qmfclient/qmailmessage.cpp b/src/libraries/qmfclient/qmailmessage.cpp
index ba716197..bd2749cb 100644
--- a/src/libraries/qmfclient/qmailmessage.cpp
+++ b/src/libraries/qmfclient/qmailmessage.cpp
@@ -5823,10 +5823,10 @@ QString QMailMessagePart::identifier() const
QString id(contentID());
if (id.isEmpty())
- id = decodeWordSequence(contentDisposition().filename());
+ id = contentDisposition().isParameterEncoded("filename")?decodeParameter(contentDisposition().filename()):decodeWordSequence(contentDisposition().filename());
if (id.isEmpty())
- id = decodeWordSequence(contentType().name());
+ id = contentType().isParameterEncoded("name")?decodeParameter(contentType().name()):decodeWordSequence(contentType().name());
if (id.isEmpty())
id = QString::number(impl(this)->partNumber());