X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=parser%2Fparse.c;h=a335315ed24502e992d5fd6f938678aae2ad5a58;hb=b317f0140398308fce5fbd262ad99a290b54a449;hp=fb51feb8ff176306cd20ba3ba652c2c4d1b6e116;hpb=9ea78a4eb0255e8cca6258e5ceb4bfd3e9e9d59e;p=chaz%2Fopenbox

diff --git a/parser/parse.c b/parser/parse.c
index fb51feb8..a335315e 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;
         }
@@ -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) {
@@ -140,7 +136,7 @@ void parse_tree(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
 
 char *parse_string(xmlDocPtr doc, xmlNodePtr node)
 {
-    xmlChar *c = xmlNodeListGetString(doc, node->xmlChildrenNode, TRUE);
+    xmlChar *c = xmlNodeListGetString(doc, node->children, TRUE);
     char *s = g_strdup(c ? (char*)c : "");
     xmlFree(c);
     return s;
@@ -148,7 +144,7 @@ char *parse_string(xmlDocPtr doc, xmlNodePtr node)
 
 int parse_int(xmlDocPtr doc, xmlNodePtr node)
 {
-    xmlChar *c = xmlNodeListGetString(doc, node->xmlChildrenNode, TRUE);
+    xmlChar *c = xmlNodeListGetString(doc, node->children, TRUE);
     int i = atoi((char*)c);
     xmlFree(c);
     return i;
@@ -156,7 +152,7 @@ int parse_int(xmlDocPtr doc, xmlNodePtr node)
 
 gboolean parse_bool(xmlDocPtr doc, xmlNodePtr node)
 {
-    xmlChar *c = xmlNodeListGetString(doc, node->xmlChildrenNode, TRUE);
+    xmlChar *c = xmlNodeListGetString(doc, node->children, TRUE);
     gboolean b = FALSE;
     if (!xmlStrcasecmp(c, (const xmlChar*) "true"))
         b = TRUE;
@@ -170,7 +166,7 @@ gboolean parse_bool(xmlDocPtr doc, xmlNodePtr node)
 
 gboolean parse_contains(const char *val, xmlDocPtr doc, xmlNodePtr node)
 {
-    xmlChar *c = xmlNodeListGetString(doc, node->xmlChildrenNode, TRUE);
+    xmlChar *c = xmlNodeListGetString(doc, node->children, TRUE);
     gboolean r;
     r = !xmlStrcasecmp(c, (const xmlChar*) val);
     xmlFree(c);