--- navit/navit/xmlconfig.c	2012/01/06 08:52:23	26
+++ navit/navit/xmlconfig.c	2012/04/09 21:27:36	27
@@ -57,7 +57,7 @@
 const int xml_attr_distance=1;
 #else
 #include "ezxml.h"
-const int xml_attr_distance=2;
+const int xml_attr_distance = 2;
 #define ATTR_DISTANCE 2
 #define G_MARKUP_ERROR 0
 #define G_MARKUP_ERROR_INVALID_CONTENT 0
@@ -66,7 +66,8 @@
 typedef void * GMarkupParseContext;
 #endif
 
-struct xistate {
+struct xistate
+{
 	struct xistate *parent;
 	struct xistate *child;
 	const gchar *element;
@@ -74,7 +75,8 @@
 	const gchar **attribute_values;
 };
 
-struct xmldocument {
+struct xmldocument
+{
 	const gchar *href;
 	const gchar *xpointer;
 	gpointer user_data;
@@ -84,8 +86,8 @@
 	int level;
 };
 
-
-struct xmlstate {
+struct xmlstate
+{
 	const gchar **attribute_names;
 	const gchar **attribute_values;
 	struct xmlstate *parent;
@@ -97,80 +99,89 @@
 	struct xmldocument *document;
 };
 
-
-struct attr_fixme {
+struct attr_fixme
+{
 	char *element;
 	char **attr_fixme;
 };
 
 static struct attr ** convert_to_attrs(struct xmlstate *state, struct attr_fixme *fixme)
 {
-	const gchar **attribute_name=state->attribute_names;
-	const gchar **attribute_value=state->attribute_values;
+	const gchar **attribute_name = state->attribute_names;
+	const gchar **attribute_value = state->attribute_values;
 	const gchar *name;
-	int count=0;
+	int count = 0;
 	struct attr **ret;
 	static int fixme_count;
 
-	while (*attribute_name) {
+	while (*attribute_name)
+	{
 		count++;
 		attribute_name++;
-	}
-	ret=g_new(struct attr *, count+1);
-	attribute_name=state->attribute_names;
-	count=0;
-	while (*attribute_name) {
-		name=*attribute_name;
-		if (fixme) {
-			char **attr_fixme=fixme->attr_fixme;
-			while (attr_fixme[0]) {
-				if (! strcmp(name, attr_fixme[0])) {
-					name=attr_fixme[1];
+	}ret=g_new(struct attr *, count+1);
+	attribute_name = state->attribute_names;
+	count = 0;
+	while (*attribute_name)
+	{
+		name = *attribute_name;
+		if (fixme)
+		{
+			char **attr_fixme = fixme->attr_fixme;
+			while (attr_fixme[0])
+			{
+				if (!strcmp(name, attr_fixme[0]))
+				{
+					name = attr_fixme[1];
 					if (fixme_count++ < 10)
-						dbg(0,"Please change attribute '%s' to '%s' in <%s />\n", attr_fixme[0], attr_fixme[1], fixme->element);
+					{
+						//dbg(0,"Please change attribute '%s' to '%s' in <%s />\n",attr_fixme[0], attr_fixme[1], fixme->element);
+					}
 					break;
 				}
-				attr_fixme+=2;
+				attr_fixme += 2;
 			}
 		}
-		ret[count]=attr_new_from_text(name,*attribute_value);
+		ret[count] = attr_new_from_text(name, *attribute_value);
 		if (ret[count])
+		{
 			count++;
-		else if (strcmp(*attribute_name,"enabled") && strcmp(*attribute_name,"xmlns:xi"))
-			dbg(0,"failed to create attribute '%s' with value '%s'\n", *attribute_name,*attribute_value);
+		}
+		else if (strcmp(*attribute_name, "enabled") && strcmp(*attribute_name, "xmlns:xi"))
+		{
+			// dbg(0, "failed to create attribute '%s' with value '%s'\n", *attribute_name, *attribute_value);
+		}
 		attribute_name++;
 		attribute_value++;
 	}
-	ret[count]=NULL;
-	dbg(1,"ret=%p\n", ret);
+	ret[count] = NULL;
+	//dbg(1, "ret=%p\n", ret);
 	return ret;
 }
 
-
 static const char * find_attribute(struct xmlstate *state, const char *attribute, int required)
 {
-	const gchar **attribute_name=state->attribute_names;
-	const gchar **attribute_value=state->attribute_values;
-	while(*attribute_name) {
-		if(! g_ascii_strcasecmp(attribute,*attribute_name))
+	const gchar **attribute_name = state->attribute_names;
+	const gchar **attribute_value = state->attribute_values;
+	while (*attribute_name)
+	{
+		if (!g_ascii_strcasecmp(attribute, *attribute_name))
 			return *attribute_value;
 		attribute_name++;
 		attribute_value++;
 	}
 	if (required)
-		g_set_error(state->error,G_MARKUP_ERROR,G_MARKUP_ERROR_INVALID_CONTENT, "element '%s' is missing attribute '%s'", state->element, attribute);
+		g_set_error(state->error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, "element '%s' is missing attribute '%s'", state->element, attribute);
 	return NULL;
 }
 
-static int
-find_boolean(struct xmlstate *state, const char *attribute, int deflt, int required)
+static int find_boolean(struct xmlstate *state, const char *attribute, int deflt, int required)
 {
 	const char *value;
 
-	value=find_attribute(state, attribute, required);
-	if (! value)
+	value = find_attribute(state, attribute, required);
+	if (!value)
 		return deflt;
-	if (g_ascii_strcasecmp(value,"no") && g_ascii_strcasecmp(value,"0") && g_ascii_strcasecmp(value,"false"))
+	if (g_ascii_strcasecmp(value, "no") && g_ascii_strcasecmp(value, "0") && g_ascii_strcasecmp(value, "false"))
 		return 1;
 	return 0;
 }
@@ -181,42 +192,42 @@
  * * @param val the string value to convert
  * * @returns int value of converted string
  * */
-static int
-convert_number(const char *val)
+static int convert_number(const char *val)
 {
 	if (val)
-		return g_ascii_strtoull(val,NULL,0);
+		return g_ascii_strtoull(val, NULL, 0);
 	else
 		return 0;
 }
 
-static int
-xmlconfig_announce(struct xmlstate *state)
+static int xmlconfig_announce(struct xmlstate *state)
 {
-	const char *type,*value;
+	const char *type, *value;
 	char key[32];
 	int level[3];
 	int i;
 	enum item_type itype;
 	char *tok, *type_str, *str;
 
-	type=find_attribute(state, "type", 1);
-	if (! type)
+	type = find_attribute(state, "type", 1);
+	if (!type)
 		return 0;
-	for (i = 0 ; i < 3 ; i++) {
-		sprintf(key,"level%d", i);
-		value=find_attribute(state, key, 0);
+	for (i = 0; i < 3; i++)
+	{
+		sprintf(key, "level%d", i);
+		value = find_attribute(state, key, 0);
 		if (value)
-			level[i]=convert_number(value);
+			level[i] = convert_number(value);
 		else
-			level[i]=-1;
+			level[i] = -1;
 	}
-	type_str=g_strdup(type);
-	str=type_str;
-	while ((tok=strtok(str, ","))) {
-		itype=item_from_name(tok);
+	type_str = g_strdup(type);
+	str = type_str;
+	while ((tok = strtok(str, ",")))
+	{
+		itype = item_from_name(tok);
 		navigation_set_announce(state->parent->element_attr.u.data, itype, level);
-		str=NULL;
+		str = NULL;
 	}
 	g_free(type_str);
 	return 1;
@@ -236,52 +247,54 @@
 #define INIT(x) (int (*)(void *))(x)
 #define DESTROY(x) (void (*)(void *))(x)
 
-static struct object_func object_funcs[] = {
-	{ attr_announcement,NEW(announcement_new),  GET(announcement_get_attr), NULL, NULL, SET(announcement_set_attr), ADD(announcement_add_attr) },
-	{ attr_arrows,     NEW(arrows_new)},
-	{ attr_circle,     NEW(circle_new),   NULL, NULL, NULL, NULL, ADD(element_add_attr)},
-	{ attr_config,     NEW(config_new), GET(config_get_attr), ITERN(config_attr_iter_new), ITERD(config_attr_iter_destroy), SET(config_set_attr), ADD(config_add_attr), REMOVE(config_remove_attr), NULL, DESTROY(config_destroy)},
-	{ attr_coord,      NEW(coord_new_from_attrs)},
-	{ attr_cursor,     NEW(cursor_new),   NULL, NULL, NULL, NULL, ADD(cursor_add_attr)},
-	{ attr_debug,      NEW(debug_new)},
-	{ attr_graphics,   NEW(graphics_new)},
-	{ attr_gui,        NEW(gui_new), GET(gui_get_attr), NULL, NULL, SET(gui_set_attr), ADD(gui_add_attr)},
-	{ attr_icon,       NEW(icon_new),     NULL, NULL, NULL, NULL, ADD(element_add_attr)},
-	{ attr_image,      NEW(image_new)},
-	{ attr_itemgra,    NEW(itemgra_new),  NULL, NULL, NULL, NULL, ADD(itemgra_add_attr)},
-	{ attr_layer,      NEW(layer_new),    NULL, NULL, NULL, NULL, ADD(layer_add_attr)},
-	{ attr_layout,     NEW(layout_new),   NULL, NULL, NULL, NULL, ADD(layout_add_attr)},
-	{ attr_log,        NEW(log_new)},
-	{ attr_map,        NEW(map_new)},
-	{ attr_mapset,     NEW(mapset_new),   NULL, NULL, NULL, NULL, ADD(mapset_add_attr_name)},
-	{ attr_navigation, NEW(navigation_new), GET(navigation_get_attr)},
-	{ attr_navit,      NEW(navit_new), GET(navit_get_attr), ITERN(navit_attr_iter_new), ITERD(navit_attr_iter_destroy), SET(navit_set_attr), ADD(navit_add_attr), REMOVE(navit_remove_attr), INIT(navit_init), DESTROY(navit_destroy)},
-	{ attr_osd,        NEW(osd_new)},
-	{ attr_plugins,    NEW(plugins_new),  NULL, NULL, NULL, NULL, NULL, NULL, INIT(plugins_init)},
-	{ attr_plugin,     NEW(plugin_new)},
-	{ attr_polygon,    NEW(polygon_new),  NULL, NULL, NULL, NULL, ADD(element_add_attr)},
-	{ attr_polyline,   NEW(polyline_new), NULL, NULL, NULL, NULL, ADD(element_add_attr)},
-	{ attr_roadprofile,NEW(roadprofile_new),  GET(roadprofile_get_attr), NULL, NULL, SET(roadprofile_set_attr), ADD(roadprofile_add_attr) },
-	{ attr_route,      NEW(route_new), GET(route_get_attr), NULL, NULL, SET(route_set_attr), ADD(route_add_attr), REMOVE(route_remove_attr)},
-	{ attr_speech,     NEW(speech_new), GET(speech_get_attr), NULL, NULL, SET(speech_set_attr)},
-	{ attr_text,       NEW(text_new)},
-	{ attr_tracking,   NEW(tracking_new)},
-	{ attr_vehicle,    NEW(vehicle_new),  GET(vehicle_get_attr), NULL, NULL, SET(vehicle_set_attr), ADD(vehicle_add_attr), REMOVE(vehicle_remove_attr) },
-	{ attr_vehicleprofile, NEW(vehicleprofile_new),  GET(vehicleprofile_get_attr), NULL, NULL, SET(vehicleprofile_set_attr), ADD(vehicleprofile_add_attr) },
-};
+static struct object_func object_funcs[] =
+{
+{ attr_announcement, NEW(announcement_new), GET(announcement_get_attr), NULL, NULL, SET(announcement_set_attr), ADD(announcement_add_attr) },
+{ attr_arrows, NEW(arrows_new) },
+{ attr_circle, NEW(circle_new), NULL, NULL, NULL, NULL, ADD(element_add_attr) },
+{ attr_config, NEW(config_new), GET(config_get_attr), ITERN(config_attr_iter_new), ITERD(config_attr_iter_destroy), SET(config_set_attr), ADD(config_add_attr), REMOVE(config_remove_attr), NULL, DESTROY(config_destroy) },
+{ attr_coord, NEW(coord_new_from_attrs) },
+{ attr_cursor, NEW(cursor_new), NULL, NULL, NULL, NULL, ADD(cursor_add_attr) },
+{ attr_debug, NEW(debug_new) },
+{ attr_graphics, NEW(graphics_new) },
+{ attr_gui, NEW(gui_new), GET(gui_get_attr), NULL, NULL, SET(gui_set_attr), ADD(gui_add_attr) },
+{ attr_icon, NEW(icon_new), NULL, NULL, NULL, NULL, ADD(element_add_attr) },
+{ attr_image, NEW(image_new) },
+{ attr_itemgra, NEW(itemgra_new), NULL, NULL, NULL, NULL, ADD(itemgra_add_attr) },
+{ attr_layer, NEW(layer_new), NULL, NULL, NULL, NULL, ADD(layer_add_attr) },
+{ attr_layout, NEW(layout_new), NULL, NULL, NULL, NULL, ADD(layout_add_attr) },
+{ attr_log, NEW(log_new) },
+{ attr_map, NEW(map_new) },
+{ attr_mapset, NEW(mapset_new), NULL, NULL, NULL, NULL, ADD(mapset_add_attr_name) },
+{ attr_navigation, NEW(navigation_new), GET(navigation_get_attr) },
+{ attr_navit, NEW(navit_new), GET(navit_get_attr), ITERN(navit_attr_iter_new), ITERD(navit_attr_iter_destroy), SET(navit_set_attr), ADD(navit_add_attr), REMOVE(navit_remove_attr), INIT(navit_init), DESTROY(navit_destroy) },
+{ attr_osd, NEW(osd_new) },
+{ attr_plugins, NEW(plugins_new), NULL, NULL, NULL, NULL, NULL, NULL, INIT(plugins_init) },
+{ attr_plugin, NEW(plugin_new) },
+{ attr_polygon, NEW(polygon_new), NULL, NULL, NULL, NULL, ADD(element_add_attr) },
+{ attr_polyline, NEW(polyline_new), NULL, NULL, NULL, NULL, ADD(element_add_attr) },
+{ attr_roadprofile, NEW(roadprofile_new), GET(roadprofile_get_attr), NULL, NULL, SET(roadprofile_set_attr), ADD(roadprofile_add_attr) },
+{ attr_route, NEW(route_new), GET(route_get_attr), NULL, NULL, SET(route_set_attr), ADD(route_add_attr), REMOVE(route_remove_attr) },
+{ attr_speech, NEW(speech_new), GET(speech_get_attr), NULL, NULL, SET(speech_set_attr) },
+{ attr_text, NEW(text_new) },
+{ attr_tracking, NEW(tracking_new) },
+{ attr_vehicle, NEW(vehicle_new), GET(vehicle_get_attr), NULL, NULL, SET(vehicle_set_attr), ADD(vehicle_add_attr), REMOVE(vehicle_remove_attr) },
+{ attr_vehicleprofile, NEW(vehicleprofile_new), GET(vehicleprofile_get_attr), NULL, NULL, SET(vehicleprofile_set_attr), ADD(vehicleprofile_add_attr) }, };
 
 struct object_func *
 object_func_lookup(enum attr_type type)
 {
 	int i;
-	for (i = 0 ; i < sizeof(object_funcs)/sizeof(struct object_func); i++) {
+	for (i = 0; i < sizeof(object_funcs) / sizeof(struct object_func); i++)
+	{
 		if (object_funcs[i].type == type)
 			return &object_funcs[i];
 	}
 	return NULL;
 }
 
-struct element_func {
+struct element_func
+{
 	char *name;
 	char *parent;
 	int (*func)(struct xmlstate *state);
@@ -289,228 +302,219 @@
 };
 struct element_func *elements;
 
-static char *attr_fixme_itemgra[]={
-	"type","item_types",
-	NULL,NULL,
-};
+static char *attr_fixme_itemgra[] =
+{ "type", "item_types", NULL, NULL, };
 
-static char *attr_fixme_text[]={
-	"label_size","text_size",
-	NULL,NULL,
-};
-
-static char *attr_fixme_circle[]={
-	"label_size","text_size",
-	NULL,NULL,
-};
+static char *attr_fixme_text[] =
+{ "label_size", "text_size", NULL, NULL, };
 
-static struct attr_fixme attr_fixmes[]={
-	{"item",attr_fixme_itemgra},
-	{"itemgra",attr_fixme_itemgra},
-	{"text",attr_fixme_text},
-	{"label",attr_fixme_text},
-	{"circle",attr_fixme_circle},
-	{NULL,NULL},
-};
+static char *attr_fixme_circle[] =
+{ "label_size", "text_size", NULL, NULL, };
 
+static struct attr_fixme attr_fixmes[] =
+{
+{ "item", attr_fixme_itemgra },
+{ "itemgra", attr_fixme_itemgra },
+{ "text", attr_fixme_text },
+{ "label", attr_fixme_text },
+{ "circle", attr_fixme_circle },
+{ NULL, NULL }, };
 
-static char *element_fixmes[]={
-	"item","itemgra",
-	"label","text",
-	NULL,NULL,
-};
+static char *element_fixmes[] =
+{ "item", "itemgra", "label", "text", NULL, NULL, };
 
-static void initStatic(void) {
+static void initStatic(void)
+{
 	elements=g_new0(struct element_func,40); //39 is a number of elements + ending NULL element
 
-	elements[0].name="config";
-	elements[0].parent=NULL;
-	elements[0].func=NULL;
-	elements[0].type=attr_config;
-
-	elements[1].name="announce";
-	elements[1].parent="navigation";
-	elements[1].func=xmlconfig_announce;
-
-	elements[2].name="speech";
-	elements[2].parent="navit";
-	elements[2].func=NULL;
-	elements[2].type=attr_speech;
-
-	elements[3].name="tracking";
-	elements[3].parent="navit";
-	elements[3].func=NULL;
-	elements[3].type=attr_tracking;
-
-	elements[4].name="route";
-	elements[4].parent="navit";
-	elements[4].func=NULL;
-	elements[4].type=attr_route;
-
-	elements[5].name="mapset";
-	elements[5].parent="navit";
-	elements[5].func=NULL;
-	elements[5].type=attr_mapset;
-
-	elements[6].name="map";
-	elements[6].parent="mapset";
-	elements[6].func=NULL;
-	elements[6].type=attr_map;
-
-	elements[7].name="debug";
-	elements[7].parent="config";
-	elements[7].func=NULL;
-	elements[7].type=attr_debug;
-
-	elements[8].name="osd";
-	elements[8].parent="navit";
-	elements[8].func=NULL;
-	elements[8].type=attr_osd;
-
-	elements[9].name="navigation";
-	elements[9].parent="navit";
-	elements[9].func=NULL;
-	elements[9].type=attr_navigation;
-
-	elements[10].name="navit";
-	elements[10].parent="config";
-	elements[10].func=NULL;
-	elements[10].type=attr_navit;
-
-	elements[11].name="graphics";
-	elements[11].parent="navit";
-	elements[11].func=NULL;
-	elements[11].type=attr_graphics;
-
-	elements[12].name="gui";
-	elements[12].parent="navit";
-	elements[12].func=NULL;
-	elements[12].type=attr_gui;
-
-	elements[13].name="layout";
-	elements[13].parent="navit";
-	elements[13].func=NULL;
-	elements[13].type=attr_layout;
-
-	elements[14].name="cursor";
-	elements[14].parent="layout";
-	elements[14].func=NULL;
-	elements[14].type=attr_cursor;
-
-	elements[15].name="layer";
-	elements[15].parent="layout";
-	elements[15].func=NULL;
-	elements[15].type=attr_layer;
-
-	elements[16].name="itemgra";
-	elements[16].parent="layer";
-	elements[16].func=NULL;
-	elements[16].type=attr_itemgra;
-
-	elements[17].name="circle";
-	elements[17].parent="itemgra";
-	elements[17].func=NULL;
-	elements[17].type=attr_circle;
-
-	elements[18].name="coord";
-	elements[18].parent="circle";
-	elements[18].func=NULL;
-	elements[18].type=attr_coord;
-
-	elements[19].name="icon";
-	elements[19].parent="itemgra";
-	elements[19].func=NULL;
-	elements[19].type=attr_icon;
-
-	elements[20].name="coord";
-	elements[20].parent="icon";
-	elements[20].func=NULL;
-	elements[20].type=attr_coord;
-
-	elements[21].name="image";
-	elements[21].parent="itemgra";
-	elements[21].func=NULL;
-	elements[21].type=attr_image;
-
-	elements[22].name="text";
-	elements[22].parent="itemgra";
-	elements[22].func=NULL;
-	elements[22].type=attr_text;
-
-	elements[23].name="polygon";
-	elements[23].parent="itemgra";
-	elements[23].func=NULL;
-	elements[23].type=attr_polygon;
-
-	elements[24].name="coord";
-	elements[24].parent="polygon";
-	elements[24].func=NULL;
-	elements[24].type=attr_coord;
-
-	elements[25].name="polyline";
-	elements[25].parent="itemgra";
-	elements[25].func=NULL;
-	elements[25].type=attr_polyline;
-
-	elements[26].name="coord";
-	elements[26].parent="polyline";
-	elements[26].func=NULL;
-	elements[26].type=attr_coord;
-
-	elements[27].name="arrows";
-	elements[27].parent="itemgra";
-	elements[27].func=NULL;
-	elements[27].type=attr_arrows;
-
-	elements[28].name="vehicle";
-	elements[28].parent="navit";
-	elements[28].func=NULL;
-	elements[28].type=attr_vehicle;
-
-	elements[29].name="vehicleprofile";
-	elements[29].parent="navit";
-	elements[29].func=NULL;
-	elements[29].type=attr_vehicleprofile;
-
-	elements[30].name="roadprofile";
-	elements[30].parent="vehicleprofile";
-	elements[30].func=NULL;
-	elements[30].type=attr_roadprofile;
-
-	elements[31].name="announcement";
-	elements[31].parent="roadprofile";
-	elements[31].func=NULL;
-	elements[31].type=attr_announcement;
-
-	elements[32].name="cursor";
-	elements[32].parent="vehicle";
-	elements[32].func=NULL;
-	elements[32].type=attr_cursor;
-
-	elements[33].name="itemgra";
-	elements[33].parent="cursor";
-	elements[33].func=NULL;
-	elements[33].type=attr_itemgra;
-
-	elements[34].name="log";
-	elements[34].parent="vehicle";
-	elements[34].func=NULL;
-	elements[34].type=attr_log;
-
-	elements[35].name="log";
-	elements[35].parent="navit";
-	elements[35].func=NULL;
-	elements[35].type=attr_log;
-
-	elements[36].name="plugins";
-	elements[36].parent="config";
-	elements[36].func=NULL;
-	elements[36].type=attr_plugins;
-
-	elements[37].name="plugin";
-	elements[37].parent="plugins";
-	elements[37].func=NULL;
-	elements[37].type=attr_plugin;
+	elements[0].name = "config";
+	elements[0].parent = NULL;
+	elements[0].func = NULL;
+	elements[0].type = attr_config;
+
+	elements[1].name = "announce";
+	elements[1].parent = "navigation";
+	elements[1].func = xmlconfig_announce;
+
+	elements[2].name = "speech";
+	elements[2].parent = "navit";
+	elements[2].func = NULL;
+	elements[2].type = attr_speech;
+
+	elements[3].name = "tracking";
+	elements[3].parent = "navit";
+	elements[3].func = NULL;
+	elements[3].type = attr_tracking;
+
+	elements[4].name = "route";
+	elements[4].parent = "navit";
+	elements[4].func = NULL;
+	elements[4].type = attr_route;
+
+	elements[5].name = "mapset";
+	elements[5].parent = "navit";
+	elements[5].func = NULL;
+	elements[5].type = attr_mapset;
+
+	elements[6].name = "map";
+	elements[6].parent = "mapset";
+	elements[6].func = NULL;
+	elements[6].type = attr_map;
+
+	elements[7].name = "debug";
+	elements[7].parent = "config";
+	elements[7].func = NULL;
+	elements[7].type = attr_debug;
+
+	elements[8].name = "osd";
+	elements[8].parent = "navit";
+	elements[8].func = NULL;
+	elements[8].type = attr_osd;
+
+	elements[9].name = "navigation";
+	elements[9].parent = "navit";
+	elements[9].func = NULL;
+	elements[9].type = attr_navigation;
+
+	elements[10].name = "navit";
+	elements[10].parent = "config";
+	elements[10].func = NULL;
+	elements[10].type = attr_navit;
+
+	elements[11].name = "graphics";
+	elements[11].parent = "navit";
+	elements[11].func = NULL;
+	elements[11].type = attr_graphics;
+
+	elements[12].name = "gui";
+	elements[12].parent = "navit";
+	elements[12].func = NULL;
+	elements[12].type = attr_gui;
+
+	elements[13].name = "layout";
+	elements[13].parent = "navit";
+	elements[13].func = NULL;
+	elements[13].type = attr_layout;
+
+	elements[14].name = "cursor";
+	elements[14].parent = "layout";
+	elements[14].func = NULL;
+	elements[14].type = attr_cursor;
+
+	elements[15].name = "layer";
+	elements[15].parent = "layout";
+	elements[15].func = NULL;
+	elements[15].type = attr_layer;
+
+	elements[16].name = "itemgra";
+	elements[16].parent = "layer";
+	elements[16].func = NULL;
+	elements[16].type = attr_itemgra;
+
+	elements[17].name = "circle";
+	elements[17].parent = "itemgra";
+	elements[17].func = NULL;
+	elements[17].type = attr_circle;
+
+	elements[18].name = "coord";
+	elements[18].parent = "circle";
+	elements[18].func = NULL;
+	elements[18].type = attr_coord;
+
+	elements[19].name = "icon";
+	elements[19].parent = "itemgra";
+	elements[19].func = NULL;
+	elements[19].type = attr_icon;
+
+	elements[20].name = "coord";
+	elements[20].parent = "icon";
+	elements[20].func = NULL;
+	elements[20].type = attr_coord;
+
+	elements[21].name = "image";
+	elements[21].parent = "itemgra";
+	elements[21].func = NULL;
+	elements[21].type = attr_image;
+
+	elements[22].name = "text";
+	elements[22].parent = "itemgra";
+	elements[22].func = NULL;
+	elements[22].type = attr_text;
+
+	elements[23].name = "polygon";
+	elements[23].parent = "itemgra";
+	elements[23].func = NULL;
+	elements[23].type = attr_polygon;
+
+	elements[24].name = "coord";
+	elements[24].parent = "polygon";
+	elements[24].func = NULL;
+	elements[24].type = attr_coord;
+
+	elements[25].name = "polyline";
+	elements[25].parent = "itemgra";
+	elements[25].func = NULL;
+	elements[25].type = attr_polyline;
+
+	elements[26].name = "coord";
+	elements[26].parent = "polyline";
+	elements[26].func = NULL;
+	elements[26].type = attr_coord;
+
+	elements[27].name = "arrows";
+	elements[27].parent = "itemgra";
+	elements[27].func = NULL;
+	elements[27].type = attr_arrows;
+
+	elements[28].name = "vehicle";
+	elements[28].parent = "navit";
+	elements[28].func = NULL;
+	elements[28].type = attr_vehicle;
+
+	elements[29].name = "vehicleprofile";
+	elements[29].parent = "navit";
+	elements[29].func = NULL;
+	elements[29].type = attr_vehicleprofile;
+
+	elements[30].name = "roadprofile";
+	elements[30].parent = "vehicleprofile";
+	elements[30].func = NULL;
+	elements[30].type = attr_roadprofile;
+
+	elements[31].name = "announcement";
+	elements[31].parent = "roadprofile";
+	elements[31].func = NULL;
+	elements[31].type = attr_announcement;
+
+	elements[32].name = "cursor";
+	elements[32].parent = "vehicle";
+	elements[32].func = NULL;
+	elements[32].type = attr_cursor;
+
+	elements[33].name = "itemgra";
+	elements[33].parent = "cursor";
+	elements[33].func = NULL;
+	elements[33].type = attr_itemgra;
+
+	elements[34].name = "log";
+	elements[34].parent = "vehicle";
+	elements[34].func = NULL;
+	elements[34].type = attr_log;
+
+	elements[35].name = "log";
+	elements[35].parent = "navit";
+	elements[35].func = NULL;
+	elements[35].type = attr_log;
+
+	elements[36].name = "plugins";
+	elements[36].parent = "config";
+	elements[36].func = NULL;
+	elements[36].type = attr_plugins;
+
+	elements[37].name = "plugin";
+	elements[37].parent = "plugins";
+	elements[37].func = NULL;
+	elements[37].type = attr_plugin;
 }
 
 /**
@@ -525,206 +529,228 @@
  * * @returns nothing
  * */
 
-static void
-start_element(GMarkupParseContext *context,
-		const gchar         *element_name,
-		const gchar        **attribute_names,
-		const gchar        **attribute_values,
-		gpointer             user_data,
-		xmlerror             **error)
-{
-	struct xmlstate *new=NULL, **parent = user_data;
-	struct element_func *e=elements,*func=NULL;
-	struct attr_fixme *attr_fixme=attr_fixmes;
-	char **element_fixme=element_fixmes;
-	int found=0;
+static void start_element(GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer user_data, xmlerror **error)
+{
+	struct xmlstate *new = NULL, **parent = user_data;
+	struct element_func *e = elements, *func = NULL;
+	struct attr_fixme *attr_fixme = attr_fixmes;
+	char **element_fixme = element_fixmes;
+	int found = 0;
 	static int fixme_count;
-	const char *parent_name=NULL;
-	char *s,*sep="",*possible_parents;
+	const char *parent_name = NULL;
+	char *s, *sep = "", *possible_parents;
 	struct attr *parent_attr;
-	dbg(2,"name='%s' parent='%s'\n", element_name, *parent ? (*parent)->element:NULL);
+	// dbg(2, "name='%s' parent='%s'\n", element_name, *parent ? (*parent)->element : NULL);
 
-	if (!strcmp(element_name,"xml"))
+	if (!strcmp(element_name, "xml"))
 		return;
 	/* determine if we have to fix any attributes */
-	while (attr_fixme[0].element) {
-		if (!strcmp(element_name,attr_fixme[0].element))
+	while (attr_fixme[0].element)
+	{
+		if (!strcmp(element_name, attr_fixme[0].element))
 			break;
 		attr_fixme++;
 	}
 	if (!attr_fixme[0].element)
-		attr_fixme=NULL;
+		attr_fixme = NULL;
 
 	/* tell user to fix  deprecated element names */
-	while (element_fixme[0]) {
-		if (!strcmp(element_name,element_fixme[0])) {
-			element_name=element_fixme[1];
+	while (element_fixme[0])
+	{
+		if (!strcmp(element_name, element_fixme[0]))
+		{
+			element_name = element_fixme[1];
 			if (fixme_count++ < 10)
-				dbg(0,"Please change <%s /> to <%s /> in config file\n", element_fixme[0], element_fixme[1]);
+			{
+				// dbg(0, "Please change <%s /> to <%s /> in config file\n",element_fixme[0], element_fixme[1]);
+			}
 		}
-		element_fixme+=2;
+		element_fixme += 2;
 	}
 	/* validate that this element is valid
 	 * and that the element has a valid parent */
-	possible_parents=g_strdup("");
+	possible_parents = g_strdup("");
 	if (*parent)
-		parent_name=(*parent)->element;
-	while (e->name) {
-		if (!g_ascii_strcasecmp(element_name, e->name)) {
-			found=1;
-			s=g_strconcat(possible_parents,sep,e->parent,NULL);
+		parent_name = (*parent)->element;
+	while (e->name)
+	{
+		if (!g_ascii_strcasecmp(element_name, e->name))
+		{
+			found = 1;
+			s = g_strconcat(possible_parents, sep, e->parent, NULL);
 			g_free(possible_parents);
-			possible_parents=s;
-			sep=",";
-			if ((parent_name && e->parent && !g_ascii_strcasecmp(parent_name, e->parent)) ||
-			    (!parent_name && !e->parent))
-				func=e;
+			possible_parents = s;
+			sep = ",";
+			if ((parent_name && e->parent && !g_ascii_strcasecmp(parent_name, e->parent)) || (!parent_name && !e->parent))
+				func = e;
 		}
 		e++;
 	}
-	if (! found) {
-		g_set_error(error,G_MARKUP_ERROR,G_MARKUP_ERROR_UNKNOWN_ELEMENT,
-				"Unknown element '%s'", element_name);
+	if (!found)
+	{
+		g_set_error(error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT, "Unknown element '%s'", element_name);
 		g_free(possible_parents);
 		return;
 	}
-	if (! func) {
-		g_set_error(error,G_MARKUP_ERROR,G_MARKUP_ERROR_INVALID_CONTENT,
-				"Element '%s' within unexpected context '%s'. Expected '%s'%s",
-				element_name, parent_name, possible_parents, ! strcmp(possible_parents, "config") ? "\nPlease add <config> </config> tags at the beginning/end of your navit.xml": "");
+	if (!func)
+	{
+		g_set_error(error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, "Element '%s' within unexpected context '%s'. Expected '%s'%s", element_name, parent_name, possible_parents,
+				!strcmp(possible_parents, "config") ? "\nPlease add <config> </config> tags at the beginning/end of your navit.xml" : "");
 		g_free(possible_parents);
 		return;
 	}
 	g_free(possible_parents);
 
 	new=g_new(struct xmlstate, 1);
-	new->attribute_names=attribute_names;
-	new->attribute_values=attribute_values;
-	new->parent=*parent;
-	new->element_attr.u.data=NULL;
-	new->element=element_name;
-	new->error=error;
-	new->func=func;
-	new->object_func=NULL;
-	*parent=new;
+	new->attribute_names = attribute_names;
+	new->attribute_values = attribute_values;
+	new->parent = *parent;
+	new->element_attr.u.data = NULL;
+	new->element = element_name;
+	new->error = error;
+	new->func = func;
+	new->object_func = NULL;
+	*parent = new;
 	if (!find_boolean(new, "enabled", 1, 0))
 		return;
 	if (new->parent && !new->parent->element_attr.u.data)
 		return;
-	if (func->func) {
-		if (!func->func(new)) {
+	if (func->func)
+	{
+		if (!func->func(new))
+		{
 			return;
 		}
-	} else {
+	}
+	else
+	{
 		struct attr **attrs;
 
-		new->object_func=object_func_lookup(func->type);
-		if (! new->object_func)
+		new->object_func = object_func_lookup(func->type);
+		if (!new->object_func)
 			return;
-		attrs=convert_to_attrs(new,attr_fixme);
-		new->element_attr.type=attr_none;
+		attrs = convert_to_attrs(new, attr_fixme);
+		new->element_attr.type = attr_none;
 		if (!new->parent || new->parent->element_attr.type == attr_none)
-			parent_attr=NULL;
+			parent_attr = NULL;
 		else
-			parent_attr=&new->parent->element_attr;
+			parent_attr = &new->parent->element_attr;
 		new->element_attr.u.data = new->object_func->create(parent_attr, attrs);
-		if (! new->element_attr.u.data)
+		if (!new->element_attr.u.data)
 			return;
-		new->element_attr.type=attr_from_name(element_name);
+		new->element_attr.type = attr_from_name(element_name);
 		if (new->element_attr.type == attr_none)
-			dbg(0,"failed to create object of type '%s'\n", element_name);
+		{
+			// dbg(0, "failed to create object of type '%s'\n", element_name);
+		}
 		if (new->parent && new->parent->object_func && new->parent->object_func->add_attr)
 			new->parent->object_func->add_attr(new->parent->element_attr.u.data, &new->element_attr);
 	}
 	return;
 }
 
-
 /* Called for close tags </foo> */
-static void
-end_element (GMarkupParseContext *context,
-		const gchar         *element_name,
-		gpointer             user_data,
-		xmlerror             **error)
+static void end_element(GMarkupParseContext *context, const gchar *element_name, gpointer user_data, xmlerror **error)
 {
 	struct xmlstate *curr, **state = user_data;
 
-	if (!strcmp(element_name,"xml"))
+	if (!strcmp(element_name, "xml"))
+	{
 		return;
-	dbg(2,"name='%s'\n", element_name);
-	curr=*state;
+	}
+	// dbg(2, "name='%s'\n", element_name);
+	curr = *state;
 	if (curr->object_func && curr->object_func->init)
 		curr->object_func->init(curr->element_attr.u.data);
-	*state=curr->parent;
+	*state = curr->parent;
 	g_free(curr);
 }
 
 static gboolean parse_file(struct xmldocument *document, xmlerror **error);
 
-static void
-xinclude(GMarkupParseContext *context, const gchar **attribute_names, const gchar **attribute_values, struct xmldocument *doc_old, xmlerror **error)
+static void xinclude(GMarkupParseContext *context, const gchar **attribute_names, const gchar **attribute_values, struct xmldocument *doc_old, xmlerror **error)
 {
 	struct xmldocument doc_new;
 	struct file_wordexp *we;
-	int i,count;
-	const char *href=NULL;
+	int i, count;
+	const char *href = NULL;
 	char **we_files;
 
-	if (doc_old->level >= 16) {
-		g_set_error(error,G_MARKUP_ERROR,G_MARKUP_ERROR_INVALID_CONTENT, "xi:include recursion too deep");
+	if (doc_old->level >= 16)
+	{
+		g_set_error(error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, "xi:include recursion too deep");
 		return;
 	}
 	memset(&doc_new, 0, sizeof(doc_new));
-	i=0;
-	while (attribute_names[i]) {
-		if(!g_ascii_strcasecmp("href", attribute_names[i])) {
+	i = 0;
+	while (attribute_names[i])
+	{
+		if (!g_ascii_strcasecmp("href", attribute_names[i]))
+		{
 			if (!href)
-				href=attribute_values[i];
-			else {
-				g_set_error(error,G_MARKUP_ERROR,G_MARKUP_ERROR_INVALID_CONTENT, "xi:include has more than one href");
+				href = attribute_values[i];
+			else
+			{
+				g_set_error(error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, "xi:include has more than one href");
 				return;
 			}
-		} else if(!g_ascii_strcasecmp("xpointer", attribute_names[i])) {
+		}
+		else if (!g_ascii_strcasecmp("xpointer", attribute_names[i]))
+		{
 			if (!doc_new.xpointer)
-				doc_new.xpointer=attribute_values[i];
-			else {
-				g_set_error(error,G_MARKUP_ERROR,G_MARKUP_ERROR_INVALID_CONTENT, "xi:include has more than one xpointer");
+				doc_new.xpointer = attribute_values[i];
+			else
+			{
+				g_set_error(error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, "xi:include has more than one xpointer");
 				return;
 			}
-		} else {
-			g_set_error(error,G_MARKUP_ERROR,G_MARKUP_ERROR_INVALID_CONTENT, "xi:include has invalid attributes");
+		}
+		else
+		{
+			g_set_error(error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, "xi:include has invalid attributes");
 			return;
 		}
 		i++;
 	}
-	if (!doc_new.xpointer && !href) {
-		g_set_error(error,G_MARKUP_ERROR,G_MARKUP_ERROR_INVALID_CONTENT, "xi:include has neither href nor xpointer");
+	if (!doc_new.xpointer && !href)
+	{
+		g_set_error(error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, "xi:include has neither href nor xpointer");
 		return;
 	}
-	doc_new.level=doc_old->level+1;
-	doc_new.user_data=doc_old->user_data;
-	if (! href) {
-		dbg(1,"no href, using '%s'\n", doc_old->href);
-		doc_new.href=doc_old->href;
-		if (file_exists(doc_new.href)) {
-		    parse_file(&doc_new, error);
-		} else {
-		    dbg(0,"Unable to include %s\n",doc_new.href);
-		}
-	} else {
-		dbg(1,"expanding '%s'\n", href);
-		we=file_wordexp_new(href);
-		we_files=file_wordexp_get_array(we);
-		count=file_wordexp_get_count(we);
-		dbg(1,"%d results\n", count);
-		if (file_exists(we_files[0])) {
-			for (i = 0 ; i < count ; i++) {
-				dbg(1,"result[%d]='%s'\n", i, we_files[i]);
-				doc_new.href=we_files[i];
+	doc_new.level = doc_old->level + 1;
+	doc_new.user_data = doc_old->user_data;
+	if (!href)
+	{
+		//dbg(1, "no href, using '%s'\n", doc_old->href);
+		doc_new.href = doc_old->href;
+		if (file_exists(doc_new.href))
+		{
+			parse_file(&doc_new, error);
+		}
+		else
+		{
+			//dbg(0, "Unable to include %s\n", doc_new.href);
+		}
+	}
+	else
+	{
+		//dbg(1, "expanding '%s'\n", href);
+		we = file_wordexp_new(href);
+		we_files = file_wordexp_get_array(we);
+		count = file_wordexp_get_count(we);
+		//dbg(1, "%d results\n", count);
+		if (file_exists(we_files[0]))
+		{
+			for (i = 0; i < count; i++)
+			{
+				//dbg(1, "result[%d]='%s'\n", i, we_files[i]);
+				doc_new.href = we_files[i];
 				parse_file(&doc_new, error);
 			}
-		} else {
-			dbg(0,"Unable to include %s\n",we_files[0]);
+		}
+		else
+		{
+			//dbg(0, "Unable to include %s\n", we_files[0]);
 		}
 		file_wordexp_destroy(we);
 
@@ -732,39 +758,42 @@
 
 }
 
-static int
-strncmp_len(const char *s1, int s1len, const char *s2)
+static int strncmp_len(const char *s1, int s1len, const char *s2)
 {
 	int ret;
 #if 0
 	char c[s1len+1];
 	strncpy(c, s1, s1len);
 	c[s1len]='\0';
-	dbg(0,"'%s' vs '%s'\n", c, s2);
+	//dbg(0,"'%s' vs '%s'\n", c, s2);
 #endif
 
-	ret=strncmp(s1, s2, s1len);
+	ret = strncmp(s1, s2, s1len);
 	if (ret)
 		return ret;
-	return strlen(s2)-s1len;
+	return strlen(s2) - s1len;
 }
 
-static int
-xpointer_value(const char *test, int len, struct xistate *elem, const char **out, int out_len)
+static int xpointer_value(const char *test, int len, struct xistate *elem, const char **out, int out_len)
 {
-	int i,ret=0;
-	if (len <= 0 || out_len <= 0) {
+	int i, ret = 0;
+	if (len <= 0 || out_len <= 0)
+	{
 		return 0;
 	}
-	if (!(strncmp_len(test,len,"name(.)"))) {
-		out[0]=elem->element;
+	if (!(strncmp_len(test, len, "name(.)")))
+	{
+		out[0] = elem->element;
 		return 1;
 	}
-	if (test[0] == '@') {
-		i=0;
-		while (elem->attribute_names[i] && out_len > 0) {
-			if (!strncmp_len(test+1,len-1,elem->attribute_names[i])) {
-				out[ret++]=elem->attribute_values[i];
+	if (test[0] == '@')
+	{
+		i = 0;
+		while (elem->attribute_names[i] && out_len > 0)
+		{
+			if (!strncmp_len(test + 1, len - 1, elem->attribute_names[i]))
+			{
+				out[ret++] = elem->attribute_values[i];
 				out_len--;
 			}
 			i++;
@@ -774,10 +803,9 @@
 	return 0;
 }
 
-static int
-xpointer_test(const char *test, int len, struct xistate *elem)
+static int xpointer_test(const char *test, int len, struct xistate *elem)
 {
-	int eq,i,count,vlen,cond_req=1,cond=0;
+	int eq, i, count, vlen, cond_req = 1, cond = 0;
 	char c;
 	const char *tmp[16];
 #if 0
@@ -785,135 +813,137 @@
 
 	strncpy(test2, test, len);
 	test2[len]='\0';
-	dbg(0,"%s\n", test2);
+	//dbg(0,"%s\n", test2);
 #endif
 	if (!len)
 		return 0;
-	c=test[len-1];
+	c = test[len - 1];
 	if (c != '\'' && c != '"')
 		return 0;
-	eq=strcspn(test, "=");
-	if (eq >= len || test[eq+1] != c)
+	eq = strcspn(test, "=");
+	if (eq >= len || test[eq + 1] != c)
 		return 0;
-	vlen=eq;
-	if (eq > 0 && test[eq-1] == '!') {
-		cond_req=0;
+	vlen = eq;
+	if (eq > 0 && test[eq - 1] == '!')
+	{
+		cond_req = 0;
 		vlen--;
 	}
-	count=xpointer_value(test,vlen,elem,tmp,16);
-	for (i = 0 ; i < count ; i++) {
-		if (!strncmp_len(test+eq+2,len-eq-3, tmp[i]))
-			cond=1;
+	count = xpointer_value(test, vlen, elem, tmp, 16);
+	for (i = 0; i < count; i++)
+	{
+		if (!strncmp_len(test + eq + 2, len - eq - 3, tmp[i]))
+			cond = 1;
 	}
 	if (cond == cond_req)
 		return 1;
 	return 0;
 }
 
-static int
-xpointer_element_match(const char *xpointer, int len, struct xistate *elem)
+static int xpointer_element_match(const char *xpointer, int len, struct xistate *elem)
 {
-	int start,tlen,tlen2;
+	int start, tlen, tlen2;
 #if 0
 	char test2[len+1];
 
 	strncpy(test2, xpointer, len);
 	test2[len]='\0';
-	dbg(0,"%s\n", test2);
+	//dbg(0,"%s\n", test2);
 #endif
-	start=strcspn(xpointer, "[");
+	start = strcspn(xpointer, "[");
 	if (start > len)
-		start=len;
+		start = len;
 	if (strncmp_len(xpointer, start, elem->element) && (start != 1 || xpointer[0] != '*'))
 		return 0;
 	if (start == len)
 		return 1;
-	if (xpointer[len-1] != ']')
+	if (xpointer[len - 1] != ']')
 		return 0;
-	tlen=len-start-2;
-	for (;;) {
+	tlen = len - start - 2;
+	for (;;)
+	{
 		start++;
-		tlen2=strcspn(xpointer+start,"]");
+		tlen2 = strcspn(xpointer + start, "]");
 		if (start + tlen2 > len)
 			return 1;
-		if (!xpointer_test(xpointer+start, tlen2, elem))
+		if (!xpointer_test(xpointer + start, tlen2, elem))
 			return 0;
-		start+=tlen2+1;
+		start += tlen2 + 1;
 	}
 }
 
-static int
-xpointer_xpointer_match(const char *xpointer, int len, struct xistate *first)
+static int xpointer_xpointer_match(const char *xpointer, int len, struct xistate *first)
 {
 	const char *c;
 	int s;
-	dbg(2,"%s\n", xpointer);
+	//dbg(2, "%s\n", xpointer);
 	if (xpointer[0] != '/')
 		return 0;
-	c=xpointer+1;
+	c = xpointer + 1;
 	len--;
-	do {
-		s=strcspn(c, "/");
+	do
+	{
+		s = strcspn(c, "/");
 		if (s > len)
-			s=len;
-		if (! xpointer_element_match(c, s, first))
+			s = len;
+		if (!xpointer_element_match(c, s, first))
 			return 0;
-		first=first->child;
-		c+=s+1;
-		len-=s+1;
-	} while (len > 0 && first);
+		first = first->child;
+		c += s + 1;
+		len -= s + 1;
+	}
+	while (len > 0 && first);
 	if (len > 0)
 		return 0;
 	return 1;
 }
 
-static int
-xpointer_match(const char *xpointer, struct xistate *first)
+static int xpointer_match(const char *xpointer, struct xistate *first)
 {
-	char *prefix="xpointer(";
+	char *prefix = "xpointer(";
 	int len;
-	if (! xpointer)
+	if (!xpointer)
 		return 1;
-	len=strlen(xpointer);
-	if (strncmp(xpointer,prefix,strlen(prefix)))
+	len = strlen(xpointer);
+	if (strncmp(xpointer, prefix, strlen(prefix)))
 		return 0;
-	if (xpointer[len-1] != ')')
+	if (xpointer[len - 1] != ')')
 		return 0;
-	return xpointer_xpointer_match(xpointer+strlen(prefix), len-strlen(prefix)-1, first);
+	return xpointer_xpointer_match(xpointer + strlen(prefix), len - strlen(prefix) - 1, first);
 
 }
 
-static void
-xi_start_element(GMarkupParseContext *context,
-		const gchar         *element_name,
-		const gchar        **attribute_names,
-		const gchar        **attribute_values,
-		gpointer             user_data,
-		xmlerror             **error)
+static void xi_start_element(GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer user_data, xmlerror **error)
 {
-	struct xmldocument *doc=user_data;
+	struct xmldocument *doc = user_data;
 	struct xistate *xistate;
-	int i,count=0;
-	while (attribute_names[count++*ATTR_DISTANCE]);
-	xistate=g_new0(struct xistate, 1);
-	xistate->element=element_name;
+	int i, count = 0;
+	while (attribute_names[count++ * ATTR_DISTANCE])
+		;xistate=g_new0(struct xistate, 1);
+	xistate->element = element_name;
 	xistate->attribute_names=g_new0(const char *, count);
 	xistate->attribute_values=g_new0(const char *, count);
-	for (i = 0 ; i < count ; i++) {
-		if (attribute_names[i*ATTR_DISTANCE] && attribute_values[i*ATTR_DISTANCE]) {
-			xistate->attribute_names[i]=g_strdup(attribute_names[i*ATTR_DISTANCE]);
-			xistate->attribute_values[i]=g_strdup(attribute_values[i*ATTR_DISTANCE]);
+	for (i = 0; i < count; i++)
+	{
+		if (attribute_names[i * ATTR_DISTANCE] && attribute_values[i * ATTR_DISTANCE])
+		{
+			xistate->attribute_names[i] = g_strdup(attribute_names[i * ATTR_DISTANCE]);
+			xistate->attribute_values[i] = g_strdup(attribute_values[i * ATTR_DISTANCE]);
 		}
 	}
-	xistate->parent=doc->last;
-
-	if (doc->last) {
-		doc->last->child=xistate;
-	} else
-		doc->first=xistate;
-	doc->last=xistate;
-	if (doc->active > 0 || xpointer_match(doc->xpointer, doc->first)) {
-		if(!g_ascii_strcasecmp("xi:include", element_name)) {
+	xistate->parent = doc->last;
+
+	if (doc->last)
+	{
+		doc->last->child = xistate;
+	}
+	else
+		doc->first = xistate;
+	doc->last = xistate;
+	if (doc->active > 0 || xpointer_match(doc->xpointer, doc->first))
+	{
+		if (!g_ascii_strcasecmp("xi:include", element_name))
+		{
 			xinclude(context, xistate->attribute_names, xistate->attribute_values, doc, error);
 			return;
 		}
@@ -932,30 +962,29 @@
  * * @returns nothing
  * */
 
-static void
-xi_end_element (GMarkupParseContext *context,
-		const gchar         *element_name,
-		gpointer             user_data,
-		xmlerror             **error)
-{
-	struct xmldocument *doc=user_data;
-	struct xistate *xistate=doc->last;
-	int i=0;
-	doc->last=doc->last->parent;
-	if (! doc->last)
-		doc->first=NULL;
+static void xi_end_element(GMarkupParseContext *context, const gchar *element_name, gpointer user_data, xmlerror **error)
+{
+	struct xmldocument *doc = user_data;
+	struct xistate *xistate = doc->last;
+	int i = 0;
+	doc->last = doc->last->parent;
+	if (!doc->last)
+		doc->first = NULL;
 	else
-		doc->last->child=NULL;
-	if (doc->active > 0) {
-		if(!g_ascii_strcasecmp("xi:include", element_name)) {
+		doc->last->child = NULL;
+	if (doc->active > 0)
+	{
+		if (!g_ascii_strcasecmp("xi:include", element_name))
+		{
 			return;
 		}
 		end_element(context, element_name, doc->user_data, error);
 		doc->active--;
 	}
-	while (xistate->attribute_names[i]) {
-		g_free((char *)(xistate->attribute_names[i]));
-		g_free((char *)(xistate->attribute_values[i]));
+	while (xistate->attribute_names[i])
+	{
+		g_free((char *) (xistate->attribute_names[i]));
+		g_free((char *) (xistate->attribute_values[i]));
 		i++;
 	}
 	g_free(xistate->attribute_names);
@@ -965,28 +994,26 @@
 
 /* Called for character data */
 /* text is not nul-terminated */
-static void
-xi_text (GMarkupParseContext *context,
-		const gchar            *text,
-		gsize                   text_len,
-		gpointer                user_data,
-		xmlerror               **error)
+static void xi_text(GMarkupParseContext *context, const gchar *text, gsize text_len, gpointer user_data, xmlerror **error)
 {
-	struct xmldocument *doc=user_data;
+	struct xmldocument *doc = user_data;
 	int i;
-	if (doc->active) {
-		for (i = 0 ; i < text_len ; i++) {
-			if (!isspace(text[i])) {
-				struct xmldocument *doc=user_data;
+	if (doc->active)
+	{
+		for (i = 0; i < text_len; i++)
+		{
+			if (!isspace(text[i]))
+			{
+				struct xmldocument *doc = user_data;
 				struct xmlstate *curr, **state = doc->user_data;
 				struct attr attr;
-				char *text_dup = malloc(text_len+1);
+				char *text_dup = malloc(text_len + 1);
 
-				curr=*state;
+				curr = *state;
 				strncpy(text_dup, text, text_len);
-				text_dup[text_len]='\0';
-				attr.type=attr_xml_text;
-				attr.u.str=text_dup;
+				text_dup[text_len] = '\0';
+				attr.type = attr_xml_text;
+				attr.u.str = text_dup;
 				if (curr->object_func && curr->object_func->add_attr && curr->element_attr.u.data)
 					curr->object_func->add_attr(curr->element_attr.u.data, &attr);
 				free(text_dup);
@@ -997,32 +1024,28 @@
 }
 
 #ifndef HAVE_GLIB
-static void
-parse_node_text(ezxml_t node, void *data, void (*start)(void *, const char *, const char **, const char **, void *, void *),
-					  void (*end)(void *, const char *, void *, void *),
-					  void (*text)(void *, const char *, int, void *, void *))
+static void parse_node_text(ezxml_t node, void *data, void(*start)(void *, const char *, const char **, const char **, void *, void *), void(*end)(void *, const char *, void *, void *), void(*text)(void *, const char *, int, void *, void *))
 {
-	while (node) {
+	while (node)
+	{
 		if (start)
-			start(NULL, node->name, (const char **)node->attr, (const char **)(node->attr+1), data, NULL);
+			start(NULL, node->name, (const char **) node->attr, (const char **) (node->attr + 1), data, NULL);
 		if (text && node->txt)
 			text(NULL, node->txt, strlen(node->txt), data, NULL);
 		if (node->child)
 			parse_node_text(node->child, data, start, end, text);
 		if (end)
 			end(NULL, node->name, data, NULL);
-		node=node->ordered;
+		node = node->ordered;
 	}
 }
 #endif
 
-void
-xml_parse_text(const char *document, void *data, void (*start)(void *, const char *, const char **, const char **, void *, void *),
-			                   void (*end)(void *, const char *, void *, void *),
-			                   void (*text)(void *, const char *, int, void *, void *))
+void xml_parse_text(const char *document, void *data, void(*start)(void *, const char *, const char **, const char **, void *, void *), void(*end)(void *, const char *, void *, void *), void(*text)(void *, const char *, int, void *, void *))
 {
 #ifdef HAVE_GLIB
-	GMarkupParser parser = { start, end, text, NULL, NULL};
+	GMarkupParser parser =
+	{	start, end, text, NULL, NULL};
 	GMarkupParseContext *context;
 	gboolean result;
 
@@ -1030,7 +1053,7 @@
 	result = g_markup_parse_context_parse (context, document, strlen(document), NULL);
 	g_markup_parse_context_free (context);
 #else
-	char *str=g_strdup(document);
+	char *str = g_strdup(document);
 	ezxml_t root = ezxml_parse_str(str, strlen(str));
 	if (!root)
 		return;
@@ -1040,10 +1063,10 @@
 #endif
 }
 
-
 #ifdef HAVE_GLIB
 
-static const GMarkupParser parser = {
+static const GMarkupParser parser =
+{
 	xi_start_element,
 	xi_end_element,
 	xi_text,
@@ -1068,13 +1091,14 @@
 	gboolean result;
 	char *xmldir,*newxmldir,*xmlfile,*newxmlfile,*sep;
 
-	dbg(1,"enter filename='%s'\n", document->href);
+	//dbg(1,"enter filename='%s'\n", document->href);
 #if GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 12
 #define G_MARKUP_TREAT_CDATA_AS_TEXT 0
 #endif
 	context = g_markup_parse_context_new (&parser, G_MARKUP_TREAT_CDATA_AS_TEXT, document, NULL);
 
-	if (!g_file_get_contents (document->href, &contents, &len, error)) {
+	if (!g_file_get_contents (document->href, &contents, &len, error))
+	{
 		g_markup_parse_context_free (context);
 		return FALSE;
 	}
@@ -1082,9 +1106,10 @@
 	xmlfile=getenv("XMLFILE");
 	newxmlfile=g_strdup(document->href);
 	newxmldir=g_strdup(document->href);
-	if ((sep=strrchr(newxmldir,'/'))) 
-		*sep='\0';
-	else {
+	if ((sep=strrchr(newxmldir,'/')))
+	*sep='\0';
+	else
+	{
 		g_free(newxmldir);
 		newxmldir=g_strdup(".");
 	}
@@ -1094,7 +1119,8 @@
 	document->first=NULL;
 	document->last=NULL;
 	result = g_markup_parse_context_parse (context, contents, len, error);
-	if (!result && error && *error) {
+	if (!result && error && *error)
+	{
 		g_markup_parse_context_get_position(context, &line, &chr);
 		message=g_strdup_printf("%s at line %d, char %d\n", (*error)->message, line, chr);
 		g_free((*error)->message);
@@ -1103,58 +1129,61 @@
 	g_markup_parse_context_free (context);
 	g_free (contents);
 	if (xmldir)
-		setenv("XMLDIR",xmldir,1);	
+	setenv("XMLDIR",xmldir,1);
 	else
 #ifndef __MINGW32__
-		unsetenv("XMLDIR");
+	unsetenv("XMLDIR");
 #else
-		putenv("XMLDIR=");
+	putenv("XMLDIR=");
 #endif /* __MINGW32__ */
 	if (xmlfile)
-		setenv("XMLFILE",xmlfile,1);
+	setenv("XMLFILE",xmlfile,1);
 	else
 #ifndef __MINGW32__
-		unsetenv("XMLFILE");
+	unsetenv("XMLFILE");
 #else
-		putenv("XMLFILE=");
+	putenv("XMLFILE=");
 #endif /* __MINGW32__ */
 	g_free(newxmldir);
 	g_free(newxmlfile);
-	dbg(1,"return %d\n", result);
+	//dbg(1,"return %d\n", result);
 
 	return result;
 }
 #else
-static void
-parse_node(struct xmldocument *document, ezxml_t node)
+static void parse_node(struct xmldocument *document, ezxml_t node)
 {
-	while (node) {
-		xi_start_element(NULL,node->name, node->attr, node->attr+1, document, NULL);
+	while (node)
+	{
+		xi_start_element(NULL, node->name, node->attr, node->attr + 1, document, NULL);
 		if (node->txt)
-			xi_text(NULL,node->txt,strlen(node->txt),document,NULL);
+		{
+			xi_text(NULL, node->txt, strlen(node->txt), document, NULL);
+		}
 		if (node->child)
+		{
 			parse_node(document, node->child);
-		xi_end_element (NULL,node->name,document,NULL);
-		node=node->ordered;
+		}
+		xi_end_element(NULL, node->name, document, NULL);
+		node = node->ordered;
 	}
 }
 
-static gboolean
-parse_file(struct xmldocument *document, xmlerror **error)
+static gboolean parse_file(struct xmldocument *document, xmlerror **error)
 {
 	FILE *f;
 	ezxml_t root;
 
-	f=fopen(document->href,"rb");
+	f = fopen(document->href, "rb");
 	if (!f)
 		return FALSE;
 	root = ezxml_parse_fp(f);
 	fclose(f);
 	if (!root)
 		return FALSE;
-	document->active=document->xpointer ? 0:1;
-	document->first=NULL;
-	document->last=NULL;
+	document->active = document->xpointer ? 0 : 1;
+	document->first = NULL;
+	document->last = NULL;
 
 	parse_node(document, root);
 
@@ -1173,21 +1202,22 @@
 gboolean config_load(const char *filename, xmlerror **error)
 {
 	struct xmldocument document;
-	struct xmlstate *curr=NULL;
+	struct xmlstate *curr = NULL;
 	gboolean result;
 
 	initStatic();
 
-	dbg(1,"enter filename='%s'\n", filename);
+	//dbg(1, "enter filename='%s'\n", filename);
 	memset(&document, 0, sizeof(document));
-	document.href=filename;
-	document.user_data=&curr;
-	result=parse_file(&document, error);
-	if (result && curr) {
-		g_set_error(error,G_MARKUP_ERROR,G_MARKUP_ERROR_PARSE, "element '%s' not closed", curr->element);
-		result=FALSE;
+	document.href = filename;
+	document.user_data = &curr;
+	result = parse_file(&document, error);
+	if (result && curr)
+	{
+		g_set_error(error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, "element '%s' not closed", curr->element);
+		result = FALSE;
 	}
-	dbg(1,"return %d\n", result);
+	//dbg(1, "return %d\n", result);
 	return result;
 }