X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=f5afc10ce9b77913d67d4a5abd520d3cf9e2c4cd;hp=4b1c38f732eb2b78e479c1032d718c8c6453c086;hb=f888cd7ee8fc6958dc4e29d4c2ddd2e08421e069;hpb=d83a607c35c063d0cfae9ac12a09afdb8431d9ba

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 4b1c38f7..f5afc10c 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -430,9 +430,17 @@ void MainWin::receiveMessage(const Message &msg) {
       title += QString(" - %1").arg(sender);
     }
     QString text = QtUi::style()->styleString(Message::mircToInternal(msg.text())).text;
-    displayTrayIconMessage(title, text);
-    QApplication::alert(this);
-    setTrayIconActivity(true);
+
+    UiSettings uiSettings;
+
+    if(uiSettings.value("DisplayPopupMessages", QVariant(true)).toBool()) {
+      displayTrayIconMessage(title, text);
+    }
+
+    if(uiSettings.value("AnimateTrayIcon", QVariant(true)).toBool()) {
+      QApplication::alert(this);
+      setTrayIconActivity(true);
+    }
   }
 }