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;
}
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;
}
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;
}
g_free(path);
}
}
- if (!r)
- g_warning("Unable to find a valid menu file '%s'", file);
return r;
}
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);
}
}
}
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);
}
}
}
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),
if (path && path[0] != '\0') /* not unset or empty */
xdg_data_dir_paths = split_paths(path);
else {
+ xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths,
+ g_strdup(DATADIR),
+ (GSListFunc) g_slist_append);
xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths,
g_build_filename
(G_DIR_SEPARATOR_S,
(G_DIR_SEPARATOR_S,
"usr", "share", NULL),
(GSListFunc) g_slist_append);
- xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths,
- g_strdup(DATADIR),
- (GSListFunc) g_slist_append);
}
xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths,
g_strdup(xdg_data_home_path),