reply_view: quote only first part when message have alternative parts

wereHamster · Oct 3, 2011 · 7fd1c34 · 7fd1c34
1 parent 8f5ac4d
commit 7fd1c34
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/reply_view.cc b/src/reply_view.cc
@@ -146,7 +146,7 @@ ReplyView::ReplyView(const std::string & messageId, const View::Geometry & geome
     GMimeObject * part = g_mime_message_get_mime_part(originalMessage);
 
     std::vector<std::shared_ptr<MessagePart>> parts;
-    processMimePart(part, std::back_inserter(parts));
+    processMimePart(part, std::back_inserter(parts), true);
 
     MessagePartTextVisitor<std::ostream_iterator<std::string>> visitor(
         std::ostream_iterator<std::string>(messageContentStream, "\n> "));

diff --git a/src/util.hh b/src/util.hh
@@ -44,7 +44,8 @@ template <typename Type>
 };
 
 template <class OutputIterator>
-    void processMimePart(GMimeObject * part, OutputIterator destination)
+    void processMimePart(GMimeObject * part, OutputIterator destination,
+                         bool onlyFirstForAlternative = false)
 {
     GMimeContentType * contentType = g_mime_object_get_content_type(part);
 
@@ -92,7 +93,11 @@ template <class OutputIterator>
 
         for (auto subpart = subpartsWithPriority.begin();
              subpart != subpartsWithPriority.end(); ++subpart)
+        {
             processMimePart(subpart->first, destination);
+            if (onlyFirstForAlternative)
+                break;
+        }
     }
     else if (g_mime_content_type_is_type(contentType, "multipart", "*"))
     {