separate window and screen snapping so only one or the other can be used

[chaz/openbox] / parser / parse.c

diff --git a/parser/parse.c b/parser/parse.c
index fb51feb8ff176306cd20ba3ba652c2c4d1b6e116..75bc3a3da3a6595cf8ff11c26576f539d8d044fd 100644 (file)
--- 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;
         }
@@ -74,8 +74,6 @@ gboolean parse_load_rc(xmlDocPtr *doc, xmlNodePtr *root)
 gboolean parse_load(const char *path, const char *rootname,
                     xmlDocPtr *doc, xmlNodePtr *root)
 {
-    xmlLineNumbersDefault(1);
-
     if ((*doc = xmlParseFile(path))) {
         *root = xmlDocGetRootElement(*doc);
         if (!*root) {
@@ -99,8 +97,6 @@ gboolean parse_load(const char *path, const char *rootname,
 gboolean parse_load_mem(gpointer data, guint len, const char *rootname,
                         xmlDocPtr *doc, xmlNodePtr *root)
 {
-    xmlLineNumbersDefault(1);
-
     if ((*doc = xmlParseMemory(data, len))) {
         *root = xmlDocGetRootElement(*doc);
         if (!*root) {