diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-07-28 11:38:53 -0400 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-01-20 01:36:55 -0500 |
| commit | 07d5674d3984d008de1ecc768a296afbed731e4e (patch) | |
| tree | 4390ac212b5ad00430c6328972e0180808a7eb2e /render/theme.c | |
| parent | 1a0a1626b699c2e272ea6823b59aa7387242880e (diff) | |
move the xdg path stuff into obt/paths.[ch], and make render and openbox use it
Diffstat (limited to 'render/theme.c')
| -rw-r--r-- | render/theme.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/render/theme.c b/render/theme.c index 6118cdf9..87f264d1 100644 --- a/render/theme.c +++ b/render/theme.c @@ -23,7 +23,7 @@ #include "mask.h" #include "theme.h" #include "icon.h" -#include "obt/parse.h" +#include "obt/paths.h" #include <X11/Xlib.h> #include <X11/Xresource.h> @@ -1559,6 +1559,10 @@ static XrmDatabase loaddb(const gchar *name, gchar **path) *path = g_path_get_dirname(s); g_free(s); } else { + ObtPaths *p; + + p = obt_paths_new(); + /* XXX backwards compatibility, remove me sometime later */ s = g_build_filename(g_get_home_dir(), ".themes", name, "openbox-3", "themerc", NULL); @@ -1566,8 +1570,7 @@ static XrmDatabase loaddb(const gchar *name, gchar **path) *path = g_path_get_dirname(s); g_free(s); - for (it = parse_xdg_data_dir_paths(); !db && it; - it = g_slist_next(it)) + for (it = obt_paths_data_dirs(p); !db && it; it = g_slist_next(it)) { s = g_build_filename(it->data, "themes", name, "openbox-3", "themerc", NULL); @@ -1575,6 +1578,8 @@ static XrmDatabase loaddb(const gchar *name, gchar **path) *path = g_path_get_dirname(s); g_free(s); } + + obt_paths_unref(p); } if (db == NULL) { |