mirror of
https://github.com/labwc/labwc.git
synced 2025-11-03 09:01:51 -05:00
theme: don't try to load "themerc"s if theme_name is NULL
theme_name is NULL when <theme><name></name>...</theme> is in rc.xml
This commit is contained in:
parent
6496773fd1
commit
577c24306f
1 changed files with 11 additions and 8 deletions
|
|
@ -1496,15 +1496,18 @@ theme_init(struct theme *theme, struct server *server, const char *theme_name)
|
||||||
*/
|
*/
|
||||||
theme_builtin(theme, server);
|
theme_builtin(theme, server);
|
||||||
|
|
||||||
|
struct wl_list paths;
|
||||||
|
|
||||||
|
if (theme_name) {
|
||||||
/*
|
/*
|
||||||
* Read
|
* Read
|
||||||
* - <data-dir>/share/themes/$theme_name/labwc/themerc
|
* - <data-dir>/share/themes/$theme_name/labwc/themerc
|
||||||
* - <data-dir>/share/themes/$theme_name/openbox-3/themerc
|
* - <data-dir>/share/themes/$theme_name/openbox-3/themerc
|
||||||
*/
|
*/
|
||||||
struct wl_list paths;
|
|
||||||
paths_theme_create(&paths, theme_name, "themerc");
|
paths_theme_create(&paths, theme_name, "themerc");
|
||||||
theme_read(theme, &paths);
|
theme_read(theme, &paths);
|
||||||
paths_destroy(&paths);
|
paths_destroy(&paths);
|
||||||
|
}
|
||||||
|
|
||||||
/* Read <config-dir>/labwc/themerc-override */
|
/* Read <config-dir>/labwc/themerc-override */
|
||||||
paths_config_create(&paths, "themerc-override");
|
paths_config_create(&paths, "themerc-override");
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue