projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing a client crash that could occur when processing dynamic backlog
[quassel.git]
/
src
/
qtui
/
desktopnotificationbackend.cpp
diff --git
a/src/qtui/desktopnotificationbackend.cpp
b/src/qtui/desktopnotificationbackend.cpp
index
d2cf9ed
..
a703f6a
100644
(file)
--- a/
src/qtui/desktopnotificationbackend.cpp
+++ b/
src/qtui/desktopnotificationbackend.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
-* Copyright (C) 2005-0
8
by the Quassel Project *
+* Copyright (C) 2005-0
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-26,9
+26,9
@@
#include "clientsettings.h"
#include "networkmodel.h"
#include "clientsettings.h"
#include "networkmodel.h"
-DesktopNotificationBackend::DesktopNotificationBackend(QObject *parent)
: AbstractNotificationBackend(parent) {
- _configWidget = new ConfigWidget();
-
+DesktopNotificationBackend::DesktopNotificationBackend(QObject *parent)
+ : AbstractNotificationBackend(parent)
+{
_dbusInterface = new org::freedesktop::Notifications(
"org.freedesktop.Notifications",
"/org/freedesktop/Notifications",
_dbusInterface = new org::freedesktop::Notifications(
"org.freedesktop.Notifications",
"/org/freedesktop/Notifications",
@@
-59,10
+59,6
@@
DesktopNotificationBackend::DesktopNotificationBackend(QObject *parent) : Abstra
notificationSettings.notify("DesktopNotification/QueueNotifications", this, SLOT(queueNotificationsChanged(const QVariant &)));
}
notificationSettings.notify("DesktopNotification/QueueNotifications", this, SLOT(queueNotificationsChanged(const QVariant &)));
}
-DesktopNotificationBackend::~DesktopNotificationBackend() {
- delete _configWidget;
-}
-
void DesktopNotificationBackend::enabledChanged(const QVariant &v) {
_enabled = v.toBool();
}
void DesktopNotificationBackend::enabledChanged(const QVariant &v) {
_enabled = v.toBool();
}
@@
-152,10
+148,11
@@
void DesktopNotificationBackend::desktopNotificationClosed(uint id, uint reason)
void DesktopNotificationBackend::desktopNotificationInvoked(uint id, const QString & action) {
Q_UNUSED(id); Q_UNUSED(action);
void DesktopNotificationBackend::desktopNotificationInvoked(uint id, const QString & action) {
Q_UNUSED(id); Q_UNUSED(action);
+ emit activated();
}
}
-SettingsPage *DesktopNotificationBackend::configWidget() const {
- return
_configWidget
;
+SettingsPage *DesktopNotificationBackend::c
reateC
onfigWidget() const {
+ return
new ConfigWidget()
;
}
/***************************************************************************/
}
/***************************************************************************/