diff options
Diffstat (limited to 'parser')
| -rw-r--r-- | parser/parse.c | 20 | ||||
| -rw-r--r-- | parser/parse.h | 2 |
2 files changed, 8 insertions, 14 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); } } } diff --git a/parser/parse.h b/parser/parse.h index 7039d8c4..7aba2e45 100644 --- a/parser/parse.h +++ b/parser/parse.h @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- parse.h for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by |