Commit 6dfa71c3 authored by Jonathan Riddell's avatar Jonathan Riddell 🏄

Merge branch 'master' into 'master'

fix icon theme handling with both directoried and scaledirectories

See merge request jriddell/kde-applications-appstream!4
parents 7b6b5eb9 d3dd1271
......@@ -127,10 +127,14 @@ module XDG
@parents = theme_config['Inherits'].split(',').collect { |x| self.class.new(x, extra_data_dirs: extra_data_dirs) }
end
@directories = theme_config['Directories']
@directories += theme_config['ScaledDirectories'] if theme_config['ScaledDirectories']
@directories = @directories.split(',').collect! do |x|
Directory.new(x, @config[x])
if theme_config['ScaledDirectories']
@directories += ',' + theme_config['ScaledDirectories']
end
@directories = @directories.split(',').collect do |path|
next if path.empty?
Directory.new(path, @config[path])
end.uniq
end
def valid?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment