awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

naughty: Follow textbox API change 

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2016-01-17 16:51:07 +01:00
parent b3ab06896d
commit e7a8df2920
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/naughty/core.lua
View File

@ -350,7 +350,7 @@ local function set_text(notification, title, text)
local textbox = notification.textbox local textbox = notification.textbox
local function setMarkup(pattern, replacements) local function setMarkup(pattern, replacements)
textbox:set_markup(string.format('<b>%s</b>%s', title, text:gsub(pattern, replacements))) return textbox:set_markup_silently(string.format('<b>%s</b>%s', title, text:gsub(pattern, replacements)))
end end
local function setText() local function setText()
textbox:set_text(string.format('%s %s', title, text)) textbox:set_text(string.format('%s %s', title, text))
@ -360,10 +360,9 @@ local function set_text(notification, title, text)
-- it is not interpreted by Pango later. -- it is not interpreted by Pango later.
title = title:gsub(escape_pattern, escape_subs) title = title:gsub(escape_pattern, escape_subs)
-- Try to set the text while only interpreting <br>. -- Try to set the text while only interpreting <br>.
-- (Setting a textbox' .text to an invalid pattern throws a lua error) if not setMarkup("<br.->", "\n") then
if not pcall(setMarkup, "<br.->", "\n") then
-- That failed, escape everything which might cause an error from pango -- That failed, escape everything which might cause an error from pango
if not pcall(setMarkup, escape_pattern, escape_subs) then if not setMarkup(escape_pattern, escape_subs) then
-- Ok, just ignore all pango markup. If this fails, we got some invalid utf8 -- Ok, just ignore all pango markup. If this fails, we got some invalid utf8
if not pcall(setText) then if not pcall(setText) then
textbox:set_markup("<i>&lt;Invalid markup or UTF8, cannot display message&gt;</i>") textbox:set_markup("<i>&lt;Invalid markup or UTF8, cannot display message&gt;</i>")