From: Dana Jansens Date: Sat, 2 Aug 2003 08:11:17 +0000 (+0000) Subject: look in theme dirs first, use the theme as the path as a last attempt only! X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=ede531da35b7ef5c91ae9bde531c35528bfad423;p=chaz%2Fopenbox look in theme dirs first, use the theme as the path as a last attempt only! --- diff --git a/render/theme.c b/render/theme.c index aa8054e8..ca3283a2 100644 --- a/render/theme.c +++ b/render/theme.c @@ -941,19 +941,19 @@ static XrmDatabase loaddb(RrTheme *theme, char *name) { 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))) theme->path = g_path_get_dirname(s); g_free(s); if (db == NULL) { - char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes", - name, "themerc", NULL); + char *s = g_build_filename(THEMEDIR, name, "themerc", NULL); if ((db = XrmGetFileDatabase(s))) theme->path = g_path_get_dirname(s); g_free(s); } if (db == NULL) { - char *s = g_build_filename(THEMEDIR, name, "themerc", NULL); + char *s = g_build_filename(name, "themerc", NULL); if ((db = XrmGetFileDatabase(s))) theme->path = g_path_get_dirname(s); g_free(s);