mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-02 09:01:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

theme: don't try to load "themerc"s if theme_name is NULL

Browse source 
theme_name is NULL when <theme><name></name>...</theme> is in rc.xml
This commit is contained in:
Tomi Ollila 2025-01-07 22:23:14 +02:00 • committed by Hiroaki Yamamoto
parent 6496773fd1
commit 577c24306f
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/theme.c
View file

@ -1496,15 +1496,18 @@ theme_init(struct theme *theme, struct server *server, const char *theme_name)
*/
theme_builtin(theme, server);
/*
* Read
* - <data-dir>/share/themes/$theme_name/labwc/themerc
* - <data-dir>/share/themes/$theme_name/openbox-3/themerc
*/
struct wl_list paths;
paths_theme_create(&paths, theme_name, "themerc");
theme_read(theme, &paths);
paths_destroy(&paths);
if (theme_name) {
/*
* Read
* - <data-dir>/share/themes/$theme_name/labwc/themerc
* - <data-dir>/share/themes/$theme_name/openbox-3/themerc
*/
paths_theme_create(&paths, theme_name, "themerc");
theme_read(theme, &paths);
paths_destroy(&paths);
}
/* Read <config-dir>/labwc/themerc-override */
paths_config_create(&paths, "themerc-override");