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

List:       kde-commits
Subject:    [kdepim-addons/Applications/16.08] plugins/messageviewerheaderplugins/briefheaderstyleplugin: Don't 
From:       Montel Laurent <montel () kde ! org>
Date:       2016-10-14 11:50:06
Message-ID: E1bv102-0003bU-Bi () code ! kde ! org
[Download RAW message or body]

Git commit 849284dda124b2ec18f5b2eabbf232fa3f9f9621 by Montel Laurent.
Committed on 14/10/2016 at 11:50.
Pushed by mlaurent into branch 'Applications/16.08'.

Don't display CC/BCC when there are not defined

M  +8    -2    plugins/messageviewerheaderplugins/briefheaderstyleplugin/briefheaderstyle.cpp


http://commits.kde.org/kdepim-addons/849284dda124b2ec18f5b2eabbf232fa3f9f9621

diff --git a/plugins/messageviewerheaderplugins/briefheaderstyleplugin/briefheaderstyle.cpp \
b/plugins/messageviewerheaderplugins/briefheaderstyleplugin/briefheaderstyle.cpp \
                index 3703833..8f76241 100644
--- a/plugins/messageviewerheaderplugins/briefheaderstyleplugin/briefheaderstyle.cpp
+++ b/plugins/messageviewerheaderplugins/briefheaderstyleplugin/briefheaderstyle.cpp
@@ -103,11 +103,17 @@ QString BriefHeaderStyle::format(KMime::Message *message) const
     }
 
     if (strategy->showHeader(QStringLiteral("cc")) && message->cc(false)) {
-        headerParts << i18n("CC: ") + StringUtil::emailAddrAsAnchor(message->cc(), \
StringUtil::DisplayNameOnly); +        const QString str = \
StringUtil::emailAddrAsAnchor(message->cc(), StringUtil::DisplayNameOnly); +        \
if (!str.isEmpty()) { +            headerParts << i18n("CC: ") + str;
+        }
     }
 
     if (strategy->showHeader(QStringLiteral("bcc")) && message->bcc(false)) {
-        headerParts << i18n("BCC: ") + StringUtil::emailAddrAsAnchor(message->bcc(), \
StringUtil::DisplayNameOnly); +        const QString str = \
StringUtil::emailAddrAsAnchor(message->bcc(), StringUtil::DisplayNameOnly); +        \
if (!str.isEmpty()) { +            headerParts << i18n("BCC: ") + str;
+        }
     }
 
     if (strategy->showHeader(QStringLiteral("date"))) {


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