X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsystraynotificationbackend.cpp;h=dcdd8165425750d3615acab4b27e215bb57b0438;hb=37112539ef48c17968eb2d55fb8fc76b20329040;hp=b6d1ff5f7811a55227aa191bccb463969f95a12b;hpb=ffc0d75cea1690acb5428fb4f1ee0e82b5f4c9ef;p=quassel.git

diff --git a/src/qtui/systraynotificationbackend.cpp b/src/qtui/systraynotificationbackend.cpp
index b6d1ff5f..dcdd8165 100644
--- a/src/qtui/systraynotificationbackend.cpp
+++ b/src/qtui/systraynotificationbackend.cpp
@@ -79,7 +79,7 @@ void SystrayNotificationBackend::close(uint notificationId) {
 
   QtUi::mainWindow()->systemTray()->closeMessage(notificationId);
 
-  if(!_notifications.count())
+  //if(!_notifications.count()) //FIXME make configurable
     QtUi::mainWindow()->systemTray()->setAlert(false);
 
   updateToolTip();
@@ -87,8 +87,9 @@ void SystrayNotificationBackend::close(uint notificationId) {
 
 void SystrayNotificationBackend::notificationActivated(uint notificationId) {
   if(!_blockActivation) {
-    if(QtUi::mainWindow()->systemTray()->isAlerted()) {
-      _blockActivation = true; // prevent double activation because both tray icon and bubble might send a signal
+    if(_notifications.count()) {
+      if(QtUi::mainWindow()->systemTray()->mode() == SystemTray::Legacy)
+        _blockActivation = true; // prevent double activation because both tray icon and bubble might send a signal
       if(!notificationId)
         notificationId = _notifications.count()? _notifications.last().notificationId : 0;
       emit activated(notificationId);
@@ -121,7 +122,7 @@ void SystrayNotificationBackend::animateChanged(const QVariant &v) {
 
 void SystrayNotificationBackend::updateToolTip() {
   QtUi::mainWindow()->systemTray()->setToolTip("Quassel IRC",
-                                               _notifications.count()? tr("%n pending highlights", "", _notifications.count()) : QString());
+                                               _notifications.count()? tr("%n pending highlight(s)", "", _notifications.count()) : QString());
 }
 
 SettingsPage *SystrayNotificationBackend::createConfigWidget() const {