From 1a5685ee45b1399c37697ece32923daa7fd24db7 Mon Sep 17 00:00:00 2001 From: Emmanuel Lepage Vallee Date: Fri, 5 Apr 2019 22:16:44 -0400 Subject: [PATCH 1/2] naughty: Require `naughty.action` by default. Fixes #2730 --- lib/naughty/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/naughty/init.lua b/lib/naughty/init.lua index 7b732554..2a096df5 100644 --- a/lib/naughty/init.lua +++ b/lib/naughty/init.lua @@ -9,6 +9,7 @@ if dbus then naughty.dbus = require("naughty.dbus") end +naughty.action = require("naughty.action") naughty.layout = require("naughty.layout") naughty.notification = require("naughty.notification") From dce1830b897fd37d7cf3e80e0d43330a9abb7e1a Mon Sep 17 00:00:00 2001 From: Emmanuel Lepage Vallee Date: Fri, 5 Apr 2019 22:19:05 -0400 Subject: [PATCH 2/2] naughty: Fix a rebase mistake when using actions. Some older revisions called it `trigger` instead of `invoke`. Apparently some rebase conflicts introduced the old name in merged code. See #2729 --- lib/naughty/layout/legacy.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/naughty/layout/legacy.lua b/lib/naughty/layout/legacy.lua index e1162061..04caa4ec 100644 --- a/lib/naughty/layout/legacy.lua +++ b/lib/naughty/layout/legacy.lua @@ -400,8 +400,8 @@ function naughty.default_notification_handler(notification, args) local action_width = w + 2 * margin actionmarginbox:buttons(gtable.join( - button({ }, 1, function() action:trigger() end), - button({ }, 3, function() action:trigger() end) + button({ }, 1, function() action:invoke() end), + button({ }, 3, function() action:invoke() end) )) actionslayout:add(actionmarginbox)