]> git.madduck.net Git - etc/awesome.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

#289 fix attempt
authorcopycat-killer <dada@archlinux.info>
Sun, 29 Jan 2017 12:48:25 +0000 (13:48 +0100)
committercopycat-killer <dada@archlinux.info>
Sun, 29 Jan 2017 12:48:25 +0000 (13:48 +0100)
widgets/calendar.lua
wiki

index fbf8194fe0e86961d9a5a39492b132b9f9fad157..0793bc0e2f056cb889f56288d237008fa29318af 100644 (file)
@@ -22,7 +22,9 @@ local setmetatable = setmetatable
 local calendar = { offset = 0 }
 
 function calendar.hide()
 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)
 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()
         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,
             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
 
     end)
 end
 
diff --git a/wiki b/wiki
index 52bb0c1757addd08ca4de6b7c02444b32a9497ef..eb6bd5b9ca0b333864322bcb585b53dc6b026199 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 52bb0c1757addd08ca4de6b7c02444b32a9497ef
+Subproject commit eb6bd5b9ca0b333864322bcb585b53dc6b026199