summaryrefslogtreecommitdiff
path: root/parser/parse.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-04-23 17:56:35 +0000
committerDana Jansens <danakj@orodu.net>2007-04-23 17:56:35 +0000
commit2442cdfd85e5229c7ee4ac49ca66a7d55ffcb919 (patch)
treef651e82bc6e640e21e12f7eb7a2f84870850382e /parser/parse.c
parentea088eb88d7c29558fa59563a934545bc122d5eb (diff)
1) translate all of openbox's output
2) update copyrights. 3) make release. ok that part not quite yet.
Diffstat (limited to 'parser/parse.c')
-rw-r--r--parser/parse.c20
1 files changed, 7 insertions, 13 deletions
diff --git a/parser/parse.c b/parser/parse.c
index 52ab920b..011808fb 100644
--- 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;
}
@@ -102,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;
}
@@ -130,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;
}
@@ -150,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;
}
@@ -170,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);
}
}
}
@@ -193,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);
}
}
}