summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--data/rc.xml (renamed from data/rc3)0
-rw-r--r--parser/parse.c4
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 96f3cb19..1465e50f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -258,7 +258,7 @@ dist_thebear_theme_DATA = \
## data ##
dist_rc_DATA = \
- data/rc3 \
+ data/rc.xml \
data/menu
dist_desktopfiles_DATA = \
diff --git a/data/rc3 b/data/rc.xml
index af348774..af348774 100644
--- a/data/rc3
+++ b/data/rc.xml
diff --git a/parser/parse.c b/parser/parse.c
index 8ae2ec93..75bc3a3d 100644
--- a/parser/parse.c
+++ b/parser/parse.c
@@ -55,12 +55,12 @@ gboolean parse_load_rc(xmlDocPtr *doc, xmlNodePtr *root)
char *path;
gboolean r = FALSE;
- path = g_build_filename(g_get_home_dir(), ".openbox", "rc3", NULL);
+ path = g_build_filename(g_get_home_dir(), ".openbox", "rc.xml", NULL);
if (parse_load(path, "openbox_config", doc, root)) {
r = TRUE;
} else {
g_free(path);
- path = g_build_filename(RCDIR, "rc3", NULL);
+ path = g_build_filename(RCDIR, "rc.xml", NULL);
if (parse_load(path, "openbox_config", doc, root)) {
r = TRUE;
}