char *path;
gboolean r = FALSE;
- path = g_build_filename(g_get_home_dir(), ".openbox", "rc3", NULL);
+ path = g_build_filename(g_get_home_dir(), ".openbox", "rc.xml", NULL);
if (parse_load(path, "openbox_config", doc, root)) {
r = TRUE;
} else {
g_free(path);
- path = g_build_filename(RCDIR, "rc3", NULL);
+ path = g_build_filename(RCDIR, "rc.xml", NULL);
if (parse_load(path, "openbox_config", doc, root)) {
r = TRUE;
}
gboolean parse_load(const char *path, const char *rootname,
xmlDocPtr *doc, xmlNodePtr *root)
{
- xmlLineNumbersDefault(1);
-
if ((*doc = xmlParseFile(path))) {
*root = xmlDocGetRootElement(*doc);
if (!*root) {
gboolean parse_load_mem(gpointer data, guint len, const char *rootname,
xmlDocPtr *doc, xmlNodePtr *root)
{
- xmlLineNumbersDefault(1);
-
if ((*doc = xmlParseMemory(data, len))) {
*root = xmlDocGetRootElement(*doc);
if (!*root) {
char *parse_string(xmlDocPtr doc, xmlNodePtr node)
{
- xmlChar *c = xmlNodeListGetString(doc, node->xmlChildrenNode, TRUE);
+ xmlChar *c = xmlNodeListGetString(doc, node->children, TRUE);
char *s = g_strdup(c ? (char*)c : "");
xmlFree(c);
return s;
int parse_int(xmlDocPtr doc, xmlNodePtr node)
{
- xmlChar *c = xmlNodeListGetString(doc, node->xmlChildrenNode, TRUE);
+ xmlChar *c = xmlNodeListGetString(doc, node->children, TRUE);
int i = atoi((char*)c);
xmlFree(c);
return i;
gboolean parse_bool(xmlDocPtr doc, xmlNodePtr node)
{
- xmlChar *c = xmlNodeListGetString(doc, node->xmlChildrenNode, TRUE);
+ xmlChar *c = xmlNodeListGetString(doc, node->children, TRUE);
gboolean b = FALSE;
if (!xmlStrcasecmp(c, (const xmlChar*) "true"))
b = TRUE;
gboolean parse_contains(const char *val, xmlDocPtr doc, xmlNodePtr node)
{
- xmlChar *c = xmlNodeListGetString(doc, node->xmlChildrenNode, TRUE);
+ xmlChar *c = xmlNodeListGetString(doc, node->children, TRUE);
gboolean r;
r = !xmlStrcasecmp(c, (const xmlChar*) val);
xmlFree(c);