Fix regression in pulsebar.lua

[etc/awesome.git] / widgets / calendar.lua

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index a00cabaa170a3dbd98d4311f4e7595aca94dcfba..7988ba26f60caa96a9978d8fcbfaa164b952b1d8 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -15,7 +15,6 @@ local os           = { date   = os.date }
 local string       = { format = string.format,
                        gsub   = string.gsub }
 local tonumber     = tonumber
 local string       = { format = string.format,
                        gsub   = string.gsub }
 local tonumber     = tonumber

-local setmetatable = setmetatable

 
 -- Calendar notification
 -- lain.widgets.calendar
 
 -- Calendar notification
 -- lain.widgets.calendar


@@ -68,7 +67,7 @@ function calendar.show(t_out, inc_offset, scr)
         calendar.notification_preset.screen = src or 1
     end
 
         calendar.notification_preset.screen = src or 1
     end
 

-    async(string.format("%s -c '%s'", awful.util.shell, f), function(ws)
+    async(f, function(ws)

         fg, bg = calendar.notification_preset.fg, calendar.notification_preset.bg
         ws = ws:gsub("%c%[7m%d+%c%[27m", markup.bold(markup.color(bg, fg, today)))
         calendar.notification = naughty.notify({
         fg, bg = calendar.notification_preset.fg, calendar.notification_preset.bg
         ws = ws:gsub("%c%[7m%d+%c%[27m", markup.bold(markup.color(bg, fg, today)))
         calendar.notification = naughty.notify({


@@ -94,16 +93,18 @@ function calendar.attach(widget, args)
         calendar.notification_preset.bg   = "#000000"
     end
 
         calendar.notification_preset.bg   = "#000000"
     end
 

-    widget:connect_signal("mouse::enter", function () calendar.show(0, 0, calendar.scr_pos) end)
-    widget:connect_signal("mouse::leave", function () calendar.hide() end)
-    widget:buttons(awful.util.table.join(awful.button({ }, 1, function ()
-                                             calendar.show(0, -1, calendar.scr_pos) end),
-                                         awful.button({ }, 3, function ()
-                                             calendar.show(0, 1, calendar.scr_pos) end),
-                                         awful.button({ }, 4, function ()
-                                             calendar.show(0, -1, calendar.scr_pos) end),
-                                         awful.button({ }, 5, function ()
-                                             calendar.show(0, 1, calendar.scr_pos) end)))
+    if widget then
+        widget:connect_signal("mouse::enter", function () calendar.show(0) end)
+        widget:connect_signal("mouse::leave", function () calendar.hide() end)
+        widget:buttons(awful.util.table.join(awful.button({ }, 1, function ()
+                                                 calendar.show(0, -1, calendar.scr_pos) end),
+                                             awful.button({ }, 3, function ()
+                                                 calendar.show(0, 1, calendar.scr_pos) end),
+                                             awful.button({ }, 4, function ()
+                                                 calendar.show(0, -1, calendar.scr_pos) end),
+                                             awful.button({ }, 5, function ()
+                                                 calendar.show(0, 1, calendar.scr_pos) end)))
+    end

 end
 
 end
 

-return setmetatable(calendar, { __call = function(_, ...) return create(...) end })
+return calendar