#204: revert to not hidden as default

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 3b9cca07bc290d0854dd5f4b92ff6319eb1637bc..e5b5afc153b4e49fe87c46d3baa6754f8eed7974 100644 (file)
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -28,7 +28,7 @@ local function worker(args)
     local timeout   = args.timeout or 30
     local batteries = args.batteries or (args.battery and {args.battery}) or {"BAT0"}
     local ac        = args.ac or "AC0"
     local timeout   = args.timeout or 30
     local batteries = args.batteries or (args.battery and {args.battery}) or {"BAT0"}
     local ac        = args.ac or "AC0"

-    local notify    = args.notify or "on"
+    local notify    = args.notify or true

     local settings  = args.settings or function() end
 
     bat.widget = wibox.widget.textbox('')
     local settings  = args.settings or function() end
 
     bat.widget = wibox.widget.textbox('')


@@ -133,7 +133,7 @@ local function worker(args)
         settings()
 
         -- notifications for low and critical states
         settings()
 
         -- notifications for low and critical states

-        if bat_now.status == "Discharging" and notify == "on" and bat_now.perc then
+        if notify and bat_now.perc and bat_now.status == "Discharging" then

             local nperc = tonumber(bat_now.perc) or 100
             if nperc <= 5 then
                 bat.id = naughty.notify({
             local nperc = tonumber(bat_now.perc) or 100
             if nperc <= 5 then
                 bat.id = naughty.notify({

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index b2327bd31d26852340d743b116c1f156b9f037ab..65a92741e0d0a839328d8978f3b144b83070b612 100644 (file)
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -37,7 +37,7 @@ local function worker(args)
     local music_dir   = args.music_dir or os.getenv("HOME") .. "/Music"
     local cover_size  = args.cover_size or 100
     local default_art = args.default_art or ""
     local music_dir   = args.music_dir or os.getenv("HOME") .. "/Music"
     local cover_size  = args.cover_size or 100
     local default_art = args.default_art or ""

-    local show_notifications = args.show_notifications == true
+    local notify      = args.notify or true

     local followmouse = args.followmouse or false
     local echo_cmd    = args.echo_cmd or "echo"
     local settings    = args.settings or function() end
     local followmouse = args.followmouse or false
     local echo_cmd    = args.echo_cmd or "echo"
     local settings    = args.settings or function() end


@@ -91,7 +91,7 @@ local function worker(args)
 
             if mpd_now.state == "play"
             then
 
             if mpd_now.state == "play"
             then

-                if show_notifications and mpd_now.title ~= helpers.get_map("current mpd track")
+                if notify and mpd_now.title ~= helpers.get_map("current mpd track")

                 then
                     helpers.set_map("current mpd track", mpd_now.title)
 
                 then
                     helpers.set_map("current mpd track", mpd_now.title)
 

diff --git a/wiki b/wiki
index 25dd1a2ec44da832d06ded29f393d716e4b54783..00c10f580b55e50a3d6c9c590fe17df15b3ec93c 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 25dd1a2ec44da832d06ded29f393d716e4b54783
+Subproject commit 00c10f580b55e50a3d6c9c590fe17df15b3ec93c