X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=a4be9fd98bd18af68be99c4c987cb543e0d01f70;hp=bf7cda34a82c98b3d5d1296cedb8701582fd9800;hb=f04db2cb802b1296ca739c823495930c71d3b4ab;hpb=76db8cdfbeffaaba359c8e80cf2146da9e9e7f8a

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index bf7cda34..a4be9fd9 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -112,6 +112,10 @@
   #include "osxnotificationbackend.h"
 #endif
 
+#ifdef HAVE_DBUS
+  #include "dockmanagernotificationbackend.h"
+#endif
+
 #include "settingspages/aliasessettingspage.h"
 #include "settingspages/appearancesettingspage.h"
 #include "settingspages/backlogsettingspage.h"
@@ -226,6 +230,10 @@ void MainWin::init()
     QtUi::registerNotificationBackend(new OSXNotificationBackend(this));
 #endif
 
+#ifdef HAVE_DBUS
+    QtUi::registerNotificationBackend(new DockManagerNotificationBackend(this));
+#endif
+
     // we assume that at this point, all configurable actions are defined!
     QtUi::loadShortcuts();
 
@@ -306,7 +314,9 @@ void MainWin::restoreStateFromSettings(UiSettings &s)
     move(_normalPos);
 #endif
 
-    if (s.value("MainWinHidden").toBool() && QtUi::haveSystemTray())
+    if ((Quassel::isOptionSet("hidewindow")
+            || s.value("MainWinHidden").toBool())
+            && _systemTray->isSystemTrayAvailable())
         QtUi::hideMainWidget();
     else if (s.value("MainWinMinimized").toBool())
         showMinimized();