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

diff --git a/src/qtui/systraynotificationbackend.cpp b/src/qtui/systraynotificationbackend.cpp
index b6d1ff5f..74134954 100644
--- a/src/qtui/systraynotificationbackend.cpp
+++ b/src/qtui/systraynotificationbackend.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2010 by the Quassel Project                        *
+ *   Copyright (C) 2005-2012 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -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 {