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

menubar.icon_theme: use GLib.build_filenamev to join paths 

This eliminates double slashes from the resulting paths.
`GLib.get_system_data_dirs` might return paths with and without trailing
slashes.
This commit is contained in:
Daniel Hahler 2015-10-11 12:35:14 +02:00
parent e93ce7c2a8
commit 765a5f5790
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/menubar/icon_theme.lua
View File

@ -51,18 +51,18 @@ end
local get_pragmatic_base_directories = function() local get_pragmatic_base_directories = function()
local dirs = {} local dirs = {}
local dir = GLib.get_home_dir() .. "/.icons" local dir = GLib.build_filenamev({GLib.get_home_dir(), ".icons"})
if is_readable_directory(dir) then if is_readable_directory(dir) then
table.insert(dirs, dir) table.insert(dirs, dir)
end end
dir = GLib.get_user_data_dir() .. "/icons" dir = GLib.build_filenamev({GLib.get_user_data_dir(), "icons"})
if is_readable_directory(dir) then if is_readable_directory(dir) then
table.insert(dirs, dir) table.insert(dirs, dir)
end end
for _, v in ipairs(GLib.get_system_data_dirs()) do for _, v in ipairs(GLib.get_system_data_dirs()) do
dir = v .. "/icons" dir = GLib.build_filenamev({v, "icons"})
if is_readable_directory(dir) then if is_readable_directory(dir) then
table.insert(dirs, dir) table.insert(dirs, dir)
end end
@ -70,7 +70,7 @@ local get_pragmatic_base_directories = function()
local need_usr_share_pixmaps = true local need_usr_share_pixmaps = true
for _, v in ipairs(GLib.get_system_data_dirs()) do for _, v in ipairs(GLib.get_system_data_dirs()) do
dir = v .. "/pixmaps" dir = GLib.build_filenamev({v, "pixmaps"})
if is_readable_directory(dir) then if is_readable_directory(dir) then
table.insert(dirs, dir) table.insert(dirs, dir)
end end