File use-icon-filename-for-systray-icon.patch of Package kmail.openSUSE_Leap_42.3_Update
From 07a3e9aecc5e79cffa8635f5f55c16b2e5064afe Mon Sep 17 00:00:00 2001
From: Martin Koller <kollix@aon.at>
Date: Tue, 10 Oct 2017 07:31:40 +0200
Subject: use icon filename for systray icon instead of sending pixmap over
D-Bus
Differential Revision: https://phabricator.kde.org/D8226
---
src/kmsystemtray.cpp | 5 ++---
src/kmsystemtray.h | 2 --
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/kmsystemtray.cpp b/src/kmsystemtray.cpp
index 548d179..4e121cb 100644
--- a/src/kmsystemtray.cpp
+++ b/src/kmsystemtray.cpp
@@ -58,7 +58,6 @@ using namespace KMail;
KMSystemTray::KMSystemTray(QObject *parent)
: KStatusNotifierItem(parent),
- mIcon(QIcon::fromTheme(QStringLiteral("mail-mark-unread-new"))),
mDesktopOfMainWin(0),
mCount(0),
mIconNotificationsEnabled(true),
@@ -149,7 +148,7 @@ void KMSystemTray::slotGeneralFontChanged()
/**
* Update the count of unread messages. If there are unread messages,
- * overlay the count on top of a transparent version of the KMail icon.
+ * show the "unread new mail" KMail icon.
* If there is no unread mail, restore the normal KMail icon.
*/
void KMSystemTray::updateCount()
@@ -148,7 +147,7 @@ void KMSystemTray::updateCount()
if (mCount == 0) {
setIconByName(QStringLiteral("kmail"));
} else {
- setIconByPixmap(mIcon);
+ setIconByName(QStringLiteral("mail-mark-unread-new"));
}
}
diff --git a/src/kmsystemtray.h b/src/kmsystemtray.h
index 75c43cb..e5af63f 100644
--- a/src/kmsystemtray.h
+++ b/src/kmsystemtray.h
@@ -19,7 +19,6 @@
#define KMSYSTEMTRAY_H
#include <AkonadiCore/collection.h>
-#include <qicon.h>
#include <kstatusnotifieritem.h>
#include <QAction>
@@ -72,7 +74,6 @@ private:
bool ignoreNewMailInFolder(const Akonadi::Collection &collection);
private:
- QIcon mIcon;
int mDesktopOfMainWin;
int mCount;
--
cgit v1.1