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

close the .desktop file after parsing it

Browse source
This commit is contained in:
Dana Jansens 2010-03-24 21:58:32 -04:00
parent 159a3cb3b1
commit 448cc6620e
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
obt/ddfile.c
View file

@ -343,6 +343,7 @@ ObtDDFile* obt_ddfile_new_from_file(const gchar *name, GSList *paths)
ObtDDParse parse;
GSList *it;
FILE *f;
gboolean success;
dd = g_slice_new(ObtDDFile);
dd->ref = 1;
@ -350,23 +351,23 @@ ObtDDFile* obt_ddfile_new_from_file(const gchar *name, GSList *paths)
parse.filename = NULL;
parse.lineno = 0;
parse.group = NULL;
/* hashtable keys are group names, value is a ObtDDParseGroup */
parse.group_hash = g_hash_table_new_full(g_str_hash,
g_str_equal,
NULL,
(GDestroyNotify)group_free);
f = NULL;
for (it = paths; it && !f; it = g_slist_next(it)) {
success = FALSE;
for (it = paths; it && !success; it = g_slist_next(it)) {
gchar *path = g_strdup_printf("%s/%s", (char*)it->data, name);
if ((f = fopen(path, "r"))) {
parse.filename = path;
parse.lineno = 1;
if (!parse_file(dd, f, &parse)) f = NULL;
success = parse_file(dd, f, &parse);
fclose(f);
}
g_free(path);
}
if (!f) {
if (!success) {
obt_ddfile_unref(dd);
dd = NULL;
}