Skip to content

Commit

Permalink
preferences: Replace "Disable notifications" with "Desktop notificati…
Browse files Browse the repository at this point in the history
…ons"

Because inverse-logic options are evil and this was the only one in the
entire Preferences dialog anyway.
  • Loading branch information
irydacea committed Jul 15, 2014
1 parent ab37920 commit 2fac031
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
2 changes: 2 additions & 0 deletions changelog
Expand Up @@ -277,6 +277,8 @@ Version 1.13.0-dev:
* Enabled action icons in the hotkey preferences dialog.
* Fix bug #21717: "F5->reload wml tree" doesn't work in editor.
* Fix bug #21298: Minimap shows invisible overlays
* Replaced "Disable notifications" in Preferences -> Advanced with a new
"Desktop notifications" option that defaults to enabled.

Version 1.11.11:
* Add-ons server:
Expand Down
6 changes: 3 additions & 3 deletions data/advanced_preferences.cfg
Expand Up @@ -116,10 +116,10 @@
[/advanced_preference]

[advanced_preference]
field=disable_notifications
name= _ "Disable notifications"
field=desktop_notifications
name= _ "Desktop notifications"
type=boolean
default=no
default=yes
[/advanced_preference]

[advanced_preference]
Expand Down
2 changes: 2 additions & 0 deletions players_changelog
Expand Up @@ -75,6 +75,8 @@ Version 1.13.0-dev:
* Fix bug wherein "lobby sounds" advanced preference didn't do anything for the default lobby.
* Fix bug wherein dbus notifications did not have a wesnoth icon
* Fix bug wherein chat history synopses weren't working right in the dbus notifications
* Replaced "Disable notifications" in Preferences -> Advanced with a new
"Desktop notifications" option that defaults to enabled.

Version 1.11.11:
* Campaigns:
Expand Down
2 changes: 1 addition & 1 deletion src/desktop/notifications.cpp
Expand Up @@ -55,7 +55,7 @@ bool available() { return true; }

void send(const std::string& owner, const std::string& message, type t)
{
if (preferences::get("disable_notifications", false)) { return; }
if (!preferences::get("desktop_notifications", true)) { return; }

Uint8 app_state = SDL_GetAppState();

Expand Down

0 comments on commit 2fac031

Please sign in to comment.