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;
}
*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);
g_free(path);
}
}
- if (!r)
- g_warning("Unable to find a valid config file, using defaults");
return r;
}
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),