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

List:       kde-commits
Subject:    [kde-workspace/KDE/4.9] plasma/generic/dataengines/notifications: Fix calculation of notification ti
From:       Martin Koller <kollix () aon ! at>
Date:       2012-08-08 21:32:06
Message-ID: 20120808213206.CC278A6094 () git ! kde ! org
[Download RAW message or body]

Git commit 2cfe8908779775bda848a2327ed6f903019a0293 by Martin Koller.
Committed on 08/08/2012 at 23:29.
Pushed by mkoller into branch 'KDE/4.9'.

Fix calculation of notification timeout

BUG: 178411
FIXED-IN: 4.9.1
REVIEW: 105858

M  +1    -1    plasma/generic/dataengines/notifications/notificationsengine.cpp

http://commits.kde.org/kde-workspace/2cfe8908779775bda848a2327ed6f903019a0293

diff --git a/plasma/generic/dataengines/notifications/notificationsengine.cpp \
b/plasma/generic/dataengines/notifications/notificationsengine.cpp index \
                caaca27..25fccbb 100644
--- a/plasma/generic/dataengines/notifications/notificationsengine.cpp
+++ b/plasma/generic/dataengines/notifications/notificationsengine.cpp
@@ -154,7 +154,7 @@ uint NotificationsEngine::Notify(const QString &app_name, uint \
                replaces_id,
         // Add two seconds for the user to notice the notification, and ensure
         // it last at least five seconds, otherwise all the user see is a
         // flash
-        timeout = 2000 + qMin(timeout, 3000);
+        timeout = 2000 + qMax(timeout, 3000);
     }
 
     const QString source = QString("notification %1").arg(id);


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