calendar: fix async hanging notifications; closes #289

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

diff --git a/widgets/pulsebar.lua b/widgets/pulsebar.lua
index 284b88653ac2c9e2cbc574f55a74d55d81a5ccd1..5453b1f1b7ed203636ecfe72f20a27399c0a437d 100644 (file)
--- a/widgets/pulsebar.lua
+++ b/widgets/pulsebar.lua
@@ -51,8 +51,8 @@ local function worker(args)
     pulsebar.notifications = args.notification_preset
 
     if not pulsebar.notification_preset then
     pulsebar.notifications = args.notification_preset
 
     if not pulsebar.notification_preset then

-        pulsebar.notification_preset      = naughty.config.defaults
-        pulsebar.notification_preset.font = "Monospace 11"
+        pulsebar.notification_preset      = {}
+        pulsebar.notification_preset.font = "Monospace 10"

     end
 
     pulsebar.bar = wibox.widget {
     end
 
     pulsebar.bar = wibox.widget {


@@ -129,17 +129,19 @@ local function worker(args)
 
             if pulsebar.followtag then preset.screen = awful.screen.focused() end
 
 
             if pulsebar.followtag then preset.screen = awful.screen.focused() end
 

-            pulsebar.id = naughty.notify ({
-                replaces_id = pulsebar.id,
-                preset      = preset
-            }).id
+            if not pulsebar.notification then
+                pulsebar.notification = naughty.notify {
+                    preset  = preset,
+                    destroy = function() pulsebar.notification = nil end
+                }
+            else
+                naughty.replace_text(pulsebar.notification, preset.title, preset.text)
+                naughty.reset_timeout(pulsebar.notification, preset.timeout)
+            end

         end)
     end
 
         end)
     end
 

-
-    timer_id = string.format("pulsebar-%s", pulsebar.sink)
-
-    helpers.newtimer(timer_id, timeout, pulsebar.update)
+    helpers.newtimer(string.format("pulsebar-%s", pulsebar.sink), timeout, pulsebar.update)

 
     return pulsebar
 end
 
     return pulsebar
 end