[kdepim/f17] KMail - multipart messages displayed twice (kde#318182)

[Daniel Vrátil]

commit d2184830b19e76b68f6995dd3c3f26e47acf2b95
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Tue Apr 16 17:36:01 2013 +0200

    KMail - multipart messages displayed twice (kde#318182)

 0011-multipart-msgs-displayed-twice.patch |   26 ++++++++++++++++++++++++++
 kdepim.spec                               |    7 ++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/0011-multipart-msgs-displayed-twice.patch b/0011-multipart-msgs-displayed-twice.patch
new file mode 100644
index 0000000..766bc00
--- /dev/null
+++ b/0011-multipart-msgs-displayed-twice.patch
@@ -0,0 +1,26 @@
+commit 37319d960c048bf397e7f7ae0a1564d5eb749482
+Author: Sandro Knauß <mail at sandroknauss.de>
+Date:   Thu Apr 11 13:37:37 2013 +0200
+
+    Fix Bug 318182 - Multipart messages are displayed twice in KMail
+    
+    Instead of showing another time the first text block the actual text of
+    one node is taken
+    
+    BUG: 318182
+    FIXED-IN: 4.10.3
+    REVIEW: 109963
+
+diff --git a/messageviewer/objecttreeparser.cpp b/messageviewer/objecttreeparser.cpp
+index ca3731b..6f032d7 100644
+--- a/messageviewer/objecttreeparser.cpp
++++ b/messageviewer/objecttreeparser.cpp
+@@ -3114,7 +3114,7 @@ void ObjectTreeParser::writeBodyStr( const QByteArray& aStr, const QTextCodec *a
+     }
+ 
+     if ( htmlWriter() ) {
+-      htmlWriter()->queue( quotedHTML( mPlainTextContent, decorate ) );
++      htmlWriter()->queue( quotedHTML( plainText, decorate ) );
+     }
+   }
+ }
diff --git a/kdepim.spec b/kdepim.spec
index 368aadc..f8766cc 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -2,7 +2,7 @@ Name:    kdepim
 Summary: KDE PIM (Personal Information Manager) applications
 Epoch:   7
 Version: 4.10.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -25,6 +25,7 @@ Patch106: 0006-Fix-Bug-317780-KMail-crash-trying-to-Clone-or-Create.patch
 Patch108: 0008-Add-missing-mimetype-for-contact-groups-in-the-direc.patch
 Patch109: 0009-Use-the-index-we-just-calculated-a-bit-faster.patch
 Patch110: 0010-Fix-kmail-autocompletion-from-akonadi.patch
+Patch111: 0011-multipart-msgs-displayed-twice.patch
 
 Provides: kdepim4 = %{version}-%{release}
 
@@ -107,6 +108,7 @@ Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 %patch108 -p1 -b .0008
 %patch109 -p1 -b .0009
 %patch110 -p1 -b .0010
+%patch111 -p1 -b .0011
 
 
 %build
@@ -224,6 +226,9 @@ fi
 
 
 %changelog
+* Tue Apr 16 2013 Daniel Vrátil <dvratil at redhat.com> 7:4.10.2-3
+- multipart messages displayed twice in KMail (kde#318182)
+
 * Mon Apr 08 2013 Rex Dieter <rdieter at fedoraproject.org> 7:4.10.2-2
 - pull in some upstream fixes, in particular...
 - address completion from akonadi regresssion (kde#259949)