File 0012-notifications-Clear-notification-from-show... of Package plasma5-workspace

Overview Repositories Revisions Requests Users Attributes Meta

File 0012-notifications-Clear-notification-from-show-queue-if-.patch of Package plasma5-workspace (Revision cfafe49cb45681b5be8054b4ac571308)

Currently displaying revision cfafe49cb45681b5be8054b4ac571308 , Show latest

From af3081abe2337c691cd2d310951ffd20f21da00d Mon Sep 17 00:00:00 2001
From: Martin Klapetek <mklapetek@kde.org>
Date: Fri, 1 May 2015 14:54:47 +0200
Subject: [PATCH 12/12] [notifications] Clear notification from show queue if
 it's closed before it's shown

It can happen that a notification is placed in the show queue and then
it's closed (eg. programatically) before it was even shown. In this case
the notification must be cleared from the show queue otherwise it will
get displayed and hidden but the popup is never freed for reuse,
resulting in notificaions starting at higher position from the panel.

BUG: 342605
---
 applets/notifications/plugin/notificationshelper.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/applets/notifications/plugin/notificationshelper.cpp b/applets/notifications/plugin/notificationshelper.cpp
index b56e3933bc5ee23bb53892126c5af91caee74cc6..e2880eb235d99f2a9930d648d3ccc5a296c4c354 100644
--- a/applets/notifications/plugin/notificationshelper.cpp
+++ b/applets/notifications/plugin/notificationshelper.cpp
@@ -263,6 +263,22 @@ void NotificationsHelper::closePopup(const QString &sourceName)
     bool shouldQueue = popup && !m_hideQueue.contains(popup);
     m_mutex->unlock();
 
+    // Make sure the notification that was closed (programatically)
+    // is not in the show queue. This is important otherwise that
+    // notification will be shown and then never closed (because
+    // the close event arrives here, before it's even shown)
+    QMutableListIterator<QVariantMap> i(m_showQueue);
+    while (i.hasNext()) {
+        if (i.next().value("source") == sourceName) {
+            qDebug() << "########|" << "  (locking mutex for write)";
+            m_mutex->lockForWrite();
+            qDebug() << "########|" << "Removing old data" << i.value().value("summary").toString();
+            i.remove();
+            m_mutex->unlock();
+            qDebug() << "########|" << "  (unlocking mutex)";
+        }
+    }
+
     if (shouldQueue) {
         m_mutex->lockForWrite();
         m_hideQueue.append(popup);
-- 
2.3.5

Places

File 0012-notifications-Clear-notification-from-show-queue-if-.patch of Package plasma5-workspace (Revision cfafe49cb45681b5be8054b4ac571308)

Places