From: copycat-killer <dada@archlinux.info>
Date: Wed, 25 Jan 2017 18:41:06 +0000 (+0100)
Subject: Merge branch 'awesome-v4-layout-fix' of https://github.com/Veratil/lain into Veratil... 
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/52b132d65ab6fbef617261f1445afacee9955c0e?hp=5318966270d86d52a2b9d7244b9336544a946d85

Merge branch 'awesome-v4-layout-fix' of https://github.com/Veratil/lain into Veratil-awesome-v4-layout-fix
---

diff --git a/helpers.lua b/helpers.lua
index 7c44648..106978f 100644
--- a/helpers.lua
+++ b/helpers.lua
@@ -180,9 +180,10 @@ end
 -- create a textbox with no spacing issues
 function helpers.make_widget_textbox()
     local w = wibox.widget.textbox()
-    local t = wibox.widget.base.make_widget(w)
-    t.widget = w
-    return t
+    --local t = wibox.widget.base.make_widget(w)
+    --t.widget = w
+    --return t
+    return setmetatable({ widget = w }, { __index = w })
 end
 
 -- }}}
diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index 90c60b4..628e838 100644
--- a/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@ -126,7 +126,6 @@ local function worker(args)
                 }
             else
                 naughty.replace_text(alsabar.notification, preset.title, preset.text)
-                naughty.reset_timeout(alsabar.notification, preset.timeout)
             end
         end)
     end
diff --git a/widgets/pulsebar.lua b/widgets/pulsebar.lua
index 5453b1f..c75ad4a 100644
--- a/widgets/pulsebar.lua
+++ b/widgets/pulsebar.lua
@@ -136,7 +136,6 @@ local function worker(args)
                 }
             else
                 naughty.replace_text(pulsebar.notification, preset.title, preset.text)
-                naughty.reset_timeout(pulsebar.notification, preset.timeout)
             end
         end)
     end