Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1169 from Elv13/fix_prompt_deprecation_warnings 

Fix prompt deprecation warnings
This commit is contained in:
Emmanuel Lepage Vallée 2016-10-12 15:52:15 -04:00 committed by GitHub
parent e0018dc02a 07f3a178fa
commit 6b90ed7e73
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/awful/widget/prompt.lua
View File

@ -20,13 +20,15 @@ local widgetprompt = { mt = {} }
--
-- @param promptbox The promptbox to run.
local function run(promptbox)
return prompt.run({ prompt = promptbox.prompt },
promptbox.widget,
function (...)
promptbox:spawn_and_handle_error(...)
end,
completion.shell,
util.get_cache_dir() .. "/history")
return prompt.run {
prompt = promptbox.prompt,
textbox = promptbox.widget,
completion_callback = completion.shell,
history_path = util.get_cache_dir() .. "/history",
exe_callback = function (...)
promptbox:spawn_and_handle_error(...)
end,
}
end
local function spawn_and_handle_error(self, ...)

20
lib/menubar/init.lua
View File

@ -440,15 +440,17 @@ function menubar.show(scr)
menulist_update(nil, scr)
local prompt_args = menubar.prompt_args or {}
prompt_args.prompt = "Run: "
awful.prompt.run(prompt_args, instance.prompt.widget,
function() end, -- exe_callback function set to do nothing
awful.completion.shell, -- completion_callback
awful.util.get_cache_dir() .. "/history_menu",
nil,
menubar.hide, function(query) menulist_update(query, scr) end,
prompt_keypressed_callback
)
awful.prompt.run(setmetatable({
prompt = "Run: ",
textbox = instance.prompt.widget,
completion_callback = awful.completion.shell,
history_path = awful.util.get_cache_dir() .. "/history_menu",
done_callback = menubar.hide,
changed_callback = function(query) menulist_update(query, scr) end,
keypressed_callback = prompt_keypressed_callback
}, {__index=prompt_args}))
instance.wibox.visible = true
end