#424: assert that timeout seconds in every naughty notification are numbers

[etc/awesome.git] / widget / cal.lua

diff --git a/widget/cal.lua b/widget/cal.lua
index 47e91a979889739046d314d4251da11a2f056458..2482ccb9a078744f09c17e4203ce5b0d6020a492 100644 (file)
--- a/widget/cal.lua
+++ b/widget/cal.lua
@@ -14,11 +14,13 @@ local os       = os
 local pairs    = pairs
 local string   = string
 local tconcat  = table.concat
 local pairs    = pairs
 local string   = string
 local tconcat  = table.concat

+local type     = type

 local tonumber = tonumber
 local tostring = tostring
 
 -- Calendar notification
 -- lain.widget.cal
 local tonumber = tonumber
 local tostring = tostring
 
 -- Calendar notification
 -- lain.widget.cal

+

 local function factory(args)
     args = args or {}
     local cal = {
 local function factory(args)
     args = args or {}
     local cal = {


@@ -79,7 +81,7 @@ local function factory(args)
         cal.notification = nil
     end
 
         cal.notification = nil
     end
 

-    function cal.show(timeout, month, year, scr)
+    function cal.show(seconds, month, year, scr)

         cal.notification_preset.text = tconcat(cal.build(month, year))
 
         if cal.three then
         cal.notification_preset.text = tconcat(cal.build(month, year))
 
         if cal.three then


@@ -97,7 +99,7 @@ local function factory(args)
             preset  = cal.notification_preset,
             screen  = cal.followtag and awful.screen.focused() or scr or 1,
             icon    = cal.icon,
             preset  = cal.notification_preset,
             screen  = cal.followtag and awful.screen.focused() or scr or 1,
             icon    = cal.icon,

-            timeout = timeout or cal.notification_preset.timeout or 5
+            timeout = type(seconds) == "number" and seconds or cal.notification_preset.timeout or 5

         }
     end
 
         }
     end