From: copycat-killer Date: Sun, 29 Jan 2017 12:48:25 +0000 (+0100) Subject: #289 fix attempt X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/2e5d0fbabcdaaeff9937c06e1db095569327957b?ds=inline;hp=-c #289 fix attempt --- 2e5d0fbabcdaaeff9937c06e1db095569327957b diff --git a/widgets/calendar.lua b/widgets/calendar.lua index fbf8194..0793bc0 100644 --- a/widgets/calendar.lua +++ b/widgets/calendar.lua @@ -22,7 +22,9 @@ local setmetatable = setmetatable local calendar = { offset = 0 } function calendar.hide() - naughty.destroy(naughty.getById(calendar.id)) + if not calendar.notification then return end + naughty.destroy(calendar.notification) + calendar.notification = nil end function calendar.show(t_out, inc_offset, scr) @@ -68,13 +70,12 @@ function calendar.show(t_out, inc_offset, scr) fg, bg = calendar.notification_preset.fg, calendar.notification_preset.bg ws = ws:gsub("%c%[%d+[m]?%d+%c%[%d+[m]?", markup.bold(markup.color(bg, fg, today))) calendar.hide() - calendar.id = naughty.notify({ - replaces_id = calendar.id, + calendar.notification = naughty.notify({ preset = calendar.notification_preset, text = ws:gsub("\n*$", ""), icon = calendar.notify_icon, - timeout = t_out or calendar.notification.preset.timeout or 5 - }).id + timeout = t_out or calendar.notification_preset.timeout or 5 + }) end) end diff --git a/wiki b/wiki index 52bb0c1..eb6bd5b 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 52bb0c1757addd08ca4de6b7c02444b32a9497ef +Subproject commit eb6bd5b9ca0b333864322bcb585b53dc6b026199