X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Findicatornotificationbackend.cpp;h=df7b5340c0f6cc6ad6f81ad36ec32ff70abd9043;hb=42d2c195b272f42fdcad7f44b9db4ae4f708bdf6;hp=ec76443552f44b5d8acb6f7ad2c869d36b8cef2b;hpb=f2842f9ac96039f2b5071851420cec06f3cde657;p=quassel.git diff --git a/src/qtui/indicatornotificationbackend.cpp b/src/qtui/indicatornotificationbackend.cpp index ec764435..df7b5340 100644 --- a/src/qtui/indicatornotificationbackend.cpp +++ b/src/qtui/indicatornotificationbackend.cpp @@ -41,14 +41,17 @@ 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("message.irc"); - _server->setDesktopFile(XSTR(DESKTOP_FILE)); - connect(_server, SIGNAL(serverDisplay()), QtUi::mainWindow(), SLOT(forceActivated())); + QString desktopFile = QString("%1/%2.desktop") + .arg(XSTR(XDG_APPS_INSTALL_DIR)) + .arg(QCoreApplication::applicationFilePath().section('/', -1)); + _server->setDesktopFile(desktopFile); + connect(_server, SIGNAL(serverDisplay()), SLOT(activateMainWidget())); if (_enabled) { _server->show(); @@ -59,6 +62,10 @@ IndicatorNotificationBackend::~IndicatorNotificationBackend() { qDeleteAll(_indicatorHash); } +void IndicatorNotificationBackend::activateMainWidget() { + GraphicalUi::activateMainWidget(); +} + void IndicatorNotificationBackend::notify(const Notification ¬ification) { if(!_enabled) { return;