add pressed bitmaps. rename stick bitmaps to desk

[chaz/openbox] / parser / parse.c

diff --git a/parser/parse.c b/parser/parse.c
index 2b81594adcf38032682c6c0aa96f4e1d61631684..48db4ecd2acdcc62c2eefcd4402940ee801beced 100644 (file)
--- a/parser/parse.c
+++ b/parser/parse.c
@@ -59,7 +59,7 @@ gboolean parse_load_rc(xmlDocPtr *doc, xmlNodePtr *root)
     }
     g_free(path);
     if (!r)
-        g_message("unable to find a valid config file, using defaults");
+        g_warning("unable to find a valid config file, using defaults");
     return r;
 }
 
@@ -100,7 +100,7 @@ void parse_tree(xmlDocPtr doc, xmlNodePtr node, void *nothing)
         struct Callback *c = g_hash_table_lookup(callbacks, node->name);
 
         if (c)
-            c->func(doc, node->xmlChildrenNode, c->data);
+            c->func(doc, node, c->data);
 
         node = node->next;
     }
@@ -109,7 +109,7 @@ void parse_tree(xmlDocPtr doc, xmlNodePtr node, void *nothing)
 char *parse_string(xmlDocPtr doc, xmlNodePtr node)
 {
     xmlChar *c = xmlNodeListGetString(doc, node->xmlChildrenNode, TRUE);
-    char *s = g_strdup((char*)c);
+    char *s = g_strdup(c ? (char*)c : "");
     xmlFree(c);
     return s;
 }