X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=parser%2Fparse.c;h=933ca4bc7f56e24bd87c5c281e45f66247a0af46;hb=6a953c6a82e7b9f4a279070fd60035ef0375ba20;hp=510320b6a48f669fed2b8d7eeced857532df255b;hpb=c4e4760c41f10aae6af19a4363cb247c71edee4b;p=chaz%2Fopenbox diff --git a/parser/parse.c b/parser/parse.c index 510320b6..933ca4bc 100644 --- a/parser/parse.c +++ b/parser/parse.c @@ -1,4 +1,4 @@ -/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*- +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- parse.c for the Openbox window manager Copyright (c) 2003 Ben Jansens @@ -161,7 +161,7 @@ gboolean parse_load_mem(gpointer data, guint len, const char *rootname, void parse_close(xmlDocPtr doc) { - xmlFree(doc); + xmlFreeDoc(doc); } void parse_tree(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node) @@ -329,8 +329,8 @@ void parse_paths_startup() g_build_filename (G_DIR_SEPARATOR_S, "usr", "share", NULL)); - xdg_config_dir_paths = g_slist_append(xdg_config_dir_paths, - g_strdup(DATADIR)); + xdg_data_dir_paths = g_slist_append(xdg_data_dir_paths, + g_strdup(DATADIR)); } xdg_data_dir_paths = g_slist_prepend(xdg_data_dir_paths, xdg_data_home_path); @@ -348,6 +348,10 @@ void parse_paths_shutdown() g_free(it->data); g_slist_free(xdg_config_dir_paths); xdg_config_dir_paths = NULL; + for (it = xdg_data_dir_paths; it; it = g_slist_next(it)) + g_free(it->data); + g_slist_free(xdg_data_dir_paths); + xdg_data_dir_paths = NULL; } gchar *parse_expand_tilde(const gchar *f)