Merge branch 'trunk' into traffic

# Conflicts:
#	navit/route.c
#	navit/xmlconfig.c

10 files changed, 137 insertions, 120 deletions

diff --git a/navit/gui/internal/gui_internal.c b/navit/gui/internal/gui_internal.c
index a571a827c..d634470f0 100644
--- a/navit/gui/internal/gui_internal.c
+++ b/navit/gui/internal/gui_internal.c
@@ -134,10 +134,10 @@ image_new_scaled(struct gui_priv *this, const char *name, int w, int h)
 	char *full_path=NULL;
 	full_path=graphics_icon_path(name);
 	ret=graphics_image_new_scaled(this->gra, full_path, w, h);
-	dbg(lvl_debug,"Trying to load image '%s' (w=%d, h=%d): %s\n", name, w, h, ret ? "OK" : "NOT FOUND");
+	dbg(lvl_debug,"Trying to load image '%s' (w=%d, h=%d): %s", name, w, h, ret ? "OK" : "NOT FOUND");
 	g_free(full_path);
 	if (!ret) {
-		dbg(lvl_error,"Failed to load image for '%s' (w=%d, h=%d)\n", name, w, h);
+		dbg(lvl_error,"Failed to load image for '%s' (w=%d, h=%d)", name, w, h);
 		full_path=graphics_icon_path("unknown");
 		ret=graphics_image_new_scaled(this->gra, full_path, w, h);
 		g_free(full_path);
@@ -508,7 +508,7 @@ gui_internal_apply_config(struct gui_priv *this)
 {
   struct gui_config_settings *  current_config=0;
 
-  dbg(lvl_debug,"w=%d h=%d\n", this->root.w, this->root.h);
+  dbg(lvl_debug,"w=%d h=%d", this->root.w, this->root.h);
   /*
    * Select default values from profile based on the screen.
    */
@@ -593,7 +593,7 @@ static void
 gui_internal_cmd_set_destination(struct gui_priv *this, struct widget *wm, void *data)
 {
 	char *name=data;
-	dbg(lvl_info,"c=%d:0x%x,0x%x\n", wm->c.pro, wm->c.x, wm->c.y);
+	dbg(lvl_info,"c=%d:0x%x,0x%x", wm->c.pro, wm->c.x, wm->c.y);
 	navit_set_destination(this->nav, &wm->c, name, 1);
 	if (this->flags & 512) {
 		struct attr follow;
@@ -848,13 +848,13 @@ gui_internal_cmd_view_attributes(struct gui_priv *this, struct widget *wm, void
 	char *text;
 	int count=0;
 
-	dbg(lvl_info,"item=%p 0x%x 0x%x\n", wm->item.map,wm->item.id_hi, wm->item.id_lo);
+	dbg(lvl_info,"item=%p 0x%x 0x%x", wm->item.map,wm->item.id_hi, wm->item.id_lo);
 	wb=gui_internal_menu(this, "Attributes");
 	w=gui_internal_box_new(this, gravity_top_center|orientation_vertical|flags_expand|flags_fill);
 	gui_internal_widget_append(wb, w);
 	mr=map_rect_new(wm->item.map, NULL);
 	item = map_rect_get_item_byid(mr, wm->item.id_hi, wm->item.id_lo);
-	dbg(lvl_info,"item=%p\n", item);
+	dbg(lvl_info,"item=%p", item);
 	if (item) {
 		text=g_strdup_printf("%s:%s", _("Item type"), item_to_name(item->type));
 		gui_internal_widget_append(w,
@@ -896,10 +896,10 @@ gui_internal_cmd_view_in_browser(struct gui_priv *this, struct widget *wm, void
 	char *cmd=NULL;
 
 	if (!wm->name) {
-		dbg(lvl_info,"item=%p 0x%x 0x%x\n", wm->item.map,wm->item.id_hi, wm->item.id_lo);
+		dbg(lvl_info,"item=%p 0x%x 0x%x", wm->item.map,wm->item.id_hi, wm->item.id_lo);
 		mr=map_rect_new(wm->item.map, NULL);
 		item = map_rect_get_item_byid(mr, wm->item.id_hi, wm->item.id_lo);
-		dbg(lvl_info,"item=%p\n", item);
+		dbg(lvl_info,"item=%p", item);
 		if (item) {
 			while(item_attr_get(item, attr_url_local, &attr)) {
 				if (! cmd)
@@ -914,7 +914,7 @@ gui_internal_cmd_view_in_browser(struct gui_priv *this, struct widget *wm, void
 #ifdef HAVE_SYSTEM
 		system(cmd);
 #else
-		dbg(lvl_error,"Error: External commands were disabled during compilation, cannot call '%s'.\n",cmd);
+		dbg(lvl_error,"Error: External commands were disabled during compilation, cannot call '%s'.",cmd);
 #endif
 		g_free(cmd);
 	}
@@ -1004,7 +1004,7 @@ gui_internal_cmd_results_to_map(struct gui_priv *this, struct widget *wm, void *
 	
 	if(!w) {
 		map_rect_destroy(mr);
-		dbg(lvl_warning,"Can't find the results table - only map clean up is done.\n");
+		dbg(lvl_warning,"Can't find the results table - only map clean up is done.");
 		return;
 	}
 
@@ -1016,7 +1016,7 @@ gui_internal_cmd_results_to_map(struct gui_priv *this, struct widget *wm, void *
 			struct item* it;
 			if(wi->name==NULL)
 				continue;
-			dbg(lvl_info,"%s\n",wi->name);
+			dbg(lvl_info,"%s",wi->name);
 			it=map_rect_create_item(mr,type_found_item);
 			if(it) {
 				struct coord c;
@@ -1132,7 +1132,7 @@ gui_internal_cmd_position_do(struct gui_priv *this, struct pcoord *pc_in, struct
 		pc=*pc_in;
 		c.x=pc.x;
 		c.y=pc.y;
-		dbg(lvl_info,"x=0x%x y=0x%x\n", c.x, c.y);
+		dbg(lvl_info,"x=0x%x y=0x%x", c.x, c.y);
 		transform_to_geo(pc.pro, &c, &g);
 	} else if (g_in) {
 		struct attr attr;
@@ -1576,7 +1576,7 @@ gui_internal_cmd_bookmarks(struct gui_priv *this, struct widget *wm, void *data)
 		while ((item=bookmarks_get_item(mattr.u.bookmarks))) {
 			if (!item_attr_get(item, attr_label, &attr)) continue;
 			label_full=map_convert_string_tmp(item->map,attr.u.str);
-			dbg(lvl_info,"full_labled: %s\n",label_full);
+			dbg(lvl_info,"full_labled: %s",label_full);
 			
 			// hassub == 1 if the item type is a sub-folder
 			if (item->type == type_bookmark_folder) {
@@ -1658,7 +1658,7 @@ gui_internal_keypress_do(struct gui_priv *this, char *key)
 			}
                        	return; 
 		} else if (*key == NAVIT_KEY_BACKSPACE) {
-			dbg(lvl_debug,"backspace\n");
+			dbg(lvl_debug,"backspace");
 			if (wi->text && wi->text[0]) {
 				len=g_utf8_prev_char(wi->text+strlen(wi->text))-wi->text;
 				wi->text[len]='\0';
@@ -1666,11 +1666,11 @@ gui_internal_keypress_do(struct gui_priv *this, char *key)
 			}
 		} else {
 			if (wi->state & STATE_CLEAR) {
-				dbg(lvl_info,"wi->state=0x%x\n", wi->state);
+				dbg(lvl_info,"wi->state=0x%x", wi->state);
 				g_free(wi->text);
 				wi->text=NULL;
 				wi->state &= ~STATE_CLEAR;
-				dbg(lvl_info,"wi->state=0x%x\n", wi->state);
+				dbg(lvl_info,"wi->state=0x%x", wi->state);
 			}
 			text=g_strdup_printf("%s%s", wi->text ? wi->text : "", key);
 
@@ -1760,7 +1760,7 @@ gui_internal_set(char *remove, char *add)
 			int len=strlen(line);
 			if (len > 0 && line[len-1] == '\n')
 				line[len-1]='\0';
-			dbg(lvl_debug,"line=%s\n",line);
+			dbg(lvl_debug,"line=%s",line);
 			if (!gui_internal_match(remove, line))
 				fprintf(fo,"%s\n",line);
 		}
@@ -1819,12 +1819,12 @@ gui_internal_cmd_map_download_do(struct gui_priv *this, struct widget *wm, void
 		sel.range.max=type_last;
 		mr=map_rect_new(map, &sel);
 		while ((item=map_rect_get_item(mr))) {
-			dbg(lvl_info,"item\n");
+			dbg(lvl_info,"item");
 		}
 		map_rect_destroy(mr);
 	}
 	
-	dbg(lvl_info,"bbox=%s\n",wm->prefix);
+	dbg(lvl_info,"bbox=%s",wm->prefix);
 	gui_internal_menu_render(this);
 }
 
@@ -1838,7 +1838,7 @@ gui_internal_cmd_map_download(struct gui_priv *this, struct widget *wm, void *da
 	char *search,buffer[256];
 	int found,sp_match=0;
 
-	dbg(lvl_debug,"wm=%p prefix=%s\n",wm,wm->prefix);
+	dbg(lvl_debug,"wm=%p prefix=%s",wm,wm->prefix);
 
 	search=wm->prefix;
 	if (search) {
@@ -2048,14 +2048,14 @@ gui_internal_cmd_set_active_profile(struct gui_priv *this, struct
 	vehicle_get_attr(v, attr_name, &vehicle_name_attr, NULL);
 	vehicle_name = vehicle_name_attr.u.str;
 
-	dbg(lvl_debug, "Changing vehicle %s to profile %s\n", vehicle_name,
+	dbg(lvl_debug, "Changing vehicle %s to profile %s", vehicle_name,
 			profilename);
 
 	// Change the profile name
 	profilename_attr.type = attr_profilename;
 	profilename_attr.u.str = profilename;
 	if(!vehicle_set_attr(v, &profilename_attr)) {
-		dbg(lvl_error, "Unable to set the vehicle's profile name\n");
+		dbg(lvl_error, "Unable to set the vehicle's profile name");
 	}
 
 	navit_set_vehicleprofile_name(this->nav,profilename);
@@ -2115,7 +2115,7 @@ gui_internal_add_vehicle_profile(struct gui_priv *this, struct widget
 		active_profile = profile_attr.u.str;
 	active = active_profile != NULL && !strcmp(name, active_profile);
 
-	dbg(lvl_debug, "Adding vehicle profile %s, active=%s/%i\n", name,
+	dbg(lvl_debug, "Adding vehicle profile %s, active=%s/%i", name,
 			active_profile, active);
 
 	// Build a translatable label.
@@ -2262,7 +2262,7 @@ gui_internal_set_click_coord(struct gui_priv *this, struct point *p)
 	if (p) {
 		trans=navit_get_trans(this->nav);
 		transform_reverse(trans, p, &c);
-		dbg(lvl_debug,"x=0x%x y=0x%x\n", c.x, c.y);
+		dbg(lvl_debug,"x=0x%x y=0x%x", c.x, c.y);
 		this->clickp.pro=transform_get_projection(trans);
 		this->clickp.x=c.x;
 		this->clickp.y=c.y;
@@ -2303,7 +2303,7 @@ gui_internal_enter_setup(struct gui_priv *this)
 void
 gui_internal_cmd_menu(struct gui_priv *this, int ignore, char *href)
 {
-	dbg(lvl_debug,"enter\n");
+	dbg(lvl_debug,"enter");
 	gui_internal_enter(this, ignore);
 	gui_internal_enter_setup(this);
 	// draw menu
@@ -2423,7 +2423,7 @@ gui_internal_set_attr(struct gui_priv *this, struct attr *attr)
 		this->on_map_click=g_strdup(attr->u.str);
 		return 1;
 	default:
-		dbg(lvl_error,"Unknown attribute: %s\n",attr_to_name(attr->type));
+		dbg(lvl_error,"Unknown attribute: %s",attr_to_name(attr->type));
 		return 1;
 	}
 }
@@ -2491,7 +2491,7 @@ gui_internal_coordinate_parse(char *s, char plus, char minus, double *x)
 	sscanf(degree, "%lf", x);
 	
 	if(strchr(degree, plus) || strchr(degree, minus)) {
-		dbg(lvl_debug,"degree %c/%c found\n",plus,minus);
+		dbg(lvl_debug,"degree %c/%c found",plus,minus);
 	} else {/* DEGREES_MINUTES */
 		if(!minute)
 			return 0;
@@ -2499,7 +2499,7 @@ gui_internal_coordinate_parse(char *s, char plus, char minus, double *x)
 		sscanf(minute, "%lf", &tmp);
 		*x+=tmp/60;
 		if(strchr(minute, plus) || strchr(minute, minus)) {
-			dbg(lvl_debug,"minute %c/%c found\n",plus,minus);
+			dbg(lvl_debug,"minute %c/%c found",plus,minus);
 		} else { /* DEGREES_MINUTES_SECONDS */
 			second=strtok(NULL,"");  
 			if(!second)
@@ -2523,7 +2523,7 @@ gui_internal_cmd_enter_coord_do(struct gui_priv *this, struct widget *widget)
 	char *lat, *lng;
 	char *widgettext;
 	double latitude, longitude; 
-	dbg(lvl_debug,"text entered:%s\n", widget->text);
+	dbg(lvl_debug,"text entered:%s", widget->text);
 
 	/* possible entry can be identical to coord_format output but only space between lat and lng is allowed */
 	widgettext=g_ascii_strup(widget->text,-1);
@@ -2556,7 +2556,7 @@ gui_internal_cmd_enter_coord_do(struct gui_priv *this, struct widget *widget)
 void
 gui_internal_cmd_enter_coord_clicked(struct gui_priv *this, struct widget *widget, void *data)
 {
-	dbg(lvl_debug,"entered\n");
+	dbg(lvl_debug,"entered");
         gui_internal_cmd_enter_coord_do(this, widget->data);
 }
 
@@ -2570,18 +2570,18 @@ static void gui_internal_button(void *data, int pressed, int button, struct poin
 	struct gui_priv *this=data;
 	struct graphics *gra=this->gra;
 
-	dbg(lvl_debug,"enter %d %d\n", pressed, button);
+	dbg(lvl_debug,"enter %d %d", pressed, button);
 	// if still on the map (not in the menu, yet):
-	dbg(lvl_debug,"children=%p ignore_button=%d\n",this->root.children,this->ignore_button);
+	dbg(lvl_debug,"children=%p ignore_button=%d",this->root.children,this->ignore_button);
 	if (!this->root.children || this->ignore_button) {
 
 		this->ignore_button=0;
 		// check whether the position of the mouse changed during press/release OR if it is the scrollwheel
 		if (!navit_handle_button(this->nav, pressed, button, p, NULL)) {
-			dbg(lvl_debug,"navit has handled button\n");
+			dbg(lvl_debug,"navit has handled button");
 			return;
 		}
-		dbg(lvl_debug,"menu_on_map_click=%d\n",this->menu_on_map_click);
+		dbg(lvl_debug,"menu_on_map_click=%d",this->menu_on_map_click);
 		if (button != 1)
 			return;
 		if (this->on_map_click || this->menu_on_map_click) {
@@ -2688,7 +2688,7 @@ static void gui_internal_resize(void *data, int w, int h)
 	 */
 	if (!changed && this->gra && graphics_get_data(this->gra, "padding"))
 		changed = 1;
-	dbg(lvl_debug,"w=%d h=%d children=%p\n", w, h, this->root.children);
+	dbg(lvl_debug,"w=%d h=%d children=%p", w, h, this->root.children);
 	navit_handle_resize(this->nav, w, h);
 	if (this->root.children) {
 		if (changed) {
@@ -2805,7 +2805,7 @@ gui_internal_keynav_find_closest(struct widget *wi, struct point *p, int dx, int
 			if (dist1 < 0)
 				dist1=-dist1;
 		}
-		dbg(lvl_debug,"checking %d,%d %d %d against %d,%d-%d,%d result %d,%d\n", p->x, p->y, dx, dy, wi->p.x, wi->p.y, wi->p.x+wi->w, wi->p.y+wi->h, dist1, dist2);
+		dbg(lvl_debug,"checking %d,%d %d %d against %d,%d-%d,%d result %d,%d", p->x, p->y, dx, dy, wi->p.x, wi->p.y, wi->p.x+wi->w, wi->p.y+wi->h, dist1, dist2);
 		if (dist1 >= 0) {
 			if (dist2 < 0)
 				dist1-=dist2;
@@ -2855,7 +2855,7 @@ gui_internal_keynav_highlight_next(struct gui_priv *this, int dx, int dy, int ro
 		gui_internal_keynav_find_closest(menu, &p, 0, 0, &distance, &result);
 		if (result) {
 			gui_internal_keynav_point(result, dx, dy, &p);
-			dbg(lvl_debug,"result origin=%p p=%d,%d\n", result, p.x, p.y);
+			dbg(lvl_debug,"result origin=%p p=%d,%d", result, p.x, p.y);
 			current_highlight = result;
 		}
 	}
@@ -2867,7 +2867,7 @@ gui_internal_keynav_highlight_next(struct gui_priv *this, int dx, int dy, int ro
 		gui_internal_keynav_find_prev(menu, current_highlight, &result);
 	else
 		gui_internal_keynav_find_closest(menu, &p, dx, dy, &distance, &result);
-	dbg(lvl_debug,"result=%p\n", result);
+	dbg(lvl_debug,"result=%p", result);
 	if (! result) {
 		if (dx < 0) {
 			p.x=this->root.w;
@@ -2884,7 +2884,7 @@ gui_internal_keynav_highlight_next(struct gui_priv *this, int dx, int dy, int ro
 		result=NULL;
 		distance=INT_MAX;
 		gui_internal_keynav_find_closest(menu, &p, dx, dy, &distance, &result);
-		dbg(lvl_debug,"wraparound result=%p\n", result);
+		dbg(lvl_debug,"wraparound result=%p", result);
 	}
 	gui_internal_highlight_do(this, result);
 	if (result)
@@ -2992,7 +2992,7 @@ static int gui_internal_set_graphics(struct gui_priv *this, struct graphics *gra
 
 	win=graphics_get_data(gra, "window");
         if (! win) {
-		dbg(lvl_error, "failed to obtain window from graphics plugin, cannot set graphics\n");
+		dbg(lvl_error, "failed to obtain window from graphics plugin, cannot set graphics");
                 return 1;
 	}
 	navit_ignore_graphics_events(this->nav, 1);
@@ -3156,10 +3156,10 @@ line_intersection(struct coord* a1, struct coord *a2, struct coord * b1, struct
         if (a > n || b > n)
                 return FALSE;
 	if (n == 0) {
-		dbg(lvl_info,"a=%d b=%d n=%d\n", a, b, n);
-		dbg(lvl_info,"a1=0x%x,0x%x ad %d,%d\n", a1->x, a1->y, adx, ady);
-		dbg(lvl_info,"b1=0x%x,0x%x bd %d,%d\n", b1->x, b1->y, bdx, bdy);
-		dbg(lvl_info,"No intersection found, lines assumed parallel ?\n");
+		dbg(lvl_info,"a=%d b=%d n=%d", a, b, n);
+		dbg(lvl_info,"a1=0x%x,0x%x ad %d,%d", a1->x, a1->y, adx, ady);
+		dbg(lvl_info,"b1=0x%x,0x%x bd %d,%d", b1->x, b1->y, bdx, bdy);
+		dbg(lvl_info,"No intersection found, lines assumed parallel ?");
 		return FALSE;
 	}
         res->x = a1->x + a * adx / n;
diff --git a/navit/gui/internal/gui_internal_bookmark.c b/navit/gui/internal/gui_internal_bookmark.c
index eed0de123..7ae4df68e 100644
--- a/navit/gui/internal/gui_internal_bookmark.c
+++ b/navit/gui/internal/gui_internal_bookmark.c
@@ -21,7 +21,7 @@ gui_internal_cmd_add_bookmark_do(struct gui_priv *this, struct widget *widget)
 {
 	GList *l;
 	struct attr attr;
-	dbg(lvl_debug,"text='%s'\n", widget->text);
+	dbg(lvl_debug,"text='%s'", widget->text);
 	if (widget->text && strlen(widget->text)){
 		navit_get_attr(this->nav, attr_bookmarks, &attr, NULL);
 		bookmarks_add_bookmark(attr.u.bookmarks, &widget->c, widget->text);
@@ -37,7 +37,7 @@ gui_internal_cmd_add_bookmark_folder_do(struct gui_priv *this, struct widget *wi
 {
 	GList *l;
 	struct attr attr;
-	dbg(lvl_debug,"text='%s'\n", widget->text);
+	dbg(lvl_debug,"text='%s'", widget->text);
 	if (widget->text && strlen(widget->text)){
 		navit_get_attr(this->nav, attr_bookmarks, &attr, NULL);
 		bookmarks_add_bookmark(attr.u.bookmarks, NULL, widget->text);
@@ -66,7 +66,7 @@ gui_internal_cmd_rename_bookmark_clicked(struct gui_priv *this, struct widget *w
 	struct widget *w=(struct widget*)widget->data;
 	GList *l;
 	struct attr attr;
-	dbg(lvl_debug,"text='%s'\n", w->text);
+	dbg(lvl_debug,"text='%s'", w->text);
 	if (w->text && strlen(w->text)){
 		navit_get_attr(this->nav, attr_bookmarks, &attr, NULL);
 		bookmarks_rename_bookmark(attr.u.bookmarks, w->name, w->text);
diff --git a/navit/gui/internal/gui_internal_command.c b/navit/gui/internal/gui_internal_command.c
index a91f69f5f..19f0550dc 100644
--- a/navit/gui/internal/gui_internal_command.c
+++ b/navit/gui/internal/gui_internal_command.c
@@ -161,11 +161,11 @@ gui_internal_cmd_escape(struct gui_priv *this, char *function, struct attr **in,
 {
 	struct attr escaped;
 	if (!in || !in[0]) {
-		dbg(lvl_error,"first parameter missing or wrong type\n");
+		dbg(lvl_error,"first parameter missing or wrong type");
 		return;
 	}
 	if (!out) {
-		dbg(lvl_error,"output missing\n");
+		dbg(lvl_error,"output missing");
 		return;
 	}
 	if (ATTR_IS_STRING(in[0]->type)) {
@@ -175,10 +175,10 @@ gui_internal_cmd_escape(struct gui_priv *this, char *function, struct attr **in,
 		escaped.type=attr_type_string_begin;
 		escaped.u.str=g_strdup_printf("%ld",in[0]->u.num);
 	} else {
-		dbg(lvl_error,"first parameter wrong type\n");
+		dbg(lvl_error,"first parameter wrong type");
 		return;
 	}
-	dbg(lvl_debug,"in %s result %s\n",in[0]->u.str,escaped.u.str);
+	dbg(lvl_debug,"in %s result %s",in[0]->u.str,escaped.u.str);
 	*out=attr_generic_add_attr(*out, attr_dup(&escaped));
 	g_free(escaped.u.str);
 }
@@ -479,6 +479,9 @@ gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, st
 	struct heightline *heightline,*heightlines=NULL;
 	struct diagram_point *min,*diagram_point,*diagram_points=NULL;
 	struct point p[2];
+	int min_ele=INT_MAX;
+	int max_ele=INT_MIN;
+	int distance=0;
 	sel.next=NULL;
 	sel.order=18;
 	sel.range.min=type_height_line_1;
@@ -512,14 +515,14 @@ gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, st
 			while ((map=mapset_next(msh, 1))) {
 				struct attr data_attr;
 				if (map_get_attr(map, attr_data, &data_attr, NULL)){
-					dbg(lvl_debug,"map name = %s\n",data_attr.u.str);
+					dbg(lvl_debug,"map name = %s",data_attr.u.str);
 					if (strstr(data_attr.u.str,".heightlines.bin")){
-						dbg(lvl_info,"reading heightlines from map %s\n",data_attr.u.str);
+						dbg(lvl_info,"reading heightlines from map %s",data_attr.u.str);
 						mr=map_rect_new(map, &sel);
 						heightmap_installed = TRUE;
 					}
 					else {
-						dbg(lvl_debug,"ignoring map %s\n",data_attr.u.str);
+						dbg(lvl_debug,"ignoring map %s",data_attr.u.str);
 					}
 				}
 				if (mr) {
@@ -577,7 +580,10 @@ gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, st
 										diagram_point->next=diagram_points;
 										diagram_points=diagram_point;
 										diagram_points_count ++;
-										dbg(lvl_debug,"%d %d\n", diagram_point->c.x, diagram_point->c.y);
+										dbg(lvl_debug,"%d %d", diagram_point->c.x, diagram_point->c.y);
+										max_ele=MAX(max_ele, diagram_point->c.y);
+										min_ele=MIN(min_ele, diagram_point->c.y);
+										distance=diagram_point->c.x;
 									}
 								}
 							}
@@ -623,12 +629,12 @@ gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, st
 			coord_rect_extend(&dbbox, &diagram_point->c);
 		diagram_point=diagram_point->next;
 	}
-	dbg(lvl_debug,"%d %d %d %d\n", dbbox.lu.x, dbbox.lu.y, dbbox.rl.x, dbbox.rl.y);
+	dbg(lvl_debug,"%d %d %d %d", dbbox.lu.x, dbbox.lu.y, dbbox.rl.x, dbbox.rl.y);
 	if (dbbox.rl.x > dbbox.lu.x && dbbox.lu.x*100/(dbbox.rl.x-dbbox.lu.x) <= 25)
 		dbbox.lu.x=0;
 	if (dbbox.lu.y > dbbox.rl.y && dbbox.rl.y*100/(dbbox.lu.y-dbbox.rl.y) <= 25)
 		dbbox.rl.y=0;
-	dbg(lvl_debug,"%d,%d %dx%d\n", box->p.x, box->p.y, box->w, box->h);
+	dbg(lvl_debug,"%d,%d %dx%d", box->p.x, box->p.y, box->w, box->h);
 	x=dbbox.lu.x;
 	first=1;
 	if (diagram_points_count > 1 && dbbox.rl.x != dbbox.lu.x && dbbox.lu.y != dbbox.rl.y){
@@ -644,7 +650,7 @@ gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, st
 				break;
 			p[1].x=(min->c.x-dbbox.lu.x)*(box->w-10)/(dbbox.rl.x-dbbox.lu.x)+box->p.x+5;
 			p[1].y=(box->h)-5-(min->c.y-dbbox.rl.y)*(box->h-10)/(dbbox.lu.y-dbbox.rl.y)+box->p.y;
-			dbg(lvl_debug,"%d,%d=%d,%d\n",min->c.x, min->c.y, p[1].x,p[1].y);
+			dbg(lvl_debug,"%d,%d=%d,%d",min->c.x, min->c.y, p[1].x,p[1].y);
 			graphics_draw_circle(this->gra, this->foreground, &p[1], 2);
 			if (first)
 				first=0;
@@ -654,6 +660,17 @@ gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, st
 			x=min->c.x+1;
 		}
 	}
+
+	struct point pTopLeft={0, box->p.y + 10};
+	struct point pBottomLeft={0, box->h + box->p.y - 2};
+	struct point pBottomRight={box->w - 100, box->h + box->p.y - 2};
+	char* minele_text=g_strdup_printf("%d m", min_ele);
+	char* maxele_text=g_strdup_printf("%d m", max_ele);
+	char* distance_text=g_strdup_printf("%.3f km", distance/1000.0);
+	graphics_draw_text_std(this->gra, 10, maxele_text, &pTopLeft);
+	graphics_draw_text_std(this->gra, 10, minele_text, &pBottomLeft);
+	graphics_draw_text_std(this->gra, 10, distance_text, &pBottomRight);
+
 	while (diagram_points){
 		diagram_point=diagram_points;
 		diagram_points=diagram_points->next;
@@ -709,7 +726,7 @@ gui_internal_cmd2_pois(struct gui_priv *this, char *function, struct attr **in,
 	struct attr pro;
 	struct coord c;
 
-	dbg(lvl_debug,"enter\n");
+	dbg(lvl_debug,"enter");
 	if (!in || !in[0])
 		return;
 	if (!ATTR_IS_COORD_GEO(in[0]->type))
@@ -826,7 +843,7 @@ gui_internal_cmd2_network_info(struct gui_priv *this, char *function, struct att
 	gui_internal_menu_render(this);
 	graphics_draw_mode(this->gra, draw_mode_end);
 #else
-	dbg(lvl_error, "Cannot show network info: ifaddr.h not found\n");
+	dbg(lvl_error, "Cannot show network info: ifaddr.h not found");
 #endif
 }
 
@@ -1002,7 +1019,7 @@ gui_internal_cmd2_position(struct gui_priv *this, char *function, struct attr **
 	const char *name=_("Position");
 	int flags=-1;
 
-	dbg(lvl_debug,"enter\n");
+	dbg(lvl_debug,"enter");
 	if (!in || !in[0])
 		return;
 	if (!ATTR_IS_COORD_GEO(in[0]->type))
@@ -1012,7 +1029,7 @@ gui_internal_cmd2_position(struct gui_priv *this, char *function, struct attr **
 		if (in[2] && ATTR_IS_INT(in[2]->type))
 			flags=in[2]->u.num;
 	}
-	dbg(lvl_debug,"flags=0x%x\n",flags);
+	dbg(lvl_debug,"flags=0x%x",flags);
 	gui_internal_cmd_position_do(this, NULL, in[0]->u.coord_geo, NULL, name, flags);
 }
 
@@ -1035,14 +1052,14 @@ gui_internal_cmd2_set(struct gui_priv *this, char *function, struct attr **in, s
 {
 	char *pattern,*command=NULL;
 	if (!in || !in[0] || !ATTR_IS_STRING(in[0]->type)) {
-		dbg(lvl_error,"first parameter missing or wrong type\n");
+		dbg(lvl_error,"first parameter missing or wrong type");
 		return;
 	}
 	pattern=in[0]->u.str;
-	dbg(lvl_debug,"pattern %s\n",pattern);
+	dbg(lvl_debug,"pattern %s",pattern);
 	if (in[1]) {
 		command=gui_internal_cmd_match_expand(pattern, in+1);
-		dbg(lvl_debug,"expand %s\n",command);
+		dbg(lvl_debug,"expand %s",command);
 		gui_internal_set(pattern, command);
 		command_evaluate(&this->self, command);
 		g_free(command);
@@ -1086,7 +1103,7 @@ static void
 gui_internal_cmd_write(struct gui_priv * this, char *function, struct attr **in, struct attr ***out, int *valid)
 {
 	char *str=NULL;
-	dbg(lvl_debug,"enter %s %p %p %p\n",function,in,out,valid);
+	dbg(lvl_debug,"enter %s %p %p %p",function,in,out,valid);
 	if (!in)
 		return;
 	while (*in) {
@@ -1096,7 +1113,7 @@ gui_internal_cmd_write(struct gui_priv * this, char *function, struct attr **in,
 	if (str) {
 		str=g_strdup_printf("<html>%s</html>\n",str);
 #if 0
-		dbg(lvl_debug,"%s\n",str);
+		dbg(lvl_debug,"%s",str);
 #endif
 		gui_internal_html_parse_text(this, str);
 	}
@@ -1119,11 +1136,11 @@ gui_internal_onclick(struct attr ***in, char **onclick, char *set)
 			char format[4],*end=strchr(c+2,'}'),*replacement=NULL,*new_str;
 			int is_arg;
 			if (!end) {
-				dbg(lvl_error,"Missing closing brace in format string %s\n",c);
+				dbg(lvl_error,"Missing closing brace in format string %s",c);
 				goto error;
 			}
 			if (end-c > sizeof(format)) {
-				dbg(lvl_error,"Invalid format string %s\n",c);
+				dbg(lvl_error,"Invalid format string %s",c);
 				goto error;
 			}
 			strncpy(format, c+2, end-c-2);
@@ -1150,7 +1167,7 @@ gui_internal_onclick(struct attr ***in, char **onclick, char *set)
 				}
 			}	
 			if (!replacement) {
-				dbg(lvl_error,"Unsupported format string %s\n",format);
+				dbg(lvl_error,"Unsupported format string %s",format);
 				goto error;
 			}
 			new_str=g_strconcat(str, replacement, end+1, NULL);
@@ -1193,7 +1210,7 @@ gui_internal_cmd_img(struct gui_priv * this, char *function, struct attr **in, s
 			str=gui_internal_append_attr(str, escape_mode_string|escape_mode_html, " class=", *in, "");
 		in++;
 	} else {
-		dbg(lvl_error,"argument error: class argument not string\n");
+		dbg(lvl_error,"argument error: class argument not string");
 		goto error;
 	}
 	if (ATTR_IS_STRING((*in)->type) && (*in)->u.str) {
@@ -1202,7 +1219,7 @@ gui_internal_cmd_img(struct gui_priv * this, char *function, struct attr **in, s
 		}
 		in++;
 	} else {
-		dbg(lvl_error,"argument error: image argument not string\n");
+		dbg(lvl_error,"argument error: image argument not string");
 		goto error;
 	}
 	if (ATTR_IS_STRING((*in)->type) && (*in)->u.str) {
@@ -1213,7 +1230,7 @@ gui_internal_cmd_img(struct gui_priv * this, char *function, struct attr **in, s
 		}
 		in++;
 	} else {
-		dbg(lvl_error,"argument error: text argument not string\n");
+		dbg(lvl_error,"argument error: text argument not string");
 		goto error;
 	}
 	gui_internal_onclick(&in,&onclick,NULL);
@@ -1239,16 +1256,16 @@ static void
 gui_internal_cmd_debug(struct gui_priv * this, char *function, struct attr **in, struct attr ***out, int *valid)
 {
 	char *str;
-	dbg(lvl_debug,"begin\n");
+	dbg(lvl_debug,"begin");
 	if (in) {
 		while (*in) {
 			str=attr_to_text(*in, NULL, 0);
-			dbg(lvl_debug,"%s:%s\n",attr_to_name((*in)->type),str);
+			dbg(lvl_debug,"%s:%s",attr_to_name((*in)->type),str);
 			in++;
 			g_free(str);
 		}
 	}
-	dbg(lvl_debug,"done\n");
+	dbg(lvl_debug,"done");
 }
 
 static void
diff --git a/navit/gui/internal/gui_internal_gesture.c b/navit/gui/internal/gui_internal_gesture.c
index d01a80f1d..3ab0ec46b 100644
--- a/navit/gui/internal/gui_internal_gesture.c
+++ b/navit/gui/internal/gui_internal_gesture.c
@@ -61,7 +61,7 @@ gui_internal_gesture_ring_add(struct gui_priv *this, struct point *p)
    	}
 	this->gesture_ring[this->gesture_ring_last].p=*p;
 	this->gesture_ring[this->gesture_ring_last].msec=msec;
-	dbg(lvl_info,"msec="LONGLONG_FMT" x=%d y=%d\n",msec,p->x,p->y);
+	dbg(lvl_info,"msec="LONGLONG_FMT" x=%d y=%d",msec,p->x,p->y);
 };
 
 int
@@ -89,7 +89,7 @@ gui_internal_gesture_get_vector(struct gui_priv *this, long long msec, struct po
 		*p0=g->p;
 	}
 	msec=g->msec;
-	dbg(lvl_info,LONGLONG_FMT" %d %d\n",g->msec, g->p.x, g->p.y);
+	dbg(lvl_info,LONGLONG_FMT" %d %d",g->msec, g->p.x, g->p.y);
 	for(i=1;(g=gui_internal_gesture_ring_get(this,i))!=NULL;i++) {
 		if( msec-g->msec > 1000 )
 			break;
@@ -99,7 +99,7 @@ gui_internal_gesture_get_vector(struct gui_priv *this, long long msec, struct po
 		if(p0) {
 			*p0=g->p;
 		}
-		dbg(lvl_info,LONGLONG_FMT" %d %d\n",g->msec, g->p.x, g->p.y);
+		dbg(lvl_info,LONGLONG_FMT" %d %d",g->msec, g->p.x, g->p.y);
 	}
 	return dt;
 }
@@ -114,7 +114,7 @@ gui_internal_gesture_do(struct gui_priv *this)
 
 	if( abs(dx) > this->icon_s*3 && abs(dy) < this->icon_s ) {
 		struct widget *wt;
-		dbg(lvl_debug,"horizontal dx=%d dy=%d\n",dx,dy);
+		dbg(lvl_debug,"horizontal dx=%d dy=%d",dx,dy);
 
 		/* Prevent swiping if widget was scrolled beforehand */
 		if(this->pressed==2)
@@ -133,11 +133,11 @@ gui_internal_gesture_do(struct gui_priv *this)
 			gui_internal_table_button_prev(this,NULL,wt);
 		return 1;
 	} else if( abs(dy) > this->icon_s*3 && abs(dx) < this->icon_s ) {
-		dbg(lvl_debug,"vertical dx=%d dy=%d\n",dx,dy);
+		dbg(lvl_debug,"vertical dx=%d dy=%d",dx,dy);
 	} else if (dt>300 && abs(dx) <this->icon_s && abs(dy) <this->icon_s ) {
-		dbg(lvl_debug,"longtap dx=%d dy=%d\n",dx,dy);
+		dbg(lvl_debug,"longtap dx=%d dy=%d",dx,dy);
 	} else {
-		dbg(lvl_debug,"none dx=%d dy=%d\n",dx,dy);
+		dbg(lvl_debug,"none dx=%d dy=%d",dx,dy);
 	}
 	
 	return 0;
diff --git a/navit/gui/internal/gui_internal_html.c b/navit/gui/internal/gui_internal_html.c
index c52cd30ee..01371ccc2 100644
--- a/navit/gui/internal/gui_internal_html.c
+++ b/navit/gui/internal/gui_internal_html.c
@@ -96,7 +96,7 @@ gui_internal_html_submit(struct gui_priv *this, struct widget *w, void *data)
 	struct widget *menu;
 	GList *l;
 
-	dbg(lvl_debug,"enter form %p %s\n",w->form,w->form->onsubmit);
+	dbg(lvl_debug,"enter form %p %s",w->form,w->form->onsubmit);
 	l=g_list_last(this->root.children);
 	menu=l->data;
 	graphics_draw_mode(this->gra, draw_mode_begin);
@@ -113,7 +113,7 @@ gui_internal_html_load_href(struct gui_priv *this, char *href, int replace)
 	if (replace)
 		gui_internal_prune_menu_count(this, 1, 0);
 	if (href && href[0] == '#') {
-		dbg(lvl_debug,"href=%s\n",href);
+		dbg(lvl_debug,"href=%s",href);
 		g_free(this->href);
 		this->href=g_strdup(href);
 		gui_internal_html_menu(this, this->html_text, href+1);
@@ -376,22 +376,22 @@ gui_internal_refresh_callback_called(struct gui_priv *this, struct menu_data *me
 static void
 gui_internal_set_refresh_callback(struct gui_priv *this, char *cond)
 {
-	dbg(lvl_info,"cond=%s\n",cond);
+	dbg(lvl_info,"cond=%s",cond);
 	if (cond) {
 		enum attr_type type;
 		struct object_func *func;
 		struct menu_data *menu_data=gui_internal_menu_data(this);
-		dbg(lvl_info,"navit=%p\n",this->nav);
+		dbg(lvl_info,"navit=%p",this->nav);
 		type=command_evaluate_to_attr(&this->self, cond, NULL, &menu_data->refresh_callback_obj);
 		if (type == attr_none) {
-			dbg(lvl_error,"can't get type of '%s'\n",cond);
+			dbg(lvl_error,"can't get type of '%s'",cond);
 			return;
 		}	
 		func=object_func_lookup(menu_data->refresh_callback_obj.type);
 		if (!func)
-			dbg(lvl_error,"'%s' has no functions\n",cond);
+			dbg(lvl_error,"'%s' has no functions",cond);
 		if (func && !func->add_attr)
-			dbg(lvl_error,"'%s' has no add_attr function\n",cond);
+			dbg(lvl_error,"'%s' has no add_attr function",cond);
 		if (!func || !func->add_attr)
 			return;
 		menu_data->refresh_callback.type=attr_callback;
@@ -461,7 +461,7 @@ gui_internal_html_text(xml_context *dummy, const char *text, gsize len, void *da
 		}
 		break;
 	case html_tag_script:
-		dbg(lvl_debug,"execute %s\n",text_stripped);
+		dbg(lvl_debug,"execute %s",text_stripped);
 		gui_internal_evaluate(this,text_stripped);
 		break;
 	default:
diff --git a/navit/gui/internal/gui_internal_keyboard.c b/navit/gui/internal/gui_internal_keyboard.c
index 7ef1c3d36..93480eb87 100644
--- a/navit/gui/internal/gui_internal_keyboard.c
+++ b/navit/gui/internal/gui_internal_keyboard.c
@@ -488,7 +488,7 @@ static void gui_internal_keyboard_hide_native(struct gui_priv *this_, struct wid
 		g_free(kbd->lang);
 		g_free(kbd->gui_priv);
 	} else
-		dbg(lvl_warning, "no graphics_keyboard found, cleanup failed\n");
+		dbg(lvl_warning, "no graphics_keyboard found, cleanup failed");
 	g_free(w);
 }
 
@@ -531,7 +531,7 @@ struct widget * gui_internal_keyboard_show_native(struct gui_priv *this, struct
 
 	switch(res) {
 	case -1:
-		dbg(lvl_error, "graphics has no show_native_keyboard method, cannot display keyboard\n");
+		dbg(lvl_error, "graphics has no show_native_keyboard method, cannot display keyboard");
 		/* no break */
 	case 0:
 		g_free(kbd);
@@ -552,9 +552,9 @@ struct widget * gui_internal_keyboard_show_native(struct gui_priv *this, struct
 		ret->wmin = w->wmin;
 	} else
 		ret->w = kbd->w;
-	dbg(lvl_error, "ret->w=%d, ret->h=%d\n", ret->w, ret->h);
+	dbg(lvl_error, "ret->w=%d, ret->h=%d", ret->w, ret->h);
 	ret->data = (void *) kbd;
 	gui_internal_widget_append(w, ret);
-	dbg(lvl_error, "return\n");
+	dbg(lvl_error, "return");
 	return ret;
 }
diff --git a/navit/gui/internal/gui_internal_menu.c b/navit/gui/internal/gui_internal_menu.c
index 33def9983..67da9c939 100644
--- a/navit/gui/internal/gui_internal_menu.c
+++ b/navit/gui/internal/gui_internal_menu.c
@@ -115,7 +115,7 @@ gui_internal_menu(struct gui_priv *this, const char *label)
 	if (this->gra) {
 		padding = graphics_get_data(this->gra, "padding");
 	} else
-		dbg(lvl_warning, "cannot get padding: this->gra is NULL\n");
+		dbg(lvl_warning, "cannot get padding: this->gra is NULL");
 
 	gui_internal_search_idle_end(this);
 	topbox=gui_internal_box_new_with_label(this, 0, label);
@@ -149,7 +149,7 @@ gui_internal_menu(struct gui_priv *this, const char *label)
 		struct widget *wlb,*wb,*wm=w;
 		wm->flags=gravity_center|orientation_vertical|flags_expand|flags_fill;
 		w=gui_internal_box_new(this, gravity_center|orientation_horizontal|flags_expand|flags_fill);
-		dbg(lvl_info,"topbox->menu_data=%p\n", topbox->menu_data);
+		dbg(lvl_info,"topbox->menu_data=%p", topbox->menu_data);
 		gui_internal_widget_append(wm, w);
 		wb=gui_internal_box_new(this, gravity_right_center|orientation_horizontal|flags_fill);
 		wb->bl=6;
@@ -309,7 +309,7 @@ gui_internal_top_bar(struct gui_priv *this)
 				use_sep=1;
 			else
 				use_sep=0;
-			dbg(lvl_debug,"%d (%s) + %d + %d + %d > %d\n", wcn->w, wc->text, width_used, w->spx, use_sep ? sep_len : 0, width);
+			dbg(lvl_debug,"%d (%s) + %d + %d + %d > %d", wcn->w, wc->text, width_used, w->spx, use_sep ? sep_len : 0, width);
 			if (wcn->w + width_used + w->spx + (use_sep ? sep_len : 0) + (g_list_previous(l) ? dots_len : 0) > width) {
 				incomplete=1;
 				gui_internal_widget_destroy(this, wcn);
diff --git a/navit/gui/internal/gui_internal_poi.c b/navit/gui/internal/gui_internal_poi.c
index cb31ecc95..0b904c1d2 100644
--- a/navit/gui/internal/gui_internal_poi.c
+++ b/navit/gui/internal/gui_internal_poi.c
@@ -125,7 +125,7 @@ gui_internal_poi_icon(struct gui_priv *this, struct item *item)
 								icon=g_strdup(el->u.icon.src);
 							}
 							char *dot=g_strrstr(icon,".");
-							dbg(lvl_debug,"%s %s\n", item_to_name(item->type),icon);
+							dbg(lvl_debug,"%s %s", item_to_name(item->type),icon);
 							if(dot)
 								*dot=0;
 							img=image_new_xs(this,icon);
@@ -601,7 +601,7 @@ dbg(lvl_debug,"POIs...");
 	items= g_new0( struct item_data, maxitem);
 	
 	
-	dbg(lvl_debug, "Params: sel = %i, selnb = %i, pagenb = %i, dist = %i, filterstr = %s, AddressFilterType= %d\n",
+	dbg(lvl_debug, "Params: sel = %i, selnb = %i, pagenb = %i, dist = %i, filterstr = %s, AddressFilterType= %d",
 		param->sel, param->selnb, param->pagenb, param->dist, param->filterstr, param->AddressFilterType);
 
 	wb=gui_internal_menu(this, isel ? isel->name : _("POIs"));
@@ -619,7 +619,7 @@ dbg(lvl_debug,"POIs...");
         while ((m=mapset_next(h, 1))) {
 		selm=map_selection_dup_pro(sel, pro, map_projection(m));
 		mr=map_rect_new(m, selm);
-		dbg(lvl_debug,"mr=%p\n", mr);
+		dbg(lvl_debug,"mr=%p", mr);
 		if (mr) {
 			while ((item=map_rect_get_item(mr))) {
 				if (gui_internal_cmd_pois_item_selected(param, item) &&
@@ -690,10 +690,10 @@ dbg(lvl_debug,"POIs...");
 		struct item_data *data = fh_extractmin(fh);
 		if (data == NULL)
 		{
-			dbg(lvl_debug, "Empty heap: maxitem = %i, it = %i, dist = %i\n", maxitem, it, dist);
+			dbg(lvl_debug, "Empty heap: maxitem = %i, it = %i, dist = %i", maxitem, it, dist);
 			break;
 		}
-		dbg(lvl_debug, "dist1: %i, dist2: %i\n", data->dist, (-key)>>10);
+		dbg(lvl_debug, "dist1: %i, dist2: %i", data->dist, (-key)>>10);
 		if(i==(it-pagesize*pagenb) && data->dist>prevdist)
 			prevdist=data->dist;
 		wi=gui_internal_cmd_pois_item(this, &center, &data->item, &data->c, route.u.route, data->dist, data->label);
@@ -772,13 +772,13 @@ dbg(lvl_debug,"POIs...");
 		while(firstrow>=0) {
 			int currow=g_list_index(wtable->children, td->bottom_row->data) - firstrow;
 			if(currow<0) {
-				dbg(lvl_debug,"Can't find bottom row in children list. Stop paging.\n");
+				dbg(lvl_debug,"Can't find bottom row in children list. Stop paging.");
 				break;
 			}
 			if(currow>=param->count)
 				break;
 			if(!(td->scroll_buttons.next_button->state & STATE_SENSITIVE)) {
-				dbg(lvl_debug,"Reached last page but item %i not found. Stop paging.\n",param->count);
+				dbg(lvl_debug,"Reached last page but item %i not found. Stop paging.",param->count);
 				break;
 			}
 			gui_internal_table_button_next(this, td->scroll_buttons.next_button, NULL);
diff --git a/navit/gui/internal/gui_internal_search.c b/navit/gui/internal/gui_internal_search.c
index ceeeb7438..54fd55a57 100644
--- a/navit/gui/internal/gui_internal_search.c
+++ b/navit/gui/internal/gui_internal_search.c
@@ -87,7 +87,7 @@ gui_internal_search_cmp(gconstpointer _a, gconstpointer _b)
   sa=removecase(a->text);
   sb=removecase(b->text);
   r=strcmp(sa,sb);
-  dbg(lvl_debug,"%s %s %d\n",sa,sb,r);
+  dbg(lvl_debug,"%s %s %d",sa,sb,r);
   g_free(sa);
   g_free(sb);
   return r;
@@ -210,7 +210,7 @@ gui_internal_find_next_possible_key(char *search_text, char *wm_name, char *poss
 				possible_keys[len]=trunk_name[next_char_pos];
 				possible_keys[len+1]='\0';
 			}
-			dbg(lvl_info,"searching for %s, found: %s, currently possible_keys: %s \n", search_text, item_name, possible_keys);
+			dbg(lvl_info,"searching for %s, found: %s, currently possible_keys: %s ", search_text, item_name, possible_keys);
 		}
 	}
 }
@@ -290,7 +290,7 @@ gui_internal_get_match_quality(char *item_name, char* search_text, int is_house_
 			if(!exp)
 				continue;
 			if(!strcmp(exp,folded_query)) {
-				dbg(lvl_debug,"exact match for the whole string %s\n", exp);
+				dbg(lvl_debug,"exact match for the whole string %s", exp);
 				match_quality=full_string_match;
 				g_free(exp);
 				break;
@@ -298,7 +298,7 @@ gui_internal_get_match_quality(char *item_name, char* search_text, int is_house_
 			if((p=strstr(exp,folded_query))!=NULL) {
 				p+=strlen(folded_query);
 				if(!*p||strchr(LINGUISTICS_WORD_SEPARATORS_ASCII,*p)) {
-					dbg(lvl_debug,"exact matching word found inside string %s\n",exp);
+					dbg(lvl_debug,"exact matching word found inside string %s",exp);
 					match_quality=word_match;
 				}
 			}
@@ -385,7 +385,7 @@ gui_internal_search_idle(struct gui_priv *this, char *wm_name, struct widget *se
 		widget_name=g_strdup(result_main_label);
 	}
 	if(!item_name) {
-		dbg(lvl_error, "Skipping nameless item in search (search type: %s). Please report this as a bug.\n", wm_name);
+		dbg(lvl_error, "Skipping nameless item in search (search type: %s). Please report this as a bug.", wm_name);
 		return;
 	}
 
@@ -444,13 +444,13 @@ gui_internal_search_changed(struct gui_priv *this, struct widget *wm, void *data
 		param=(void *)5;
 	if (! strcmp(wm->name,"House number"))
 		param=(void *)6;
-	dbg(lvl_debug,"%s now '%s'\n", wm->name, wm->text);
+	dbg(lvl_debug,"%s now '%s'", wm->name, wm->text);
 
 	gui_internal_search_idle_end(this);
 	if (wm->text && g_utf8_strlen(wm->text, -1) > 0) {
 		struct attr search_attr;
 
-		dbg(lvl_debug,"process\n");
+		dbg(lvl_debug,"process");
 		if (! strcmp(wm->name,"Country"))
 			search_attr.type=attr_country_all;
 		if (! strcmp(wm->name,"Town"))
@@ -488,7 +488,7 @@ gui_internal_search_list_set_default_country(struct gui_priv *this)
 		item=country_search_get_item(cs);
 		if (item && item_attr_get(item, attr_country_name, &country_name)) {
 			search_attr.type=attr_country_all;
-			dbg(lvl_debug,"country %s\n", country_name.u.str);
+			dbg(lvl_debug,"country %s", country_name.u.str);
 			search_attr.u.str=country_name.u.str;
 			search_list_search(this->sl, &search_attr, 0);
 			while((res=search_list_get_result(this->sl)));
@@ -501,9 +501,9 @@ gui_internal_search_list_set_default_country(struct gui_priv *this)
 		}
 		country_search_destroy(cs);
 	} else {
-		dbg(lvl_error,"warning: no default country found\n");
+		dbg(lvl_error,"warning: no default country found");
 		if (this->country_iso2) {
-		    dbg(lvl_debug,"attempting to use country '%s'\n",this->country_iso2);
+		    dbg(lvl_debug,"attempting to use country '%s'",this->country_iso2);
 		    search_attr.type=attr_country_iso2;
 		    search_attr.u.str=this->country_iso2;
             search_list_search(this->sl, &search_attr, 0);
@@ -604,7 +604,7 @@ gui_internal_search(struct gui_priv *this, const char *what, const char *type, i
 void
 gui_internal_search_house_number_in_street(struct gui_priv *this, struct widget *widget, void *data)
 {
-	dbg(lvl_info,"id %d\n", widget->selection_id);
+	dbg(lvl_info,"id %d", widget->selection_id);
 	search_list_select(this->sl, attr_street_name, 0, 0);
 	search_list_select(this->sl, attr_street_name, widget->selection_id, 1);
 	gui_internal_search(this,_("House number"),"House number",0);
@@ -613,7 +613,7 @@ gui_internal_search_house_number_in_street(struct gui_priv *this, struct widget
 void
 gui_internal_search_street_in_town(struct gui_priv *this, struct widget *widget, void *data)
 {
-	dbg(lvl_info,"id %d\n", widget->selection_id);
+	dbg(lvl_info,"id %d", widget->selection_id);
 	search_list_select(this->sl, attr_town_or_district_name, 0, 0);
 	search_list_select(this->sl, attr_town_or_district_name, widget->selection_id, 1);
 	gui_internal_search(this,_("Street"),"Street",0);
@@ -623,7 +623,7 @@ void
 gui_internal_search_town_in_country(struct gui_priv *this, struct widget *widget)
 {
 	struct search_list_common *slc;
-	dbg(lvl_info,"id %d\n", widget->selection_id);
+	dbg(lvl_info,"id %d", widget->selection_id);
 	search_list_select(this->sl, attr_country_all, 0, 0);
 	slc=search_list_select(this->sl, attr_country_all, widget->selection_id, 1);
 	if (slc) {
diff --git a/navit/gui/internal/gui_internal_widget.c b/navit/gui/internal/gui_internal_widget.c
index 3e1993025..98b690578 100644
--- a/navit/gui/internal/gui_internal_widget.c
+++ b/navit/gui/internal/gui_internal_widget.c
@@ -260,7 +260,7 @@ gui_internal_highlight_do(struct gui_priv *this, struct widget *found)
 		this->highlighted_menu=g_list_last(this->root.children)->data;
 		this->highlighted->state |= STATE_HIGHLIGHTED;
 		gui_internal_widget_render(this, this->highlighted);
-		dbg(lvl_debug,"%d,%d %dx%d\n", found->p.x, found->p.y, found->w, found->h);
+		dbg(lvl_debug,"%d,%d %dx%d", found->p.x, found->p.y, found->w, found->h);
 	}
 	graphics_draw_mode(this->gra, draw_mode_end);
 }
@@ -603,7 +603,7 @@ static void gui_internal_box_pack(struct gui_priv *this, struct widget *w)
 		w->scroll_buttons->button_box->p.x=w->p.x;
 		w->scroll_buttons->button_box->p.y=w->p.y+w->h-w->scroll_buttons->button_box->h;
 		gui_internal_widget_pack(this, w->scroll_buttons->button_box);
-		dbg(lvl_debug,"needs buttons %d vs %d\n",y,w->h);
+		dbg(lvl_debug,"needs buttons %d vs %d",y,w->h);
 		gui_internal_box_pack(this, w);
 		return;
 	}