X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fqtui.cpp;h=66e07d0869b318b972371f77abdc2519c7c69ec6;hb=6f442c275cc5a2d5f1084ac2ceca5f1ffce1d024;hp=30fe5a37cbf91304e840d7d7ea6f3901e0b8589d;hpb=6e85a37d1b7d3501f0fd7cc94fd0fcd4ba0c6cc4;p=quassel.git

diff --git a/src/qtui/qtui.cpp b/src/qtui/qtui.cpp
index 30fe5a37..66e07d08 100644
--- a/src/qtui/qtui.cpp
+++ b/src/qtui/qtui.cpp
@@ -137,9 +137,7 @@ void QtUi::closeNotification(uint notificationId) {
         backend->close(notificationId);
       i = _notifications.erase(i);
       break;
-    } else {
-      ++i;
-    }
+    } else ++i;
   }
 }
 
@@ -150,9 +148,7 @@ void QtUi::closeNotifications(BufferId bufferId) {
       foreach(AbstractNotificationBackend *backend, _notificationBackends)
         backend->close((*i).notificationId);
       i = _notifications.erase(i);
-    } else {
-      ++i;
-    }
+    } else ++i;
   }
 }
 
@@ -168,22 +164,13 @@ void QtUi::notificationActivated(uint notificationId) {
         BufferId bufId = (*i).bufferId;
         if(bufId.isValid())
           Client::bufferModel()->switchToBuffer(bufId);
+        foreach(AbstractNotificationBackend *backend, _notificationBackends)
+          backend->close(notificationId);
         _notifications.erase(i);
         break;
-      }
+      } else ++i;
     }
   }
 
-#ifdef Q_WS_X11
-  // Bypass focus stealing prevention
-  QX11Info::setAppUserTime(QX11Info::appTime());
-#endif
-
-  if(_mainWin->windowState() & Qt::WindowMinimized) {
-    // restore
-    _mainWin->setWindowState((_mainWin->windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
-    _mainWin->show();
-  }
-  _mainWin->raise();
-  _mainWin->activateWindow();
+  mainWindow()->forceActivated();
 }