[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kitinerary] src: Consider attached emails when selecting the right extractor too
From:       Volker Krause <null () kde ! org>
Date:       2018-09-11 17:28:08
Message-ID: E1fzmSO-0003mU-EI () code ! kde ! org
[Download RAW message or body]

Git commit 47277ab83a6da7141095feb1dc7a779de737392f by Volker Krause.
Committed on 11/09/2018 at 17:26.
Pushed by vkrause into branch 'master'.

Consider attached emails when selecting the right extractor too

Now this triggers on forwarded emails too.

M  +4    -2    src/extractorrepository.cpp

https://commits.kde.org/kitinerary/47277ab83a6da7141095feb1dc7a779de737392f

diff --git a/src/extractorrepository.cpp b/src/extractorrepository.cpp
index 75b0bbf..8a7f17a 100644
--- a/src/extractorrepository.cpp
+++ b/src/extractorrepository.cpp
@@ -74,8 +74,10 @@ std::vector<const Extractor *> ExtractorRepository::extractorsForMessage(KMime::
         }
         for (const auto &filter : (*it).filters()) {
             auto header = part->headerByType(filter.headerName());
-            if (!header && part->topLevel()) {
-                header = part->topLevel()->headerByType(filter.headerName());
+            auto ancestor = part;
+            while (!header && ancestor->parent()) {
+                ancestor = ancestor->parent();
+                header = ancestor->headerByType(filter.headerName());
             }
             if (!header) {
                 continue;

[prev in list] [next in list] [prev in thread] [next in thread]