X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Flegacysystemtray.cpp;h=52bd15dcf5f22b9621a96c278a50d9b70588230e;hb=dd8d82a90c136fa1e56d7f72781881cd5099574f;hp=9176dbd769f2951c309b91f908f7778e69e5619e;hpb=f266d6afd50d03b21b136b6a34454c49d55878cf;p=quassel.git

diff --git a/src/qtui/legacysystemtray.cpp b/src/qtui/legacysystemtray.cpp
index 9176dbd7..52bd15dc 100644
--- a/src/qtui/legacysystemtray.cpp
+++ b/src/qtui/legacysystemtray.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  *
@@ -27,7 +27,6 @@
 LegacySystemTray::LegacySystemTray(QWidget *parent)
   : SystemTray(parent),
   _blinkState(false),
-  _isVisible(true),
   _lastMessageId(0)
 {
 #ifndef HAVE_KDE
@@ -78,9 +77,9 @@ void LegacySystemTray::syncLegacyIcon() {
 }
 
 void LegacySystemTray::setVisible(bool visible) {
-  _isVisible = visible;
+  SystemTray::setVisible(visible);
   if(mode() == Legacy) {
-    if(visible)
+    if(shouldBeVisible())
       _trayIcon->show();
     else
       _trayIcon->hide();
@@ -91,16 +90,21 @@ bool LegacySystemTray::isVisible() const {
   if(mode() == Legacy) {
     return _trayIcon->isVisible();
   }
-  return false;
+  return SystemTray::isVisible();
 }
 
 void LegacySystemTray::setMode(Mode mode_) {
+  if(mode_ == mode())
+    return;
+
   SystemTray::setMode(mode_);
 
   if(mode() == Legacy) {
     syncLegacyIcon();
-    if(_isVisible)
+    if(shouldBeVisible())
       _trayIcon->show();
+    else
+      _trayIcon->hide();
     if(state() == NeedsAttention)
       _blinkTimer.start();
   } else {