X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fsession.c;h=c38a8204ca018a238086d3ab852c23dccfcef501;hb=700b2c0aec0663249e39333b24de02f249f70267;hp=22b47e78e141aaf9298e246020d321f379e0e59b;hpb=fdabb69f4f25596df972caa76c85c2aeba26226e;p=chaz%2Fopenbox diff --git a/openbox/session.c b/openbox/session.c index 22b47e78..c38a8204 100644 --- a/openbox/session.c +++ b/openbox/session.c @@ -41,6 +41,7 @@ GList* session_state_find(struct _ObClient *c) { return NULL; } #include "focus.h" #include "gettext.h" #include "obt/parse.h" +#include "obt/paths.h" #include #include @@ -90,15 +91,18 @@ static void session_state_free(ObSessionState *state); void session_startup(gint argc, gchar **argv) { gchar *dir; + ObtPaths *p; if (!ob_sm_use) return; sm_argc = argc; sm_argv = argv; - dir = g_build_filename(parse_xdg_data_home_path(), - "openbox", "sessions", NULL); - if (!parse_mkdir_path(dir, 0700)) { + p = obt_paths_new(); + dir = g_build_filename(obt_paths_data_home(p), "openbox", "sessions",NULL); + obt_paths_unref(p), p = NULL; + + if (!obt_paths_mkdir_path(dir, 0700)) { g_message(_("Unable to make directory '%s': %s"), dir, g_strerror(errno)); } @@ -661,7 +665,7 @@ static void session_load_file(const gchar *path) obt_parse_instance_unref(i); return; } - node = obt_parse_instance_root(i); + node = obt_parse_root(i); if ((n = obt_parse_find_node(node->children, "desktop"))) session_desktop = obt_parse_node_int(n);