Revert "Change application entry in indicator menu to behave like system tray icon"

[quassel.git] / src / qtui / indicatornotificationbackend.cpp

diff --git a/src/qtui/indicatornotificationbackend.cpp b/src/qtui/indicatornotificationbackend.cpp
index 26d3a4f..fabe20c 100644 (file)
--- a/src/qtui/indicatornotificationbackend.cpp
+++ b/src/qtui/indicatornotificationbackend.cpp
@@ -29,6 +29,9 @@
 #include "networkmodel.h"
 #include "qtui.h"
 
+#define STR(x) #x
+#define XSTR(x) STR(x)
+
 class Indicator : public QIndicate::Indicator {
 public:
   uint lastNotificationId;
@@ -38,13 +41,13 @@ IndicatorNotificationBackend::IndicatorNotificationBackend(QObject *parent)
   : AbstractNotificationBackend(parent)
 {
   NotificationSettings notificationSettings;
-  _enabled = notificationSettings.value("Indicator/Enabled", true).toBool();
+  _enabled = notificationSettings.value("Indicator/Enabled", false).toBool();
 
   notificationSettings.notify("Indicator/Enabled", this, SLOT(enabledChanged(const QVariant &)));
 
   _server = QIndicate::Server::defaultInstance();
-  _server->setType("messaging");
-  _server->setDesktopFile(DESKTOP_FILE);
+  _server->setType("message.irc");
+  _server->setDesktopFile(XSTR(DESKTOP_FILE));
   connect(_server, SIGNAL(serverDisplay()), QtUi::mainWindow(), SLOT(forceActivated()));
 
   if (_enabled) {