summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-11-06 07:46:08 +0100
committerMontel Laurent <[email protected]>2017-11-06 07:46:08 +0100
commit0c4eedf508a8e013025ea896a571e082f6656d81 (patch)
treed6fc2dfac061702699a11b522e1ccdce00ca8475
parentd64f869ba650e7662ac812462f8c496f7bc774b1 (diff)
Remove display useragent
-rw-r--r--messageviewer/src/header/grantleeheaderformatter.cpp12
-rw-r--r--messageviewer/src/settings/messageviewer.kcfg.cmake5
-rw-r--r--messageviewer/src/ui/settings.ui7
3 files changed, 0 insertions, 24 deletions
diff --git a/messageviewer/src/header/grantleeheaderformatter.cpp b/messageviewer/src/header/grantleeheaderformatter.cpp
index cbf543c..2af5473 100644
--- a/messageviewer/src/header/grantleeheaderformatter.cpp
+++ b/messageviewer/src/header/grantleeheaderformatter.cpp
@@ -245,18 +245,6 @@ QString GrantleeHeaderFormatter::format(const QString &absolutePath, const Grant
HeaderStyleUtil::
LongDate)));
- if (MessageViewer::MessageViewerSettings::self()->showUserAgent()) {
- if (auto hdr = message->userAgent(false)) {
- headerObject.insert(QStringLiteral("useragent"),
- d->headerStyleUtil.strToHtml(hdr->asUnicodeString()));
- }
-
- if (auto hrd = message->headerByType("X-Mailer")) {
- headerObject.insert(QStringLiteral("xmailer"),
- d->headerStyleUtil.strToHtml(hrd->asUnicodeString()));
- }
- }
-
if (message->hasHeader("Resent-From")) {
headerObject.insert(QStringLiteral("resentfromi18n"), i18n("resent from"));
const QVector<KMime::Types::Mailbox> resentFrom
diff --git a/messageviewer/src/settings/messageviewer.kcfg.cmake b/messageviewer/src/settings/messageviewer.kcfg.cmake
index f738b40..9b6b74f 100644
--- a/messageviewer/src/settings/messageviewer.kcfg.cmake
+++ b/messageviewer/src/settings/messageviewer.kcfg.cmake
@@ -72,11 +72,6 @@ xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/sta
<label>Reduce font size for quoted text</label>
<whatsthis>Enable this option to show quoted text with a smaller font.</whatsthis>
</entry>
- <entry name="ShowUserAgent" type="Bool">
- <default>false</default>
- <label>Show user agent</label>
- <whatsthis>Enable this option to get the User-Agent and X-Mailer header lines displayed.</whatsthis>
- </entry>
<entry name="AllowAttachmentEditing" type="Bool">
<default>false</default>
<label>Allow to edit attachments of existing mails.</label>
diff --git a/messageviewer/src/ui/settings.ui b/messageviewer/src/ui/settings.ui
index 9c107da..e35909a 100644
--- a/messageviewer/src/ui/settings.ui
+++ b/messageviewer/src/ui/settings.ui
@@ -175,13 +175,6 @@
</item>
</layout>
</item>
- <item>
- <widget class="QCheckBox" name="kcfg_ShowUserAgent">
- <property name="text">
- <string>Show user agent in fancy headers</string>
- </property>
- </widget>
- </item>
</layout>
</item>
<item row="3" column="3">