add the 'engine="box"' to the theme format, and require it to be there so we can...

[chaz/openbox] / parser / parse.c

diff --git a/parser/parse.c b/parser/parse.c
index 52ab920b7f50692a041369cc88ce3b115ac8e53c..167456509e63a44e983ba1660dfb0f4669700ef4 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;
     }
 
@@ -79,31 +79,26 @@ void parse_register(ObParseInst *i, const gchar *tag,
     g_hash_table_insert(i->callbacks, c->tag, c);
 }
 
-gboolean parse_load_rc(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root,
-                       gchar **fileused)
+gboolean parse_load_rc(const gchar *type, xmlDocPtr *doc, xmlNodePtr *root)
 {
     GSList *it;
     gboolean r = FALSE;
+    gchar *fname;
 
-    *fileused = NULL;
+    if (type == NULL)
+        fname = g_strdup("rc.xml");
+    else
+        fname = g_strdup_printf("rc-%s.xml", type);
 
-    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;
+    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);
-            if ((r = parse_load(path, "openbox_config", doc, root)))
-                *fileused = path;
-            else
-                g_free(path);
-        }
+        path = g_build_filename(it->data, "openbox", fname, NULL);
+        r = parse_load(path, "openbox_config", doc, root);
+        g_free(path);
     }
-    if (!r)
-        g_warning("Unable to find a valid config file, using defaults");
+    g_free(fname);
+
     return r;
 }
 
@@ -113,25 +108,38 @@ gboolean parse_load_theme(const gchar *name, xmlDocPtr *doc, xmlNodePtr *root,
     GSList *it;
     gchar *path;
     gboolean r = FALSE;
+    gchar *eng;
 
     /* backward compatibility.. */
     path = g_build_filename(g_get_home_dir(), ".themes", name,
                             "openbox-3", "themerc.xml", NULL);
-    if ((r = parse_load(path, "openbox_theme", doc, root)))
-        *retpath = g_path_get_dirname(path);
+    if (parse_load(path, "openbox_theme", doc, root) &&
+        parse_attr_string("engine", *root, &eng))
+    {
+        if (!strcmp(eng, "box")) {
+            *retpath = g_path_get_dirname(path);
+            r = TRUE;
+        }
+        g_free(eng);
+    }
     g_free(path);
 
     if (!r) {
         for (it = xdg_data_dir_paths; !r && it; it = g_slist_next(it)) {
             path = g_build_filename(it->data, "themes", name, "openbox-3",
                                     "themerc.xml", NULL);
-            if ((r = parse_load(path, "openbox_theme", doc, root)))
-                *retpath = g_path_get_dirname(path);
+            if (parse_load(path, "openbox_theme", doc, root) &&
+                parse_attr_string("engine", *root, &eng))
+            {
+                if (!strcmp(eng, "box")) {
+                    *retpath = g_path_get_dirname(path);
+                    r = TRUE;
+                }
+                g_free(eng);
+            }
             g_free(path);
         }
     }
-    if (!r)
-        g_warning("Unable to load the theme %s", name);
     return r;
 }
 
@@ -150,8 +158,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;
 }
 
@@ -170,13 +176,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);
             }
         }
     }
@@ -193,13 +199,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);
             }
         }
     }