nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

look in theme dirs first, use the theme as the path as a last attempt only!

Browse source
This commit is contained in:
Dana Jansens 2003-08-02 08:11:17 +00:00
parent 441041d17d
commit ede531da35
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
render/theme.c
View file

@ -941,19 +941,19 @@ static XrmDatabase loaddb(RrTheme *theme, char *name)
{ {
XrmDatabase db; XrmDatabase db;
char *s = g_build_filename(name, "themerc", NULL); char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
name, "themerc", NULL);
if ((db = XrmGetFileDatabase(s))) if ((db = XrmGetFileDatabase(s)))
theme->path = g_path_get_dirname(s); theme->path = g_path_get_dirname(s);
g_free(s); g_free(s);
if (db == NULL) { if (db == NULL) {
char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes", char *s = g_build_filename(THEMEDIR, name, "themerc", NULL);
name, "themerc", NULL);
if ((db = XrmGetFileDatabase(s))) if ((db = XrmGetFileDatabase(s)))
theme->path = g_path_get_dirname(s); theme->path = g_path_get_dirname(s);
g_free(s); g_free(s);
} }
if (db == NULL) { if (db == NULL) {
char *s = g_build_filename(THEMEDIR, name, "themerc", NULL); char *s = g_build_filename(name, "themerc", NULL);
if ((db = XrmGetFileDatabase(s))) if ((db = XrmGetFileDatabase(s)))
theme->path = g_path_get_dirname(s); theme->path = g_path_get_dirname(s);
g_free(s); g_free(s);