Do not require restarting Wesnoth to disable or enable...

...desktop notifications

(noted by un214 on IRC)
This commit is contained in:
Ignacio R. Morelle 2012-01-25 04:30:21 +00:00
parent 90eeaade25
commit 1852dcd2b3
2 changed files with 6 additions and 3 deletions

View file

@ -8,6 +8,7 @@ Version 1.10.0+svn:
* Fixed unit sound animation timings wherever the {SOUND:SLOW} and
{SOUND:POISON} macros, and several macros from animation-utils2.cfg are used
(see bug #19274)
* Restart is no longer required to toggle desktop notifications
Version 1.10.0:
* Campaigns:

View file

@ -1131,14 +1131,16 @@ static DBusHandlerResult filter_dbus_signal(DBusConnection *, DBusMessage *buf,
static DBusConnection *get_dbus_connection()
{
if (preferences::get("disable_notifications", false)) {
return NULL;
}
static bool initted = false;
static DBusConnection *connection = NULL;
if (!initted)
{
initted = true;
if (preferences::get("disable_notifications", false)) {
return NULL;
}
if (getenv("KDE_SESSION_VERSION")) {
// This variable is defined for KDE 4 only.
kde_style = true;