projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent quasselclient from crashing when using the 'cancel' button of the 'Authorisat...
[quassel.git]
/
src
/
qtui
/
indicatornotificationbackend.cpp
diff --git
a/src/qtui/indicatornotificationbackend.cpp
b/src/qtui/indicatornotificationbackend.cpp
index
26d3a4f
..
41fce5c
100644
(file)
--- a/
src/qtui/indicatornotificationbackend.cpp
+++ b/
src/qtui/indicatornotificationbackend.cpp
@@
-29,6
+29,9
@@
#include "networkmodel.h"
#include "qtui.h"
#include "networkmodel.h"
#include "qtui.h"
+#define STR(x) #x
+#define XSTR(x) STR(x)
+
class Indicator : public QIndicate::Indicator {
public:
uint lastNotificationId;
class Indicator : public QIndicate::Indicator {
public:
uint lastNotificationId;
@@
-38,13
+41,16
@@
IndicatorNotificationBackend::IndicatorNotificationBackend(QObject *parent)
: AbstractNotificationBackend(parent)
{
NotificationSettings notificationSettings;
: AbstractNotificationBackend(parent)
{
NotificationSettings notificationSettings;
- _enabled = notificationSettings.value("Indicator/Enabled",
tru
e).toBool();
+ _enabled = notificationSettings.value("Indicator/Enabled",
fals
e).toBool();
notificationSettings.notify("Indicator/Enabled", this, SLOT(enabledChanged(const QVariant &)));
_server = QIndicate::Server::defaultInstance();
notificationSettings.notify("Indicator/Enabled", this, SLOT(enabledChanged(const QVariant &)));
_server = QIndicate::Server::defaultInstance();
- _server->setType("messaging");
- _server->setDesktopFile(DESKTOP_FILE);
+ _server->setType("message.irc");
+ QString desktopFile = QString("%1/%2.desktop")
+ .arg(XSTR(XDG_APPS_INSTALL_DIR))
+ .arg(QCoreApplication::applicationFilePath().section('/', -1));
+ _server->setDesktopFile(desktopFile);
connect(_server, SIGNAL(serverDisplay()), QtUi::mainWindow(), SLOT(forceActivated()));
if (_enabled) {
connect(_server, SIGNAL(serverDisplay()), QtUi::mainWindow(), SLOT(forceActivated()));
if (_enabled) {