summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
Diffstat (limited to 'openbox')
-rw-r--r--openbox/parse.c4
-rw-r--r--openbox/parse.y8
2 files changed, 6 insertions, 6 deletions
diff --git a/openbox/parse.c b/openbox/parse.c
index 488d34db..80a918cb 100644
--- a/openbox/parse.c
+++ b/openbox/parse.c
@@ -33,7 +33,7 @@ void parse_reg_section(char *section, ParseFunc func)
void parse_free_token(ParseToken *token)
{
- GSList *it;
+ GList *it;
switch (token->type) {
case TOKEN_STRING:
@@ -47,7 +47,7 @@ void parse_free_token(ParseToken *token)
parse_free_token(it->data);
g_free(it->data);
}
- g_slist_free(token->data.list);
+ g_list_free(token->data.list);
break;
case TOKEN_REAL:
case TOKEN_INTEGER:
diff --git a/openbox/parse.y b/openbox/parse.y
index 37bd3dc3..f8b0a044 100644
--- a/openbox/parse.y
+++ b/openbox/parse.y
@@ -13,7 +13,7 @@
char *identifier;
gboolean bool;
char character;
- GSList *list;
+ GList *list;
}
%{
@@ -89,12 +89,12 @@ listtokens:
listtokens listtoken { ParseToken *nt = g_new(ParseToken, 1);
nt->type = t.type;
nt->data = t.data;
- $$ = g_slist_append($1, nt);
+ $$ = g_list_append($1, nt);
}
- | token { ParseToken *nt = g_new(ParseToken, 1);
+ | listtoken { ParseToken *nt = g_new(ParseToken, 1);
nt->type = t.type;
nt->data = t.data;
- $$ = g_slist_append(NULL, nt);
+ $$ = g_list_append(NULL, nt);
}
;