diff --git a/src/globalsystemtray.h b/src/globalsystemtray.h index e3853306db084f3b3e76d8d360e8dbb7ef4e672e..2979a6577dc37452d8303d77d8b6f7fb663a9938 100644 --- a/src/globalsystemtray.h +++ b/src/globalsystemtray.h @@ -34,9 +34,6 @@ public: return *instance_; } - inline static QString notificationAccountId {}; - inline static QString notificationConvUid {}; - template<typename Func> static void connectClicked(Func&& onClicked) { diff --git a/src/utils.cpp b/src/utils.cpp index 858f44bedfd96be712b7fee31a748a8ce2c7ac5e..b215d236021063ea6b86ea6e3e0c5c080168103a 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -297,18 +297,8 @@ Utils::showNotification(const QString& message, return; } - if (accountId == GlobalSystemTray::notificationAccountId - && convUid == GlobalSystemTray::notificationConvUid) { - GlobalSystemTray::notificationAccountId.clear(); - GlobalSystemTray::notificationConvUid.clear(); - return; - } - GlobalSystemTray::connectClicked(std::move(onClicked)); - GlobalSystemTray::notificationAccountId = accountId; - GlobalSystemTray::notificationConvUid = convUid; - if (from.isEmpty()) GlobalSystemTray::instance().showMessage(message, "", QIcon(":images/jami.png")); else