1) translate all of openbox's output

[chaz/openbox] / parser / parse.c

diff --git a/parser/parse.c b/parser/parse.c
index 552221caf9e5128043253336faecc6442f3f59d1..011808fb0d3a8ab16656af775391eea1880db243 100644 (file)
--- a/parser/parse.c
+++ b/parser/parse.c
@@ -68,7 +68,7 @@ void parse_register(ObParseInst *i, const gchar *tag,
     struct Callback *c;
 
     if ((c = g_hash_table_lookup(i->callbacks, tag))) {
-        g_warning("Tag '%s' already registered", tag);
+        g_error("Tag '%s' already registered", tag);
         return;
     }
 
@@ -87,11 +87,12 @@ gboolean parse_load_rc(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root,
 
     *fileused = NULL;
 
-    for (it = xdg_config_dir_paths; !r && it; it = g_slist_next(it)) {
-        if (file) {
-            if ((r = parse_load(file, "openbox_config", doc, root)))
-                *fileused = g_strdup(file);
-        } else {
+    if (file) {
+        if ((r = parse_load(file, "openbox_config", doc, root)))
+            *fileused = g_strdup(file);
+    } else {
+        /* this won't run if the above code loaded a config */
+        for (it = xdg_config_dir_paths; !r && it; it = g_slist_next(it)) {
             gchar *path;
 
             path = g_build_filename(it->data, "openbox", "rc.xml", NULL);
@@ -101,8 +102,6 @@ gboolean parse_load_rc(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root,
                 g_free(path);
         }
     }
-    if (!r)
-        g_warning("Unable to find a valid config file, using defaults");
     return r;
 }
 
@@ -129,8 +128,6 @@ gboolean parse_load_theme(const gchar *name, xmlDocPtr *doc, xmlNodePtr *root,
             g_free(path);
         }
     }
-    if (!r)
-        g_warning("Unable to load the theme %s", name);
     return r;
 }
 
@@ -149,8 +146,6 @@ gboolean parse_load_menu(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root)
             g_free(path);
         }
     }
-    if (!r)
-        g_warning("Unable to find a valid menu file '%s'", file);
     return r;
 }
 
@@ -169,13 +164,13 @@ gboolean parse_load(const gchar *path, const gchar *rootname,
         if (!*root) {
             xmlFreeDoc(*doc);
             *doc = NULL;
-            g_warning("%s is an empty document", path);
+            g_message("%s is an empty document", path);
         } else {
             if (xmlStrcmp((*root)->name, (const xmlChar*)rootname)) {
                 xmlFreeDoc(*doc);
                 *doc = NULL;
-                g_warning("Document %s is of wrong type. root node is "
-                          "not '%s'", path, rootname);
+                g_message("XML Document %s is of wrong type. Root "
+                          "node is not '%s'", path, rootname);
             }
         }
     }
@@ -192,13 +187,13 @@ gboolean parse_load_mem(gpointer data, guint len, const gchar *rootname,
         if (!*root) {
             xmlFreeDoc(*doc);
             *doc = NULL;
-            g_warning("Given memory is an empty document");
+            g_message("Given memory is an empty document");
         } else {
             if (xmlStrcmp((*root)->name, (const xmlChar*)rootname)) {
                 xmlFreeDoc(*doc);
                 *doc = NULL;
-                g_warning("Document in given memory is of wrong type. root "
-                          "node is not '%s'", rootname);
+                g_message("XML Document in given memory is of wrong "
+                          "type. Root node is not '%s'\n", rootname);
             }
         }
     }
@@ -392,14 +387,14 @@ void parse_paths_startup()
     if (path && path[0] != '\0') /* not unset or empty */
         xdg_config_dir_paths = split_paths(path);
     else {
+        xdg_config_dir_paths = slist_path_add(xdg_config_dir_paths,
+                                              g_strdup(CONFIGDIR),
+                                              (GSListFunc) g_slist_append);
         xdg_config_dir_paths = slist_path_add(xdg_config_dir_paths,
                                               g_build_filename
                                               (G_DIR_SEPARATOR_S,
                                                "etc", "xdg", NULL),
                                               (GSListFunc) g_slist_append);
-        xdg_config_dir_paths = slist_path_add(xdg_config_dir_paths,
-                                              g_strdup(CONFIGDIR),
-                                              (GSListFunc) g_slist_append);
     }
     xdg_config_dir_paths = slist_path_add(xdg_config_dir_paths,
                                           g_strdup(xdg_config_home_path),