Cleanup:global:force the re-attach the return type to the function declaration (#605)

* Cleanup:global:force the re-attach the return type to the function declaration

* cleanup:global:some loose ends

18 files changed, 372 insertions, 665 deletions

diff --git a/navit/gui/gtk/datawindow.c b/navit/gui/gtk/datawindow.c
index b020d1045..afe977dbc 100644
--- a/navit/gui/gtk/datawindow.c
+++ b/navit/gui/gtk/datawindow.c
@@ -40,8 +40,7 @@ struct datawindow_priv {
 };
 
 static GValue value;
-static void
-select_row(GtkTreeView *tree, GtkTreePath *path, GtkTreeViewColumn *column, struct datawindow_priv *win) {
+static void select_row(GtkTreeView *tree, GtkTreePath *path, GtkTreeViewColumn *column, struct datawindow_priv *win) {
     char *cols[20];
     GtkTreeIter iter;
     GtkTreeModel *model;
@@ -61,8 +60,7 @@ select_row(GtkTreeView *tree, GtkTreePath *path, GtkTreeViewColumn *column, stru
     callback_call_1(win->click, cols);
 }
 
-static void
-gui_gtk_datawindow_add(struct datawindow_priv *win, struct param_list *param, int count) {
+static void gui_gtk_datawindow_add(struct datawindow_priv *win, struct param_list *param, int count) {
     int i;
     GtkCellRenderer *cell;
     GtkTreeIter iter;
@@ -118,8 +116,7 @@ gui_gtk_datawindow_add(struct datawindow_priv *win, struct param_list *param, in
     }
 }
 
-static void
-gui_gtk_datawindow_mode(struct datawindow_priv *win, int start) {
+static void gui_gtk_datawindow_mode(struct datawindow_priv *win, int start) {
     if (start) {
         if (win && win->treeview) {
             gtk_tree_view_set_model (GTK_TREE_VIEW (win->treeview), NULL);
@@ -127,8 +124,7 @@ gui_gtk_datawindow_mode(struct datawindow_priv *win, int start) {
     }
 }
 
-static gboolean
-gui_gtk_datawindow_delete(GtkWidget *widget, GdkEvent *event, struct datawindow_priv *win) {
+static gboolean gui_gtk_datawindow_delete(GtkWidget *widget, GdkEvent *event, struct datawindow_priv *win) {
     callback_call_0(win->close);
 
     if (win->button) {
@@ -138,8 +134,7 @@ gui_gtk_datawindow_delete(GtkWidget *widget, GdkEvent *event, struct datawindow_
     return FALSE;
 }
 
-void
-gui_gtk_datawindow_destroy(struct datawindow_priv *win) {
+void gui_gtk_datawindow_destroy(struct datawindow_priv *win) {
     if ((!win->gui) || (!win->gui->datawindow)) {
         return;
     }
@@ -151,13 +146,11 @@ gui_gtk_datawindow_destroy(struct datawindow_priv *win) {
     return;
 }
 
-void
-gui_gtk_datawindow_set_button(struct datawindow_priv *this_, GtkWidget *btn) {
+void gui_gtk_datawindow_set_button(struct datawindow_priv *this_, GtkWidget *btn) {
     this_->button = btn;
 }
 
-static gboolean
-keypress(GtkWidget *widget, GdkEventKey *event, struct datawindow_priv *win) {
+static gboolean keypress(GtkWidget *widget, GdkEventKey *event, struct datawindow_priv *win) {
     if (event->type != GDK_KEY_PRESS)
         return FALSE;
     if (event->keyval == GDK_Cancel) {
diff --git a/navit/gui/gtk/destination.c b/navit/gui/gtk/destination.c
index 2c3fe42b7..5f52e042b 100644
--- a/navit/gui/gtk/destination.c
+++ b/navit/gui/gtk/destination.c
@@ -195,8 +195,7 @@ static void tree_view_button_release(GtkWidget *widget, GdkEventButton *event, s
     gtk_tree_view_row_activated(GTK_TREE_VIEW(search->treeview), path, column);
 
 }
-static void
-next_focus(struct search_param *search, GtkWidget *widget) {
+static void next_focus(struct search_param *search, GtkWidget *widget) {
     if (widget == search->entry_country)
         gtk_widget_grab_focus(search->entry_city);
     if (widget == search->entry_city)
@@ -316,8 +315,7 @@ static void changed(GtkWidget *widget, struct search_param *search) {
 
 #define MAX_ARGS 8
 
-static void
-parse_xkbd_args (const char *cmd, char **argv) {
+static void parse_xkbd_args (const char *cmd, char **argv) {
     const char *p = cmd;
     char buf[strlen (cmd) + 1], *bufp = buf;
     int nargs = 0;
@@ -370,8 +368,7 @@ parse_xkbd_args (const char *cmd, char **argv) {
 
 int kbd_pid;
 
-static int
-spawn_xkbd (char *xkbd_path, char *xkbd_str) {
+static int spawn_xkbd (char *xkbd_path, char *xkbd_str) {
 #ifdef _WIN32 // AF FIXME for WIN32
 #ifndef F_SETFD
 #define F_SETFD 2
diff --git a/navit/gui/gtk/gui_gtk_action.c b/navit/gui/gtk/gui_gtk_action.c
index 5ef82afb9..ca5ff9427 100644
--- a/navit/gui/gtk/gui_gtk_action.c
+++ b/navit/gui/gtk/gui_gtk_action.c
@@ -50,18 +50,15 @@ struct menu_priv {
 
 /* Create callbacks that implement our Actions */
 
-static void
-zoom_in_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
+static void zoom_in_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
     navit_zoom_in(gui->nav, 2, NULL);
 }
 
-static void
-zoom_out_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
+static void zoom_out_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
     navit_zoom_out(gui->nav, 2, NULL);
 }
 
-static void
-refresh_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
+static void refresh_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
     navit_draw(gui->nav);
 }
 
@@ -70,8 +67,7 @@ refresh_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
 void gui_gtk_datawindow_set_button(struct datawindow_priv *this_, GtkWidget *btn);
 void gui_gtk_datawindow_destroy(struct datawindow_priv *win);
 
-static void
-roadbook_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
+static void roadbook_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
 
     if (! gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(w))) {
         gui_gtk_datawindow_destroy(gui->datawindow);
@@ -83,8 +79,7 @@ roadbook_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
     }
 }
 
-static void
-autozoom_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
+static void autozoom_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
     struct attr autozoom_attr;
 
     autozoom_attr.type = attr_autozoom_active;
@@ -97,8 +92,7 @@ autozoom_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
     navit_set_attr(gui->nav, &autozoom_attr);
 }
 
-static void
-cursor_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
+static void cursor_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
     struct attr attr;
 
     attr.type=attr_cursor;
@@ -108,8 +102,7 @@ cursor_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
     }
 }
 
-static void
-tracking_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
+static void tracking_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
     struct attr attr;
 
     attr.type=attr_tracking;
@@ -128,8 +121,7 @@ tracking_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
  *  @return void
  */
 
-static void
-follow_vehicle_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
+static void follow_vehicle_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
     struct attr attr;
 
     attr.type=attr_follow_cursor;
@@ -139,8 +131,7 @@ follow_vehicle_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
     }
 }
 
-static void
-orient_north_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
+static void orient_north_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
     struct attr attr;
 
     attr.type=attr_orientation;
@@ -150,8 +141,7 @@ orient_north_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
     }
 }
 
-static void
-window_fullscreen_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
+static void window_fullscreen_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
     if(gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(w)))
         gtk_window_fullscreen(GTK_WINDOW(gui->win));
     else
@@ -162,8 +152,7 @@ window_fullscreen_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
 #include "point.h"
 #include "transform.h"
 
-static void
-info_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
+static void info_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
     char buffer[512];
     int mw,mh;
     struct coord lt, rb;
@@ -185,23 +174,19 @@ info_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
 }
 
 
-static void
-route_clear_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
+static void route_clear_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
     navit_set_destination(gui->nav, NULL, NULL, 0);
 }
 
-static void
-poi_search_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
+static void poi_search_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
     gtk_gui_poi(gui->nav);
 }
 
-static void
-destination_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
+static void destination_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
     destination_address(gui->nav);
 }
 
-static void
-quit_action (GtkWidget *w, struct gui_priv *gui, void *dummy) {
+static void quit_action (GtkWidget *w, struct gui_priv *gui, void *dummy) {
     navit_destroy(gui->nav);
     exit(0);
 }
@@ -357,8 +342,7 @@ static struct {
 static gint n_stock_icons = G_N_ELEMENTS (stock_icons);
 
 
-static void
-register_my_stock_icons (void) {
+static void register_my_stock_icons (void) {
     GtkIconFactory *icon_factory;
     GtkIconSet *icon_set;
     GdkPixbuf *pixbuf;
@@ -447,16 +431,15 @@ static char layout[] =
 	</ui>";
 
 
-static void
-activate(void *dummy, struct menu_priv *menu) {
+static void activate(void *dummy, struct menu_priv *menu) {
     if (menu->cb)
         callback_call_0(menu->cb);
 }
 
 static struct menu_methods menu_methods;
 
-static struct menu_priv *
-add_menu(struct menu_priv *menu, struct menu_methods *meth, char *name, enum menu_type type, struct callback *cb) {
+static struct menu_priv *add_menu(struct menu_priv *menu, struct menu_methods *meth, char *name, enum menu_type type,
+                                  struct callback *cb) {
     struct menu_priv *ret;
     char *dynname;
 
@@ -490,8 +473,7 @@ add_menu(struct menu_priv *menu, struct menu_methods *meth, char *name, enum men
 
 }
 
-static void
-remove_menu(struct menu_priv *item, int recursive) {
+static void remove_menu(struct menu_priv *item, int recursive) {
 
     if (recursive) {
         struct menu_priv *next,*child=item->child;
@@ -514,13 +496,11 @@ remove_menu(struct menu_priv *item, int recursive) {
     g_free(item);
 }
 
-static void
-set_toggle(struct menu_priv *menu, int active) {
+static void set_toggle(struct menu_priv *menu, int active) {
     gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(menu->action), active);
 }
 
-static  int
-get_toggle(struct menu_priv *menu) {
+static  int get_toggle(struct menu_priv *menu) {
     return gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(menu->action));
 }
 
@@ -537,14 +517,12 @@ static struct menu_methods menu_methods = {
 };
 
 
-static void
-popup_deactivate(GtkWidget *widget, struct menu_priv *menu) {
+static void popup_deactivate(GtkWidget *widget, struct menu_priv *menu) {
     g_signal_handler_disconnect(widget, menu->handler_id);
     remove_menu(menu, 1);
 }
 
-static void
-popup_activate(struct menu_priv *menu) {
+static void popup_activate(struct menu_priv *menu) {
 #ifdef _WIN32
     menu->widget=gtk_ui_manager_get_widget(menu->gui->ui_manager, menu->path );
 #endif
@@ -552,8 +530,7 @@ popup_activate(struct menu_priv *menu) {
     menu->handler_id=g_signal_connect(menu->widget, "selection-done", G_CALLBACK(popup_deactivate), menu);
 }
 
-void
-gui_gtk_ui_init(struct gui_priv *this) {
+void gui_gtk_ui_init(struct gui_priv *this) {
     GError *error = NULL;
     struct attr attr;
     GtkToggleAction *toggle_action;
@@ -603,8 +580,8 @@ gui_gtk_ui_init(struct gui_priv *this) {
 
 }
 
-static struct menu_priv *
-gui_gtk_ui_new (struct gui_priv *this, struct menu_methods *meth, char *path, int popup, GtkWidget **widget_ret) {
+static struct menu_priv *gui_gtk_ui_new (struct gui_priv *this, struct menu_methods *meth, char *path, int popup,
+        GtkWidget **widget_ret) {
     struct menu_priv *ret;
     GtkWidget *widget;
 
diff --git a/navit/gui/gtk/gui_gtk_poi.c b/navit/gui/gtk/gui_gtk_poi.c
index 2d1dbd76c..ac2fa2221 100644
--- a/navit/gui/gtk/gui_gtk_poi.c
+++ b/navit/gui/gtk/gui_gtk_poi.c
@@ -51,8 +51,7 @@ static struct gtk_poi_search {
     struct navit *nav;
 } gtk_poi_search;
 
-static GdkPixbuf *
-geticon(const char *name) {
+static GdkPixbuf *geticon(const char *name) {
     GdkPixbuf *icon=NULL;
     GError *error=NULL;
     icon=gdk_pixbuf_new_from_file(graphics_icon_path(name),&error);
@@ -63,8 +62,7 @@ geticon(const char *name) {
 }
 
 /** Build the category list model with icons. */
-static GtkTreeModel *
-category_list_model(struct gtk_poi_search *search) {
+static GtkTreeModel *category_list_model(struct gtk_poi_search *search) {
     GtkTreeIter iter;
     gtk_list_store_append(search->store_cat, &iter);
     gtk_list_store_set(search->store_cat, &iter, 0,geticon("pharmacy.png"), 1, _("Pharmacy"), 2, "poi_pharmacy", -1);
@@ -103,8 +101,7 @@ category_list_model(struct gtk_poi_search *search) {
 
 
 /** Construct model of POIs from map information. */
-static GtkTreeModel *
-model_poi (struct gtk_poi_search *search) {
+static GtkTreeModel *model_poi (struct gtk_poi_search *search) {
     GtkTreeIter iter;
     struct map_selection *sel,*selm;
     struct coord coord_item,center;
@@ -187,8 +184,7 @@ model_poi (struct gtk_poi_search *search) {
 }
 
 /** Enable button if there is a selected row. */
-static void
-treeview_poi_changed(GtkWidget *widget, struct gtk_poi_search *search) {
+static void treeview_poi_changed(GtkWidget *widget, struct gtk_poi_search *search) {
     GtkTreePath *path;
     GtkTreeViewColumn *focus_column;
     GtkTreeIter iter;
@@ -203,8 +199,7 @@ treeview_poi_changed(GtkWidget *widget, struct gtk_poi_search *search) {
 }
 
 /** Reload the POI list and disable buttons. */
-static void
-treeview_poi_reload(GtkWidget *widget, struct gtk_poi_search *search) {
+static void treeview_poi_reload(GtkWidget *widget, struct gtk_poi_search *search) {
     GtkTreePath *path;
     GtkTreeViewColumn *focus_column;
     GtkTreeIter iter;
@@ -221,8 +216,7 @@ treeview_poi_reload(GtkWidget *widget, struct gtk_poi_search *search) {
 }
 
 /** Set the selected POI as destination. */
-static void
-button_destination_clicked(GtkWidget *widget, struct gtk_poi_search *search) {
+static void button_destination_clicked(GtkWidget *widget, struct gtk_poi_search *search) {
     GtkTreePath *path;
     GtkTreeViewColumn *focus_column;
     GtkTreeIter iter;
@@ -255,8 +249,7 @@ button_destination_clicked(GtkWidget *widget, struct gtk_poi_search *search) {
 }
 
 /* Show the POI's position in the map. */
-static void
-button_map_clicked(GtkWidget *widget, struct gtk_poi_search *search) {
+static void button_map_clicked(GtkWidget *widget, struct gtk_poi_search *search) {
     GtkTreePath *path;
     GtkTreeViewColumn *focus_column;
     GtkTreeIter iter;
@@ -277,8 +270,7 @@ button_map_clicked(GtkWidget *widget, struct gtk_poi_search *search) {
 }
 
 /** Set POI as the first "visit before". */
-static void
-button_visit_clicked(GtkWidget *widget, struct gtk_poi_search *search) {
+static void button_visit_clicked(GtkWidget *widget, struct gtk_poi_search *search) {
     GtkTreePath *path;
     GtkTreeViewColumn *focus_column;
     GtkTreeIter iter;
diff --git a/navit/gui/gtk/gui_gtk_statusbar.c b/navit/gui/gtk/gui_gtk_statusbar.c
index 3f10db7cd..f245312d1 100644
--- a/navit/gui/gtk/gui_gtk_statusbar.c
+++ b/navit/gui/gtk/gui_gtk_statusbar.c
@@ -46,14 +46,12 @@ struct statusbar_priv {
 };
 
 #if 0
-static void
-statusbar_destroy(struct statusbar_priv *this) {
+static void statusbar_destroy(struct statusbar_priv *this) {
     g_free(this);
 }
 
-static void
-statusbar_gps_update(struct statusbar_priv *this, int sats, int qual, double lng, double lat, double height,
-                     double direction, double speed) {
+static void statusbar_gps_update(struct statusbar_priv *this, int sats, int qual, double lng, double lat, double height,
+                                 double direction, double speed) {
     char *dirs[]= {_("N"),_("NE"),_("E"),_("SE"),_("S"),_("SW"),_("W"),_("NW"),_("N")};
     char *dir;
     int dir_idx;
@@ -81,8 +79,7 @@ static const char *status_fix2str(int type) {
     }
 }
 
-static void
-statusbar_route_update(struct statusbar_priv *this, struct navit *navit, struct vehicle *v) {
+static void statusbar_route_update(struct statusbar_priv *this, struct navit *navit, struct vehicle *v) {
     struct navigation *nav=NULL;
     struct map *map=NULL;
     struct map_rect *mr=NULL;
diff --git a/navit/gui/gtk/gui_gtk_window.c b/navit/gui/gtk/gui_gtk_window.c
index eab6dae74..fd2c092f5 100644
--- a/navit/gui/gtk/gui_gtk_window.c
+++ b/navit/gui/gtk/gui_gtk_window.c
@@ -73,8 +73,7 @@
 #define KEY_RIGHT GDK_Right
 #endif
 
-static gboolean
-keypress(GtkWidget *widget, GdkEventKey *event, struct gui_priv *this) {
+static gboolean keypress(GtkWidget *widget, GdkEventKey *event, struct gui_priv *this) {
     int w,h;
     struct transformation *t;
 #ifdef USE_HILDON
@@ -200,8 +199,7 @@ keypress(GtkWidget *widget, GdkEventKey *event, struct gui_priv *this) {
     return TRUE;
 }
 
-static int
-gui_gtk_set_graphics(struct gui_priv *this, struct graphics *gra) {
+static int gui_gtk_set_graphics(struct gui_priv *this, struct graphics *gra) {
     GtkWidget *graphics;
 
     graphics=graphics_get_data(gra, "gtk_widget");
@@ -217,8 +215,7 @@ gui_gtk_set_graphics(struct gui_priv *this, struct graphics *gra) {
     return 0;
 }
 
-static void
-gui_gtk_route_callback(struct gui_priv *gui) {
+static void gui_gtk_route_callback(struct gui_priv *gui) {
     struct attr route_attr;
     GtkAction *roadbookAction=gtk_ui_manager_get_action (gui->ui_manager,"/ui/ToolBar/ToolItems/Roadbook");
     if (roadbookAction) {
@@ -235,16 +232,14 @@ gui_gtk_route_callback(struct gui_priv *gui) {
     }
 }
 
-static void
-gui_gtk_add_bookmark_do(struct gui_priv *gui) {
+static void gui_gtk_add_bookmark_do(struct gui_priv *gui) {
     struct attr attr;
     navit_get_attr(gui->nav, attr_bookmarks, &attr, NULL);
     bookmarks_add_bookmark(attr.u.bookmarks, &gui->dialog_coord, gtk_entry_get_text(GTK_ENTRY(gui->dialog_entry)));
     gtk_widget_destroy(gui->dialog_win);
 }
 
-static int
-gui_gtk_add_bookmark(struct gui_priv *gui, struct pcoord *c, char *description) {
+static int gui_gtk_add_bookmark(struct gui_priv *gui, struct pcoord *c, char *description) {
     GtkWidget *button_ok,*button_cancel,*label,*vbox,*hbox;
 
     gui->dialog_coord=*c;
@@ -287,8 +282,7 @@ struct gui_methods gui_gtk_methods = {
     gui_gtk_add_bookmark,
 };
 
-static gboolean
-gui_gtk_delete(GtkWidget *widget, GdkEvent *event, struct navit *nav) {
+static gboolean gui_gtk_delete(GtkWidget *widget, GdkEvent *event, struct navit *nav) {
     /* FIXME remove attr_navit callback */
     navit_destroy(nav);
     exit(0);
@@ -296,8 +290,7 @@ gui_gtk_delete(GtkWidget *widget, GdkEvent *event, struct navit *nav) {
     return TRUE;
 }
 
-static void
-gui_gtk_toggle_init(struct gui_priv *this) {
+static void gui_gtk_toggle_init(struct gui_priv *this) {
     struct attr attr;
     GtkToggleAction *toggle_action;
 
@@ -326,8 +319,7 @@ struct action_cb_data {
     struct attr attr;
 };
 
-static void
-gui_gtk_action_activate(GtkAction *action, struct action_cb_data *data) {
+static void gui_gtk_action_activate(GtkAction *action, struct action_cb_data *data) {
     if(data->attr.type == attr_destination) {
         char * label;
         g_object_get(G_OBJECT(action), "label", &label,NULL);
@@ -341,14 +333,12 @@ struct gui_menu_info {
     GtkAction *action;
 };
 
-static void
-gui_gtk_del_menu(struct gui_priv *this, struct gui_menu_info *meninfo) {
+static void gui_gtk_del_menu(struct gui_priv *this, struct gui_menu_info *meninfo) {
     gtk_action_group_remove_action(this->dyn_group, meninfo->action);
     gtk_ui_manager_remove_ui(this->ui_manager, meninfo->merge_id);
 }
 
-static struct gui_menu_info
-gui_gtk_add_menu(struct gui_priv *this, char *name, char *label, char *path, int submenu, struct action_cb_data *data) {
+static struct gui_menu_info gui_gtk_add_menu(struct gui_priv *this, char *name, char *label, char *path, int submenu, struct action_cb_data *data) {
     struct gui_menu_info meninfo;
     GtkAction *action;
     guint merge_id;
@@ -366,8 +356,7 @@ gui_gtk_add_menu(struct gui_priv *this, char *name, char *label, char *path, int
     return meninfo;
 }
 
-static void
-gui_gtk_action_toggled(GtkToggleAction *action, struct action_cb_data *data) {
+static void gui_gtk_action_toggled(GtkToggleAction *action, struct action_cb_data *data) {
     struct attr active;
     active.type=attr_active;
     active.u.num=gtk_toggle_action_get_active(action);
@@ -375,9 +364,7 @@ gui_gtk_action_toggled(GtkToggleAction *action, struct action_cb_data *data) {
     navit_draw(data->gui->nav);
 }
 
-static void
-gui_gtk_add_toggle_menu(struct gui_priv *this, char *name, char *label, char *path, struct action_cb_data *data,
-                        gboolean active) {
+static void gui_gtk_add_toggle_menu(struct gui_priv *this, char *name, char *label, char *path, struct action_cb_data *data, gboolean active) {
     GtkToggleAction *toggle_action;
     guint merge_id;
 
@@ -389,16 +376,13 @@ gui_gtk_add_toggle_menu(struct gui_priv *this, char *name, char *label, char *pa
     gtk_ui_manager_add_ui(this->ui_manager, merge_id, path, name, name, GTK_UI_MANAGER_MENUITEM, FALSE);
 }
 
-static void
-gui_gtk_action_changed(GtkRadioAction *action, GtkRadioAction *current, struct action_cb_data *data) {
+static void gui_gtk_action_changed(GtkRadioAction *action, GtkRadioAction *current, struct action_cb_data *data) {
     if (action == current) {
         navit_set_attr(data->gui->nav, &data->attr);
     }
 }
 
-static struct gui_menu_info
-gui_gtk_add_radio_menu(struct gui_priv *this, char *name, char *label, char *path, struct action_cb_data *data,
-                       GSList **g) {
+static struct gui_menu_info gui_gtk_add_radio_menu(struct gui_priv *this, char *name, char *label, char *path, struct action_cb_data *data, GSList **g) {
     struct gui_menu_info meninfo;
     GtkRadioAction *radio_action;
     guint merge_id;
@@ -416,8 +400,7 @@ gui_gtk_add_radio_menu(struct gui_priv *this, char *name, char *label, char *pat
     return meninfo;
 }
 
-static void
-gui_gtk_layouts_init(struct gui_priv *this) {
+static void gui_gtk_layouts_init(struct gui_priv *this) {
     struct attr_iter *iter;
     struct attr attr;
     struct action_cb_data *data;
@@ -438,8 +421,7 @@ gui_gtk_layouts_init(struct gui_priv *this) {
     navit_attr_iter_destroy(iter);
 }
 
-static void
-gui_gtk_projections_init(struct gui_priv *this) {
+static void gui_gtk_projections_init(struct gui_priv *this) {
     struct action_cb_data *data;
 
     data=g_new(struct action_cb_data, 1);
@@ -457,8 +439,7 @@ gui_gtk_projections_init(struct gui_priv *this) {
                            &this->projection_group);
 }
 
-static void
-gui_gtk_vehicles_update(struct gui_priv *this) {
+static void gui_gtk_vehicles_update(struct gui_priv *this) {
     struct attr_iter *iter;
     struct attr attr,vattr;
     struct action_cb_data *data;
@@ -496,14 +477,12 @@ gui_gtk_vehicles_update(struct gui_priv *this) {
     navit_attr_iter_destroy(iter);
 }
 
-static void
-gui_gtk_vehicles_init(struct gui_priv *this) {
+static void gui_gtk_vehicles_init(struct gui_priv *this) {
     navit_add_callback(this->nav, callback_new_attr_1(callback_cast(gui_gtk_vehicles_update), attr_vehicle, this));
     gui_gtk_vehicles_update(this);
 }
 
-static void
-gui_gtk_maps_init(struct gui_priv *this) {
+static void gui_gtk_maps_init(struct gui_priv *this) {
     struct attr_iter *iter;
     struct attr attr,active,type,data;
     struct action_cb_data *cb_data;
@@ -532,8 +511,7 @@ gui_gtk_maps_init(struct gui_priv *this) {
 
 }
 
-static void
-gui_gtk_destinations_update(struct gui_priv *this) {
+static void gui_gtk_destinations_update(struct gui_priv *this) {
     GList *curr;
     struct attr attr;
     struct action_cb_data *data;
@@ -581,14 +559,12 @@ gui_gtk_destinations_update(struct gui_priv *this) {
     }
 }
 
-static void
-gui_gtk_destinations_init(struct gui_priv *this) {
+static void gui_gtk_destinations_init(struct gui_priv *this) {
     navit_add_callback(this->nav, callback_new_attr_1(callback_cast(gui_gtk_destinations_update), attr_destination, this));
     gui_gtk_destinations_update(this);
 }
 
-static void
-gui_gtk_bookmarks_update(struct gui_priv *this) {
+static void gui_gtk_bookmarks_update(struct gui_priv *this) {
     GList *curr;
     struct attr attr;
     struct action_cb_data *data;
@@ -658,8 +634,7 @@ gui_gtk_bookmarks_update(struct gui_priv *this) {
     }
 }
 
-static void
-gui_gtk_bookmarks_init(struct gui_priv *this) {
+static void gui_gtk_bookmarks_init(struct gui_priv *this) {
     struct attr attr;
     navit_get_attr(this->nav, attr_bookmarks, &attr, NULL);
     bookmarks_add_callback(attr.u.bookmarks, callback_new_attr_1(callback_cast(gui_gtk_bookmarks_update), attr_bookmark_map,
@@ -667,8 +642,7 @@ gui_gtk_bookmarks_init(struct gui_priv *this) {
     gui_gtk_bookmarks_update(this);
 }
 
-static void
-gui_gtk_init(struct gui_priv *this, struct navit *nav) {
+static void gui_gtk_init(struct gui_priv *this, struct navit *nav) {
 
     struct attr route_attr;
 
@@ -689,8 +663,7 @@ gui_gtk_init(struct gui_priv *this, struct navit *nav) {
     gui_gtk_route_callback(this); //Set initial state
 }
 
-static struct gui_priv *
-gui_gtk_new(struct navit *nav, struct gui_methods *meth, struct attr **attrs, struct gui *gui) {
+static struct gui_priv *gui_gtk_new(struct navit *nav, struct gui_methods *meth, struct attr **attrs, struct gui *gui) {
     struct gui_priv *this;
     int w=792, h=547;
     char *cp = getenv("NAVIT_XID");
@@ -782,8 +755,7 @@ gui_gtk_new(struct navit *nav, struct gui_methods *meth, struct attr **attrs, st
 static int gtk_argc;
 static char **gtk_argv= {NULL};
 
-void
-plugin_init(void) {
+void plugin_init(void) {
     gtk_init(&gtk_argc, &gtk_argv);
     gtk_set_locale();
 #ifdef HAVE_API_WIN32
diff --git a/navit/gui/internal/gui_internal.c b/navit/gui/internal/gui_internal.c
index ae0720388..119d71dc2 100644
--- a/navit/gui/internal/gui_internal.c
+++ b/navit/gui/internal/gui_internal.c
@@ -127,8 +127,7 @@ static int gui_internal_is_active_vehicle(struct gui_priv *this, struct vehicle
  *
  * @return image_struct Ptr to scaled image struct or NULL if not scaled or found
  */
-static struct graphics_image *
-image_new_scaled(struct gui_priv *this, const char *name, int w, int h) {
+static struct graphics_image *image_new_scaled(struct gui_priv *this, const char *name, int w, int h) {
     struct graphics_image *ret=NULL;
     char *full_path=NULL;
     full_path=graphics_icon_path(name);
@@ -145,8 +144,7 @@ image_new_scaled(struct gui_priv *this, const char *name, int w, int h) {
 }
 
 #if 0
-static struct graphics_image *
-image_new_o(struct gui_priv *this, char *name) {
+static struct graphics_image *image_new_o(struct gui_priv *this, char *name) {
     return image_new_scaled(this, name, -1, -1);
 }
 #endif
@@ -193,8 +191,7 @@ image_new_l(struct gui_priv *this, const char *name) {
 
 
 
-static int
-gui_internal_button_attr_update(struct gui_priv *this, struct widget *w) {
+static int gui_internal_button_attr_update(struct gui_priv *this, struct widget *w) {
     struct widget *wi;
     int is_on=0;
     struct attr curr;
@@ -224,13 +221,11 @@ gui_internal_button_attr_update(struct gui_priv *this, struct widget *w) {
     return 0;
 }
 
-static void
-gui_internal_button_attr_callback(struct gui_priv *this, struct widget *w) {
+static void gui_internal_button_attr_callback(struct gui_priv *this, struct widget *w) {
     if (gui_internal_button_attr_update(this, w))
         gui_internal_widget_render(this, w);
 }
-static void
-gui_internal_button_attr_pressed(struct gui_priv *this, struct widget *w, void *data) {
+static void gui_internal_button_attr_pressed(struct gui_priv *this, struct widget *w, void *data) {
     if (w->is_on)
         w->set_attr(w->instance, &w->off);
     else
@@ -240,8 +235,7 @@ gui_internal_button_attr_pressed(struct gui_priv *this, struct widget *w, void *
 }
 
 struct widget *
-gui_internal_button_navit_attr_new(struct gui_priv *this, const char *text, enum flags flags, struct attr *on,
-                                   struct attr *off) {
+gui_internal_button_navit_attr_new(struct gui_priv *this, const char *text, enum flags flags, struct attr *on, struct attr *off) {
     struct graphics_image *image=NULL;
     struct widget *ret;
     if (!on && !off)
@@ -263,8 +257,7 @@ gui_internal_button_navit_attr_new(struct gui_priv *this, const char *text, enum
 }
 
 struct widget *
-gui_internal_button_map_attr_new(struct gui_priv *this, const char *text, enum flags flags, struct map *map,
-                                 struct attr *on, struct attr *off, int deflt) {
+gui_internal_button_map_attr_new(struct gui_priv *this, const char *text, enum flags flags, struct map *map, struct attr *on, struct attr *off, int deflt) {
     struct graphics_image *image=NULL;
     struct widget *ret;
     image=image_new_xs(this, "gui_inactive");
@@ -402,8 +395,7 @@ static void gui_internal_call_highlighted(struct gui_priv *this) {
     this->highlighted->func(this, this->highlighted, this->highlighted->data);
 }
 
-void
-gui_internal_say(struct gui_priv *this, struct widget *w, int questionmark) {
+void gui_internal_say(struct gui_priv *this, struct widget *w, int questionmark) {
     char *text=w->speech;
     if (! this->speech)
         return;
@@ -422,20 +414,17 @@ gui_internal_say(struct gui_priv *this, struct widget *w, int questionmark) {
 
 
 
-void
-gui_internal_back(struct gui_priv *this, struct widget *w, void *data) {
+void gui_internal_back(struct gui_priv *this, struct widget *w, void *data) {
     gui_internal_prune_menu_count(this, 1, 1);
 }
 
-void
-gui_internal_cmd_return(struct gui_priv *this, struct widget *wm, void *data) {
+void gui_internal_cmd_return(struct gui_priv *this, struct widget *wm, void *data) {
     gui_internal_prune_menu(this, wm->data);
 }
 
 
 
-void
-gui_internal_cmd_main_menu(struct gui_priv *this, struct widget *wm, void *data) {
+void gui_internal_cmd_main_menu(struct gui_priv *this, struct widget *wm, void *data) {
     struct widget *w=this->root.children->data;
     if (w && w->menu_data && w->menu_data->href && !strcmp(w->menu_data->href,"#Main Menu"))
         gui_internal_prune_menu(this, w);
@@ -491,8 +480,7 @@ gui_internal_time_help(struct gui_priv *this) {
  *
  * @author Steve Singer <ssinger_pg@sympatico.ca> (09/2008)
  */
-void
-gui_internal_apply_config(struct gui_priv *this) {
+void gui_internal_apply_config(struct gui_priv *this) {
     struct gui_config_settings *  current_config=0;
 
     dbg(lvl_debug,"w=%d h=%d", this->root.w, this->root.h);
@@ -555,8 +543,7 @@ gui_internal_apply_config(struct gui_priv *this) {
 
 
 
-static void
-gui_internal_cmd_set_destination(struct gui_priv *this, struct widget *wm, void *data) {
+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", wm->c.pro, wm->c.x, wm->c.y);
     navit_set_destination(this->nav, &wm->c, name, 1);
@@ -571,8 +558,7 @@ gui_internal_cmd_set_destination(struct gui_priv *this, struct widget *wm, void
     gui_internal_prune_menu(this, NULL);
 }
 
-static void
-gui_internal_cmd_insert_destination_do(struct gui_priv *this, struct widget *wm, void *data) {
+static void gui_internal_cmd_insert_destination_do(struct gui_priv *this, struct widget *wm, void *data) {
     char *name=data;
     int dstcount=navit_get_destination_count(this->nav)+1;
     int pos,i;
@@ -609,9 +595,8 @@ gui_internal_cmd_insert_destination_do(struct gui_priv *this, struct widget *wm,
  * @param cmd Callback function which will be called on item selection
  * @param data data argument to be passed to the callback function
  */
-void
-gui_internal_select_waypoint(struct gui_priv *this, const char *title, const char *hint, struct widget *wm_,
-                             void(*cmd)(struct gui_priv *priv, struct widget *widget, void *data),void *data) {
+void gui_internal_select_waypoint(struct gui_priv *this, const char *title, const char *hint, struct widget *wm_,
+                                  void(*cmd)(struct gui_priv *priv, struct widget *widget, void *data),void *data) {
     struct widget *wb,*w,*wtable,*row,*wc;
     struct map *map;
     struct map_rect *mr;
@@ -667,16 +652,14 @@ gui_internal_select_waypoint(struct gui_priv *this, const char *title, const cha
     gui_internal_menu_render(this);
 }
 
-static void
-gui_internal_cmd_insert_destination(struct gui_priv *this, struct widget *wm, void *data) {
+static void gui_internal_cmd_insert_destination(struct gui_priv *this, struct widget *wm, void *data) {
     gui_internal_select_waypoint(this, data, _("Select waypoint to insert the new one before"), wm,
                                  gui_internal_cmd_insert_destination_do, data);
 }
 
 
 
-static void
-gui_internal_cmd_set_position(struct gui_priv *this, struct widget *wm, void *data) {
+static void gui_internal_cmd_set_position(struct gui_priv *this, struct widget *wm, void *data) {
     struct attr v;
     if(data) {
         v.type=attr_vehicle;
@@ -696,8 +679,7 @@ gui_internal_cmd_set_position(struct gui_priv *this, struct widget *wm, void *da
  * @brief Generic notification function for Editable widgets to call Another widget notification function when Enter is pressed in editable field.
  * The Editable widget should have data member pointing to the Another widget.
  */
-void
-gui_internal_call_linked_on_finish(struct gui_priv *this, struct widget *wm, void *data) {
+void gui_internal_call_linked_on_finish(struct gui_priv *this, struct widget *wm, void *data) {
     if (wm->reason==gui_internal_reason_keypress_finish && data) {
         struct widget *w=data;
         if(w->func)
@@ -711,8 +693,7 @@ struct widget * gui_internal_keyboard(struct gui_priv *this, int mode);
 struct widget * gui_internal_keyboard_show_native(struct gui_priv *this, struct widget *w, int mode, char *lang);
 
 
-static void
-gui_internal_cmd_delete_bookmark(struct gui_priv *this, struct widget *wm, void *data) {
+static void gui_internal_cmd_delete_bookmark(struct gui_priv *this, struct widget *wm, void *data) {
     struct attr mattr;
     GList *l;
     navit_get_attr(this->nav, attr_bookmarks, &mattr, NULL);
@@ -727,15 +708,13 @@ gui_internal_cmd_delete_bookmark(struct gui_priv *this, struct widget *wm, void
 /**
  *  Get a utf-8 string, return the same prepared for case insensitive search. Result should be g_free()d after use.
  */
-char *
-removecase(char *s) {
+char *removecase(char *s) {
     char *r;
     r=linguistics_casefold(s);
     return r;
 }
 
-static void
-gui_internal_cmd_view_on_map(struct gui_priv *this, struct widget *wm, void *data) {
+static void gui_internal_cmd_view_on_map(struct gui_priv *this, struct widget *wm, void *data) {
     if (wm->item.type != type_none) {
         enum item_type type;
         if (wm->item.type < type_line)
@@ -752,8 +731,7 @@ gui_internal_cmd_view_on_map(struct gui_priv *this, struct widget *wm, void *dat
 }
 
 
-static void
-gui_internal_cmd_view_attribute_details(struct gui_priv *this, struct widget *wm, void *data) {
+static void gui_internal_cmd_view_attribute_details(struct gui_priv *this, struct widget *wm, void *data) {
     struct widget *w,*wb;
     struct map_rect *mr;
     struct item *item;
@@ -798,8 +776,7 @@ gui_internal_cmd_view_attribute_details(struct gui_priv *this, struct widget *wm
     gui_internal_menu_render(this);
 }
 
-static void
-gui_internal_cmd_view_attributes(struct gui_priv *this, struct widget *wm, void *data) {
+static void gui_internal_cmd_view_attributes(struct gui_priv *this, struct widget *wm, void *data) {
     struct widget *w,*wb;
     struct map_rect *mr;
     struct item *item;
@@ -846,8 +823,7 @@ gui_internal_cmd_view_attributes(struct gui_priv *this, struct widget *wm, void
     gui_internal_menu_render(this);
 }
 
-static void
-gui_internal_cmd_view_in_browser(struct gui_priv *this, struct widget *wm, void *data) {
+static void gui_internal_cmd_view_in_browser(struct gui_priv *this, struct widget *wm, void *data) {
     struct map_rect *mr;
     struct item *item;
     struct attr attr;
@@ -886,8 +862,7 @@ gui_internal_cmd_view_in_browser(struct gui_priv *this, struct widget *wm, void
  * @param wm called widget.
  * @param data event data (pointer to the table widget containing results, or NULL to clean the result map without adding any new data).
  */
-static void
-gui_internal_cmd_results_to_map(struct gui_priv *this, struct widget *wm, void *data) {
+static void gui_internal_cmd_results_to_map(struct gui_priv *this, struct widget *wm, void *data) {
     struct widget *w;
     struct mapset *ms;
     struct map *map;
@@ -1009,15 +984,13 @@ gui_internal_cmd_results_to_map(struct gui_priv *this, struct widget *wm, void *
  * @param wm called widget.
  * @param data event data
  */
-static void
-gui_internal_cmd_results_map_clean(struct gui_priv *this, struct widget *wm, void *data) {
+static void gui_internal_cmd_results_map_clean(struct gui_priv *this, struct widget *wm, void *data) {
     gui_internal_cmd_results_to_map(this,wm,NULL);
     gui_internal_prune_menu(this, NULL);
     navit_draw(this->nav);
 }
 
-static void
-gui_internal_cmd_delete_waypoint(struct gui_priv *this, struct widget *wm, void *data) {
+static void gui_internal_cmd_delete_waypoint(struct gui_priv *this, struct widget *wm, void *data) {
     int dstcount=navit_get_destination_count(this->nav);
     int i;
     struct map_rect *mr;
@@ -1074,9 +1047,7 @@ gui_internal_cmd_delete_waypoint(struct gui_priv *this, struct widget *wm, void
  * 2048: "Show search results on the map"
  * TODO define constants for these values
  */
-void
-gui_internal_cmd_position_do(struct gui_priv *this, struct pcoord *pc_in, struct coord_geo *g_in, struct widget *wm,
-                             const char *name, int flags) {
+void gui_internal_cmd_position_do(struct gui_priv *this, struct pcoord *pc_in, struct coord_geo *g_in, struct widget *wm, const char *name, int flags) {
     struct widget *wb,*w,*wtable,*row,*wc,*wbc,*wclosest=NULL;
     struct coord_geo g;
     struct pcoord pc;
@@ -1378,8 +1349,7 @@ gui_internal_cmd_position_do(struct gui_priv *this, struct pcoord *pc_in, struct
 		9 Item from the POI list
 */
 
-void
-gui_internal_cmd_position(struct gui_priv *this, struct widget *wm, void *data) {
+void gui_internal_cmd_position(struct gui_priv *this, struct widget *wm, void *data) {
     int flags;
 
     if(!data)
@@ -1441,8 +1411,7 @@ gui_internal_cmd_position(struct gui_priv *this, struct widget *wm, void *data)
   * The "Bookmarks" section of the OSD
   *
   */
-void
-gui_internal_cmd_bookmarks(struct gui_priv *this, struct widget *wm, void *data) {
+void gui_internal_cmd_bookmarks(struct gui_priv *this, struct widget *wm, void *data) {
     struct attr attr,mattr;
     struct item *item;
     char *label_full,*prefix=0;
@@ -1592,20 +1561,15 @@ gui_internal_cmd_bookmarks(struct gui_priv *this, struct widget *wm, void *data)
 
 
 
-static void
-gui_internal_keynav_highlight_next(struct gui_priv *this, int dx, int dy, int rotary);
+static void gui_internal_keynav_highlight_next(struct gui_priv *this, int dx, int dy, int rotary);
 
-static int
-gui_internal_keynav_find_next(struct widget *wi, struct widget *current_highlight, struct widget **result);
+static int gui_internal_keynav_find_next(struct widget *wi, struct widget *current_highlight, struct widget **result);
 
-static int
-gui_internal_keynav_find_prev(struct widget *wi, struct widget *current_highlight, struct widget **result);
+static int gui_internal_keynav_find_prev(struct widget *wi, struct widget *current_highlight, struct widget **result);
 
-static struct widget*
-gui_internal_keynav_find_next_sensitive_child(struct widget *wi);
+static struct widget* gui_internal_keynav_find_next_sensitive_child(struct widget *wi);
 
-void
-gui_internal_keypress_do(struct gui_priv *this, char *key) {
+void gui_internal_keypress_do(struct gui_priv *this, char *key) {
     struct widget *wi,*menu,*search_list;
     int len=0;
     char *text=NULL;
@@ -1665,8 +1629,7 @@ gui_internal_keypress_do(struct gui_priv *this, char *key) {
 
 
 
-char *
-gui_internal_cmd_match_expand(char *pattern, struct attr **in) {
+char *gui_internal_cmd_match_expand(char *pattern, struct attr **in) {
     char p,*ret=g_strdup(pattern),*r=ret,*a;
     int len;
     while ((p=*pattern++)) {
@@ -1693,8 +1656,7 @@ gui_internal_cmd_match_expand(char *pattern, struct attr **in) {
     return ret;
 }
 
-static int
-gui_internal_match(const char *pattern, const char *string) {
+static int gui_internal_match(const char *pattern, const char *string) {
     char p,s;
     while ((p=*pattern++)) {
         switch (p) {
@@ -1715,8 +1677,7 @@ gui_internal_match(const char *pattern, const char *string) {
     return 1;
 }
 
-int
-gui_internal_set(char *remove, char *add) {
+int gui_internal_set(char *remove, char *add) {
     char *gui_file=g_strjoin(NULL, navit_get_user_data_directory(TRUE), "/gui_internal.txt", NULL);
     char *gui_file_new=g_strjoin(NULL, navit_get_user_data_directory(TRUE), "/gui_internal_new.txt", NULL);
     FILE *fo=fopen(gui_file_new,"w");
@@ -1750,14 +1711,12 @@ gui_internal_set(char *remove, char *add) {
 
 
 
-static void
-gui_internal_window_closed(struct gui_priv *this) {
+static void gui_internal_window_closed(struct gui_priv *this) {
     gui_internal_cmd2_quit(this, NULL, NULL, NULL, NULL);
 }
 
 
-static void
-gui_internal_cmd_map_download_do(struct gui_priv *this, struct widget *wm, void *data) {
+static void gui_internal_cmd_map_download_do(struct gui_priv *this, struct widget *wm, void *data) {
     char *text=g_strdup_printf(_("Download %s"),wm->name);
     struct widget *w, *wb;
     struct map *map=data;
@@ -1795,8 +1754,7 @@ gui_internal_cmd_map_download_do(struct gui_priv *this, struct widget *wm, void
     gui_internal_menu_render(this);
 }
 
-void
-gui_internal_cmd_map_download(struct gui_priv *this, struct widget *wm, void *data) {
+void gui_internal_cmd_map_download(struct gui_priv *this, struct widget *wm, void *data) {
     struct attr on, off, download_enabled, download_disabled;
     struct widget *w,*wb,*wma;
     struct map *map=data;
@@ -1882,14 +1840,12 @@ gui_internal_cmd_map_download(struct gui_priv *this, struct widget *wm, void *da
     gui_internal_menu_render(this);
 }
 
-static void
-gui_internal_cmd_set_active_vehicle(struct gui_priv *this, struct widget *wm, void *data) {
+static void gui_internal_cmd_set_active_vehicle(struct gui_priv *this, struct widget *wm, void *data) {
     struct attr vehicle = {attr_vehicle,{wm->data}};
     navit_set_attr(this->nav, &vehicle);
 }
 
-static void
-gui_internal_cmd_show_satellite_status(struct gui_priv *this, struct widget *wm, void *data) {
+static void gui_internal_cmd_show_satellite_status(struct gui_priv *this, struct widget *wm, void *data) {
     struct widget *w,*wb,*row;
     struct attr attr,sat_attr;
     struct vehicle *v=wm->data;
@@ -1925,8 +1881,7 @@ gui_internal_cmd_show_satellite_status(struct gui_priv *this, struct widget *wm,
     gui_internal_menu_render(this);
 }
 
-static void
-gui_internal_cmd_show_nmea_data(struct gui_priv *this, struct widget *wm, void *data) {
+static void gui_internal_cmd_show_nmea_data(struct gui_priv *this, struct widget *wm, void *data) {
     struct widget *w,*wb;
     struct attr attr;
     struct vehicle *v=wm->data;
@@ -1954,9 +1909,8 @@ struct vehicle_and_profilename {
  *
  * @return true if the vehicle is active, false otherwise.
  */
-static int
-gui_internal_is_active_vehicle(struct gui_priv *this, struct vehicle
-                               *vehicle) {
+static int gui_internal_is_active_vehicle(struct gui_priv *this, struct vehicle
+        *vehicle) {
     struct attr active_vehicle;
 
     if (!navit_get_attr(this->nav, attr_vehicle, &active_vehicle, NULL))
@@ -1965,8 +1919,7 @@ gui_internal_is_active_vehicle(struct gui_priv *this, struct vehicle
     return active_vehicle.u.vehicle == vehicle;
 }
 
-static void
-save_vehicle_xml(struct vehicle *v) {
+static void save_vehicle_xml(struct vehicle *v) {
     struct attr attr;
     struct attr_iter *iter=vehicle_attr_iter_new();
     int childs=0;
@@ -1994,9 +1947,8 @@ save_vehicle_xml(struct vehicle *v) {
  *
  * @see gui_internal_add_vehicle_profile
  */
-static void
-gui_internal_cmd_set_active_profile(struct gui_priv *this, struct
-                                    widget *wm, void *data) {
+static void gui_internal_cmd_set_active_profile(struct gui_priv *this, struct
+        widget *wm, void *data) {
     struct vehicle_and_profilename *vapn = data;
     struct vehicle *v = vapn->vehicle;
     char *profilename = vapn->profilename;
@@ -2009,8 +1961,7 @@ 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", vehicle_name,
-        profilename);
+    dbg(lvl_debug, "Changing vehicle %s to profile %s", vehicle_name, profilename);
 
     // Change the profile name
     profilename_attr.type = attr_profilename;
@@ -2044,9 +1995,8 @@ gui_internal_cmd_set_active_profile(struct gui_priv *this, struct
  * Adds the vehicle profile to the GUI, allowing the user to pick a
  * profile for the currently selected vehicle.
  */
-static void
-gui_internal_add_vehicle_profile(struct gui_priv *this, struct widget
-                                 *parent, struct vehicle *v, struct vehicleprofile *profile) {
+static void gui_internal_add_vehicle_profile(struct gui_priv *this, struct widget
+        *parent, struct vehicle *v, struct vehicleprofile *profile) {
     // Just here to show up in the translation file, nice and close to
     // where the translations are actually used.
     struct attr profile_attr;
@@ -2074,8 +2024,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", name,
-        active_profile, active);
+    dbg(lvl_debug, "Adding vehicle profile %s, active=%s/%i", name, active_profile, active);
 
     // Build a translatable label.
     if(active) {
@@ -2100,8 +2049,7 @@ gui_internal_add_vehicle_profile(struct gui_priv *this, struct widget
     free(label);
 }
 
-void
-gui_internal_menu_vehicle_settings(struct gui_priv *this, struct vehicle *v, char *name) {
+void gui_internal_menu_vehicle_settings(struct gui_priv *this, struct vehicle *v, char *name) {
     struct widget *w,*wb,*row;
     struct attr attr;
     struct vehicleprofile *profile = NULL;
@@ -2153,8 +2101,7 @@ gui_internal_menu_vehicle_settings(struct gui_priv *this, struct vehicle *v, cha
     gui_internal_menu_render(this);
 }
 
-void
-gui_internal_cmd_vehicle_settings(struct gui_priv *this, struct widget *wm, void *data) {
+void gui_internal_cmd_vehicle_settings(struct gui_priv *this, struct widget *wm, void *data) {
     gui_internal_menu_vehicle_settings(this, wm->data, wm->text);
 }
 
@@ -2182,15 +2129,13 @@ static void gui_internal_motion(void *data, struct point *p) {
         this->motion_timeout_event=event_add_timeout(30,0, this->motion_timeout_callback);
 }
 
-void
-gui_internal_evaluate(struct gui_priv *this, const char *command) {
+void gui_internal_evaluate(struct gui_priv *this, const char *command) {
     if (command)
         command_evaluate(&this->self, command);
 }
 
 
-void
-gui_internal_enter(struct gui_priv *this, int ignore) {
+void gui_internal_enter(struct gui_priv *this, int ignore) {
     struct graphics *gra=this->gra;
     if (ignore != -1)
         this->ignore_button=ignore;
@@ -2202,13 +2147,11 @@ gui_internal_enter(struct gui_priv *this, int ignore) {
     this->root.background=this->background;
 }
 
-void
-gui_internal_leave(struct gui_priv *this) {
+void gui_internal_leave(struct gui_priv *this) {
     graphics_draw_mode(this->gra, draw_mode_end);
 }
 
-void
-gui_internal_set_click_coord(struct gui_priv *this, struct point *p) {
+void gui_internal_set_click_coord(struct gui_priv *this, struct point *p) {
     struct coord c;
     struct coord_geo g;
     struct attr attr;
@@ -2229,8 +2172,7 @@ gui_internal_set_click_coord(struct gui_priv *this, struct point *p) {
     }
 }
 
-static void
-gui_internal_set_position_coord(struct gui_priv *this) {
+static void gui_internal_set_position_coord(struct gui_priv *this) {
     struct transformation *trans;
     struct attr attr,attrp;
     struct coord c;
@@ -2248,14 +2190,12 @@ gui_internal_set_position_coord(struct gui_priv *this) {
     }
 }
 
-void
-gui_internal_enter_setup(struct gui_priv *this) {
+void gui_internal_enter_setup(struct gui_priv *this) {
     if (!this->mouse_button_clicked_on_map)
         gui_internal_set_position_coord(this);
 }
 
-void
-gui_internal_cmd_menu(struct gui_priv *this, int ignore, char *href) {
+void gui_internal_cmd_menu(struct gui_priv *this, int ignore, char *href) {
     dbg(lvl_debug,"enter");
     gui_internal_enter(this, ignore);
     gui_internal_enter_setup(this);
@@ -2268,8 +2208,7 @@ gui_internal_cmd_menu(struct gui_priv *this, int ignore, char *href) {
 
 
 
-static void
-gui_internal_cmd_log_do(struct gui_priv *this, struct widget *widget) {
+static void gui_internal_cmd_log_do(struct gui_priv *this, struct widget *widget) {
     if (widget->text && strlen(widget->text)) {
         if (this->position_coord_geo)
             navit_textfile_debug_log_at(this->nav, &this->vehiclep, "type=log_entry label=\"%s\"",widget->text);
@@ -2282,14 +2221,12 @@ gui_internal_cmd_log_do(struct gui_priv *this, struct widget *widget) {
     gui_internal_check_exit(this);
 }
 
-void
-gui_internal_cmd_log_clicked(struct gui_priv *this, struct widget *widget, void *data) {
+void gui_internal_cmd_log_clicked(struct gui_priv *this, struct widget *widget, void *data) {
     gui_internal_cmd_log_do(this, widget->data);
 }
 
 
-void
-gui_internal_check_exit(struct gui_priv *this) {
+void gui_internal_check_exit(struct gui_priv *this) {
     struct graphics *gra=this->gra;
     if (! this->root.children) {
         gui_internal_search_idle_end(this);
@@ -2304,8 +2241,7 @@ gui_internal_check_exit(struct gui_priv *this) {
     }
 }
 
-static int
-gui_internal_get_attr(struct gui_priv *this, enum attr_type type, struct attr *attr) {
+static int gui_internal_get_attr(struct gui_priv *this, enum attr_type type, struct attr *attr) {
     switch (type) {
     case attr_active:
         attr->u.num=this->root.children != NULL;
@@ -2339,8 +2275,7 @@ gui_internal_get_attr(struct gui_priv *this, enum attr_type type, struct attr *a
     return 1;
 }
 
-static int
-gui_internal_add_attr(struct gui_priv *this, struct attr *attr) {
+static int gui_internal_add_attr(struct gui_priv *this, struct attr *attr) {
     switch (attr->type) {
     case attr_xml_text:
         g_free(this->html_text);
@@ -2351,8 +2286,7 @@ gui_internal_add_attr(struct gui_priv *this, struct attr *attr) {
     }
 }
 
-static int
-gui_internal_set_attr(struct gui_priv *this, struct attr *attr) {
+static int gui_internal_set_attr(struct gui_priv *this, struct attr *attr) {
     switch (attr->type) {
     case attr_fullscreen:
         if ((this->fullscreen > 0) != (attr->u.num > 0)) {
@@ -2407,8 +2341,7 @@ static void gui_internal_dbus_signal(struct gui_priv *this, struct point *p) {
  *
  * @author Martin Bruns (05/2012), mdankov
  */
-static int
-gui_internal_coordinate_parse(char *s, char plus, char minus, double *x) {
+static int gui_internal_coordinate_parse(char *s, char plus, char minus, double *x) {
     int sign=0;
     char *degree, *minute, *second;
     double tmp;
@@ -2462,8 +2395,7 @@ gui_internal_coordinate_parse(char *s, char plus, char minus, double *x) {
 //# Comment:
 //# Authors: Martin Bruns (05/2012)
 //##############################################################################################################
-static void
-gui_internal_cmd_enter_coord_do(struct gui_priv *this, struct widget *widget) {
+static void gui_internal_cmd_enter_coord_do(struct gui_priv *this, struct widget *widget) {
     char *lat, *lng;
     char *widgettext;
     double latitude, longitude;
@@ -2498,8 +2430,7 @@ gui_internal_cmd_enter_coord_do(struct gui_priv *this, struct widget *widget) {
 //# Comment:
 //# Authors: Martin Bruns (05/2012)
 //##############################################################################################################
-void
-gui_internal_cmd_enter_coord_clicked(struct gui_priv *this, struct widget *widget, void *data) {
+void gui_internal_cmd_enter_coord_clicked(struct gui_priv *this, struct widget *widget, void *data) {
     dbg(lvl_debug,"entered");
     gui_internal_cmd_enter_coord_do(this, widget->data);
 }
@@ -2572,8 +2503,7 @@ static void gui_internal_button(void *data, int pressed, int button, struct poin
     }
 }
 
-static void
-gui_internal_setup(struct gui_priv *this) {
+static void gui_internal_setup(struct gui_priv *this) {
     struct color cbh= {0x9fff,0x9fff,0x9fff,0xffff};
     struct color cf= {0xbfff,0xbfff,0xbfff,0xffff};
     struct graphics *gra=this->gra;
@@ -2640,8 +2570,7 @@ static void gui_internal_resize(void *data, int w, int h) {
     }
 }
 
-static void
-gui_internal_keynav_point(struct widget *w, int dx, int dy, struct point *p) {
+static void gui_internal_keynav_point(struct widget *w, int dx, int dy, struct point *p) {
     p->x=w->p.x+w->w/2;
     p->y=w->p.y+w->h/2;
     if (dx < 0)
@@ -2654,8 +2583,7 @@ gui_internal_keynav_point(struct widget *w, int dx, int dy, struct point *p) {
         p->y=w->p.y+w->h;
 }
 
-static struct widget*
-gui_internal_keynav_find_next_sensitive_child(struct widget *wi) {
+static struct widget* gui_internal_keynav_find_next_sensitive_child(struct widget *wi) {
     GList *l=wi->children;
     if (wi->state & STATE_OFFSCREEN)
         return NULL;
@@ -2670,8 +2598,7 @@ gui_internal_keynav_find_next_sensitive_child(struct widget *wi) {
     return NULL;
 }
 
-static int
-gui_internal_keynav_find_next(struct widget *wi, struct widget *current_highlight, struct widget **result) {
+static int gui_internal_keynav_find_next(struct widget *wi, struct widget *current_highlight, struct widget **result) {
     GList *l=wi->children;
     if (wi == current_highlight)
         return 1;
@@ -2698,8 +2625,7 @@ gui_internal_keynav_find_next(struct widget *wi, struct widget *current_highligh
 #define RESULT_FOUND 1
 #define NO_RESULT_YET 0
 
-static int
-gui_internal_keynav_find_prev(struct widget *wi, struct widget *current_highlight, struct widget **result) {
+static int gui_internal_keynav_find_prev(struct widget *wi, struct widget *current_highlight, struct widget **result) {
     if (wi == current_highlight && *result) {
         // Reached current widget; last widget found is the result.
         return RESULT_FOUND;
@@ -2722,9 +2648,7 @@ gui_internal_keynav_find_prev(struct widget *wi, struct widget *current_highligh
     return NO_RESULT_YET;
 }
 
-static void
-gui_internal_keynav_find_closest(struct widget *wi, struct point *p, int dx, int dy, int *distance,
-                                 struct widget **result) {
+static void gui_internal_keynav_find_closest(struct widget *wi, struct point *p, int dx, int dy, int *distance, struct widget **result) {
     GList *l=wi->children;
     // Skip hidden elements
     if (wi->p.x==0 && wi->p.y==0 && wi->w==0 && wi->h==0)
@@ -2777,8 +2701,7 @@ gui_internal_keynav_find_closest(struct widget *wi, struct point *p, int dx, int
  * @param rotary (0/1) input from rotary encoder - dx indicates forwards/backwards movement
  *        through all widgets
  */
-static void
-gui_internal_keynav_highlight_next(struct gui_priv *this, int dx, int dy, int rotary) {
+static void gui_internal_keynav_highlight_next(struct gui_priv *this, int dx, int dy, int rotary) {
     struct widget *result,*menu=g_list_last(this->root.children)->data;
     struct widget *current_highlight = NULL;
     struct point p;
@@ -2981,13 +2904,11 @@ struct gui_methods gui_internal_methods = {
 };
 
 
-static void
-gui_internal_add_callback(struct gui_priv *priv, struct callback *cb) {
+static void gui_internal_add_callback(struct gui_priv *priv, struct callback *cb) {
     callback_list_add(priv->cbl, cb);
 }
 
-static void
-gui_internal_remove_callback(struct gui_priv *priv, struct callback *cb) {
+static void gui_internal_remove_callback(struct gui_priv *priv, struct callback *cb) {
     callback_list_remove(priv->cbl, cb);
 }
 
@@ -3001,38 +2922,32 @@ static struct gui_internal_methods gui_internal_methods_ext = {
 };
 
 
-static enum flags
-gui_internal_get_flags(struct widget *widget) {
+static enum flags gui_internal_get_flags(struct widget *widget) {
     return widget->flags;
 }
 
-static void
-gui_internal_set_flags(struct widget *widget, enum flags flags) {
+static void gui_internal_set_flags(struct widget *widget, enum flags flags) {
     widget->flags=flags;
 }
 
-static int
-gui_internal_get_state(struct widget *widget) {
+static int gui_internal_get_state(struct widget *widget) {
     return widget->state;
 }
 
-static void
-gui_internal_set_state(struct widget *widget, int state) {
+static void gui_internal_set_state(struct widget *widget, int state) {
     widget->state=state;
 }
 
-static void
-gui_internal_set_func(struct widget *widget, void (*func)(struct gui_priv *priv, struct widget *widget, void *data)) {
+static void gui_internal_set_func(struct widget *widget, void (*func)(struct gui_priv *priv, struct widget *widget,
+                                  void *data)) {
     widget->func=func;
 }
 
-static void
-gui_internal_set_data(struct widget *widget, void *data) {
+static void gui_internal_set_data(struct widget *widget, void *data) {
     widget->data=data;
 }
 
-static void
-gui_internal_set_default_background(struct gui_priv *this, struct widget *widget) {
+static void gui_internal_set_default_background(struct gui_priv *this, struct widget *widget) {
     widget->background=this->background;
 }
 
@@ -3062,8 +2977,7 @@ static struct gui_internal_widget_methods gui_internal_widget_methods = {
  * @param coord res, will become the coords of the intersection if found
  * @return : TRUE if intersection found, otherwise FALSE
  */
-int
-line_intersection(struct coord* a1, struct coord *a2, struct coord * b1, struct coord *b2, struct coord *res) {
+int line_intersection(struct coord* a1, struct coord *a2, struct coord * b1, struct coord *b2, struct coord *res) {
     int n, a, b;
     int adx=a2->x-a1->x;
     int ady=a2->y-a1->y;
@@ -3122,8 +3036,7 @@ item_get_heightline(struct item *item) {
 /**
  * @brief Called when the route is updated.
  */
-void
-gui_internal_route_update(struct gui_priv * this, struct navit * navit, struct vehicle *v) {
+void gui_internal_route_update(struct gui_priv * this, struct navit * navit, struct vehicle *v) {
 
     if(this->route_data.route_showing) {
         gui_internal_populate_route_table(this,navit);
@@ -3142,8 +3055,7 @@ gui_internal_route_update(struct gui_priv * this, struct navit * navit, struct v
  * The main purpose of this function is to remove the widgets from
  * references route_data because those widgets are about to be freed.
  */
-void
-gui_internal_route_screen_free(struct gui_priv * this_,struct widget * w) {
+void gui_internal_route_screen_free(struct gui_priv * this_,struct widget * w) {
     if(this_) {
         this_->route_data.route_showing=0;
         this_->route_data.route_table=NULL;
@@ -3158,8 +3070,7 @@ gui_internal_route_screen_free(struct gui_priv * this_,struct widget * w) {
  * @param this The gui context
  * @param navit The navit object
  */
-void
-gui_internal_populate_route_table(struct gui_priv * this, struct navit * navit) {
+void gui_internal_populate_route_table(struct gui_priv * this, struct navit * navit) {
     struct map * map=NULL;
     struct map_rect * mr=NULL;
     struct navigation * nav = NULL;
@@ -3244,8 +3155,7 @@ gui_internal_populate_route_table(struct gui_priv * this, struct navit * navit)
 //# Comment:
 //# Authors: Martin Schaller (04/2008)
 //##############################################################################################################
-static struct gui_priv * gui_internal_new(struct navit *nav, struct gui_methods *meth, struct attr **attrs,
-        struct gui *gui) {
+static struct gui_priv * gui_internal_new(struct navit *nav, struct gui_methods *meth, struct attr **attrs, struct gui *gui) {
     struct color color_white= {0xffff,0xffff,0xffff,0xffff};
     struct color color_black= {0x0,0x0,0x0,0xffff};
     struct color back2_color= {0x4141,0x4141,0x4141,0xffff};
diff --git a/navit/gui/internal/gui_internal_bookmark.c b/navit/gui/internal/gui_internal_bookmark.c
index aab540282..bedad9173 100644
--- a/navit/gui/internal/gui_internal_bookmark.c
+++ b/navit/gui/internal/gui_internal_bookmark.c
@@ -16,8 +16,7 @@
 #include "gui_internal_keyboard.h"
 #include "gui_internal_bookmark.h"
 
-static void
-gui_internal_cmd_add_bookmark_do(struct gui_priv *this, struct widget *widget) {
+static void gui_internal_cmd_add_bookmark_do(struct gui_priv *this, struct widget *widget) {
     GList *l;
     struct attr attr;
     dbg(lvl_debug,"text='%s'", widget->text);
@@ -31,8 +30,7 @@ gui_internal_cmd_add_bookmark_do(struct gui_priv *this, struct widget *widget) {
     gui_internal_prune_menu(this, l->data);
 }
 
-static void
-gui_internal_cmd_add_bookmark_folder_do(struct gui_priv *this, struct widget *widget) {
+static void gui_internal_cmd_add_bookmark_folder_do(struct gui_priv *this, struct widget *widget) {
     GList *l;
     struct attr attr;
     dbg(lvl_debug,"text='%s'", widget->text);
@@ -46,18 +44,15 @@ gui_internal_cmd_add_bookmark_folder_do(struct gui_priv *this, struct widget *wi
     gui_internal_prune_menu(this, l->data);
 }
 
-static void
-gui_internal_cmd_add_bookmark_clicked(struct gui_priv *this, struct widget *widget, void *data) {
+static void gui_internal_cmd_add_bookmark_clicked(struct gui_priv *this, struct widget *widget, void *data) {
     gui_internal_cmd_add_bookmark_do(this, widget->data);
 }
 
-static void
-gui_internal_cmd_add_bookmark_folder_clicked(struct gui_priv *this, struct widget *widget, void *data) {
+static void gui_internal_cmd_add_bookmark_folder_clicked(struct gui_priv *this, struct widget *widget, void *data) {
     gui_internal_cmd_add_bookmark_folder_do(this, widget->data);
 }
 
-static void
-gui_internal_cmd_rename_bookmark_clicked(struct gui_priv *this, struct widget *widget,void *data) {
+static void gui_internal_cmd_rename_bookmark_clicked(struct gui_priv *this, struct widget *widget,void *data) {
     struct widget *w=(struct widget*)widget->data;
     GList *l;
     struct attr attr;
@@ -74,8 +69,7 @@ gui_internal_cmd_rename_bookmark_clicked(struct gui_priv *this, struct widget *w
     gui_internal_prune_menu(this, l->data);
 }
 
-void
-gui_internal_cmd_add_bookmark2(struct gui_priv *this, struct widget *wm, void *data) {
+void gui_internal_cmd_add_bookmark2(struct gui_priv *this, struct widget *wm, void *data) {
     struct widget *w,*wb,*wk,*wl,*we,*wnext;
     char *name=data;
     wb=gui_internal_menu(this,_("Add Bookmark"));
@@ -105,8 +99,7 @@ gui_internal_cmd_add_bookmark2(struct gui_priv *this, struct widget *wm, void *d
     gui_internal_menu_render(this);
 }
 
-void
-gui_internal_cmd_add_bookmark_folder2(struct gui_priv *this, struct widget *wm, void *data) {
+void gui_internal_cmd_add_bookmark_folder2(struct gui_priv *this, struct widget *wm, void *data) {
     struct widget *w,*wb,*wk,*wl,*we,*wnext;
     char *name=data;
     wb=gui_internal_menu(this,_("Add Bookmark folder"));
@@ -136,8 +129,7 @@ gui_internal_cmd_add_bookmark_folder2(struct gui_priv *this, struct widget *wm,
     gui_internal_menu_render(this);
 }
 
-void
-gui_internal_cmd_rename_bookmark(struct gui_priv *this, struct widget *wm, void *data) {
+void gui_internal_cmd_rename_bookmark(struct gui_priv *this, struct widget *wm, void *data) {
     struct widget *w,*wb,*wk,*wl,*we,*wnext;
     char *name=wm->text;
     wb=gui_internal_menu(this,_("Rename"));
@@ -168,8 +160,7 @@ gui_internal_cmd_rename_bookmark(struct gui_priv *this, struct widget *wm, void
     gui_internal_menu_render(this);
 }
 
-void
-gui_internal_cmd_cut_bookmark(struct gui_priv *this, struct widget *wm, void *data) {
+void gui_internal_cmd_cut_bookmark(struct gui_priv *this, struct widget *wm, void *data) {
     struct attr mattr;
     GList *l;
     navit_get_attr(this->nav, attr_bookmarks, &mattr, NULL);
@@ -178,8 +169,7 @@ gui_internal_cmd_cut_bookmark(struct gui_priv *this, struct widget *wm, void *da
     gui_internal_prune_menu(this, l->data);
 }
 
-void
-gui_internal_cmd_copy_bookmark(struct gui_priv *this, struct widget *wm, void *data) {
+void gui_internal_cmd_copy_bookmark(struct gui_priv *this, struct widget *wm, void *data) {
     struct attr mattr;
     GList *l;
     navit_get_attr(this->nav, attr_bookmarks, &mattr, NULL);
@@ -188,8 +178,7 @@ gui_internal_cmd_copy_bookmark(struct gui_priv *this, struct widget *wm, void *d
     gui_internal_prune_menu(this, l->data);
 }
 
-void
-gui_internal_cmd_paste_bookmark(struct gui_priv *this, struct widget *wm, void *data) {
+void gui_internal_cmd_paste_bookmark(struct gui_priv *this, struct widget *wm, void *data) {
     struct attr mattr;
     GList *l;
     navit_get_attr(this->nav, attr_bookmarks, &mattr, NULL);
@@ -199,8 +188,7 @@ gui_internal_cmd_paste_bookmark(struct gui_priv *this, struct widget *wm, void *
         gui_internal_prune_menu(this, l->data);
 }
 
-void
-gui_internal_cmd_delete_bookmark_folder(struct gui_priv *this, struct widget *wm, void *data) {
+void gui_internal_cmd_delete_bookmark_folder(struct gui_priv *this, struct widget *wm, void *data) {
     struct attr mattr;
     GList *l;
     navit_get_attr(this->nav, attr_bookmarks, &mattr, NULL);
@@ -210,8 +198,7 @@ gui_internal_cmd_delete_bookmark_folder(struct gui_priv *this, struct widget *wm
     gui_internal_prune_menu(this, l->data);
 }
 
-void
-gui_internal_cmd_load_bookmarks_as_waypoints(struct gui_priv *this, struct widget *wm, void *data) {
+void gui_internal_cmd_load_bookmarks_as_waypoints(struct gui_priv *this, struct widget *wm, void *data) {
     struct attr mattr;
 
     if(navit_get_attr(this->nav, attr_bookmarks, &mattr, NULL) ) {
@@ -259,8 +246,7 @@ gui_internal_cmd_load_bookmarks_as_waypoints(struct gui_priv *this, struct widge
     gui_internal_prune_menu(this, NULL);
 }
 
-void
-gui_internal_cmd_replace_bookmarks_from_waypoints(struct gui_priv *this, struct widget *wm, void *data) {
+void gui_internal_cmd_replace_bookmarks_from_waypoints(struct gui_priv *this, struct widget *wm, void *data) {
     struct attr mattr;
 
     if(navit_get_attr(this->nav, attr_bookmarks, &mattr, NULL) ) {
diff --git a/navit/gui/internal/gui_internal_command.c b/navit/gui/internal/gui_internal_command.c
index afab4cf28..acf250408 100644
--- a/navit/gui/internal/gui_internal_command.c
+++ b/navit/gui/internal/gui_internal_command.c
@@ -54,8 +54,7 @@ extern char *version;
  *
  * @return The coordinates as a formatted string
  */
-static char *
-coordinates_geo(const struct coord_geo *gc, char sep) {
+static char *coordinates_geo(const struct coord_geo *gc, char sep) {
     char latc='N',lngc='E';
     int lat_deg,lat_min,lat_sec;
     int lng_deg,lng_min,lng_sec;
@@ -90,8 +89,7 @@ coordinates_geo(const struct coord_geo *gc, char sep) {
  *
  * @return The coordinates as a formatted string
  */
-char *
-gui_internal_coordinates(struct pcoord *pc, char sep) {
+char *gui_internal_coordinates(struct pcoord *pc, char sep) {
     struct coord_geo g;
     struct coord c;
     c.x=pc->x;
@@ -112,8 +110,7 @@ enum escape_mode {
 
 /* todo &=&amp;, < = &lt; */
 
-static char *
-gui_internal_escape(enum escape_mode mode, char *in) {
+static char *gui_internal_escape(enum escape_mode mode, char *in) {
     int len=mode & escape_mode_string ? 3:1;
     char *dst,*out,*src=in;
     char *quot="&quot;";
@@ -153,8 +150,8 @@ gui_internal_escape(enum escape_mode mode, char *in) {
     return out;
 }
 
-static void
-gui_internal_cmd_escape(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static void gui_internal_cmd_escape(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
+                                    int *valid) {
     struct attr escaped;
     if (!in || !in[0]) {
         dbg(lvl_error,"first parameter missing or wrong type");
@@ -179,8 +176,8 @@ gui_internal_cmd_escape(struct gui_priv *this, char *function, struct attr **in,
     g_free(escaped.u.str);
 }
 
-static void
-gui_internal_cmd2_about(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static void gui_internal_cmd2_about(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
+                                    int *valid) {
     struct widget *menu,*wb,*w;
     char *text;
 
@@ -248,13 +245,13 @@ gui_internal_cmd2_about(struct gui_priv *this, char *function, struct attr **in,
     graphics_draw_mode(this->gra, draw_mode_end);
 }
 
-static void
-gui_internal_cmd2_waypoints(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static void gui_internal_cmd2_waypoints(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
+                                        int *valid) {
     gui_internal_select_waypoint(this, _("Waypoints"), NULL, NULL, gui_internal_cmd_position, (void*)2);
 }
 
-static void
-gui_internal_cmd_enter_coord(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static void gui_internal_cmd_enter_coord(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
+        int *valid) {
     struct widget *w, *wb, *wk, *wr, *we, *wnext, *row;
     wb=gui_internal_menu(this, _("Enter Coordinates"));
     w=gui_internal_box_new(this, gravity_center|orientation_vertical|flags_expand|flags_fill);
@@ -297,16 +294,16 @@ gui_internal_cmd_enter_coord(struct gui_priv *this, char *function, struct attr
     gui_internal_menu_render(this);
 }
 
-static void
-gui_internal_cmd2_town(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static void gui_internal_cmd2_town(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
+                                   int *valid) {
     if (this->sl)
         search_list_select(this->sl, attr_country_all, 0, 0);
     gui_internal_search(this,_("Town"),"Town",1);
 }
 
-static void
-gui_internal_cmd2_setting_vehicle(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-                                  int *valid) {
+static void gui_internal_cmd2_setting_vehicle(struct gui_priv *this, char *function, struct attr **in,
+        struct attr ***out,
+        int *valid) {
     struct attr attr,attr2,vattr;
     struct widget *w,*wb,*wl;
     struct attr_iter *iter;
@@ -341,9 +338,8 @@ gui_internal_cmd2_setting_vehicle(struct gui_priv *this, char *function, struct
     gui_internal_menu_render(this);
 }
 
-static void
-gui_internal_cmd2_setting_rules(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-                                int *valid) {
+static void gui_internal_cmd2_setting_rules(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
+        int *valid) {
     struct widget *wb,*w;
     struct attr on,off;
     wb=gui_internal_menu(this, _("Rules"));
@@ -379,9 +375,8 @@ gui_internal_cmd2_setting_rules(struct gui_priv *this, char *function, struct at
     gui_internal_menu_render(this);
 }
 
-static void
-gui_internal_cmd2_setting_maps(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-                               int *valid) {
+static void gui_internal_cmd2_setting_maps(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
+        int *valid) {
     struct attr attr, on, off, description, type, data, url, active;
     struct widget *w,*wb,*row,*wma;
     char *label;
@@ -426,9 +421,9 @@ gui_internal_cmd2_setting_maps(struct gui_priv *this, char *function, struct att
 
 }
 
-static void
-gui_internal_cmd2_setting_layout(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-                                 int *valid) {
+static void gui_internal_cmd2_setting_layout(struct gui_priv *this, char *function, struct attr **in,
+        struct attr ***out,
+        int *valid) {
     struct attr attr;
     struct widget *w,*wb,*wl,*row;
     struct attr_iter *iter;
@@ -459,9 +454,9 @@ gui_internal_cmd2_setting_layout(struct gui_priv *this, char *function, struct a
  * comply with *.heightlines.bin
  *
  */
-static void
-gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-                                       int *valid) {
+static void gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, struct attr **in,
+        struct attr ***out,
+        int *valid) {
     struct widget * menu, *box;
     struct map * map=NULL;
     struct map_rect * mr=NULL;
@@ -675,9 +670,9 @@ gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, st
     }
 }
 
-static void
-gui_internal_cmd2_route_description(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-                                    int *valid) {
+static void gui_internal_cmd2_route_description(struct gui_priv *this, char *function, struct attr **in,
+        struct attr ***out,
+        int *valid) {
 
 
     struct widget * menu;
@@ -715,8 +710,8 @@ gui_internal_cmd2_route_description(struct gui_priv *this, char *function, struc
 
 }
 
-static void
-gui_internal_cmd2_pois(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static void gui_internal_cmd2_pois(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
+                                   int *valid) {
     struct widget *w;
     struct poi_param *param;
     struct attr pro;
@@ -746,8 +741,8 @@ gui_internal_cmd2_pois(struct gui_priv *this, char *function, struct attr **in,
     gui_internal_poi_param_free(param);
 }
 
-static void
-gui_internal_cmd2_locale(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static void gui_internal_cmd2_locale(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
+                                     int *valid) {
     struct widget *menu,*wb,*w;
     char *text;
 
@@ -802,9 +797,8 @@ gui_internal_cmd2_locale(struct gui_priv *this, char *function, struct attr **in
  * Currently only works on non Windows systems.
  *
  */
-static void
-gui_internal_cmd2_network_info(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-                               int *valid) {
+static void gui_internal_cmd2_network_info(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
+        int *valid) {
 #if HAS_IFADDRS
     struct widget *menu,*wb,*w;
     char *text;
@@ -840,8 +834,8 @@ gui_internal_cmd2_network_info(struct gui_priv *this, char *function, struct att
 #endif
 }
 
-static void
-gui_internal_cmd_formerdests(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static void gui_internal_cmd_formerdests(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
+        int *valid) {
     struct widget *wb,*w,*wbm,*tbl=NULL;
     struct map *formerdests;
     struct map_rect *mr_formerdests;
@@ -907,8 +901,8 @@ gui_internal_cmd_formerdests(struct gui_priv *this, char *function, struct attr
     map_rect_destroy(mr_formerdests);
 }
 
-static void
-gui_internal_cmd2_bookmarks(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static void gui_internal_cmd2_bookmarks(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
+                                        int *valid) {
     char *str=NULL;
     if (in && in[0] && ATTR_IS_STRING(in[0]->type)) {
         str=in[0]->u.str;
@@ -917,36 +911,34 @@ gui_internal_cmd2_bookmarks(struct gui_priv *this, char *function, struct attr *
     gui_internal_cmd_bookmarks(this, NULL, str);
 }
 
-static void
-gui_internal_cmd2_abort_navigation(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
-                                   int *valid) {
+static void gui_internal_cmd2_abort_navigation(struct gui_priv *this, char *function, struct attr **in,
+        struct attr ***out,
+        int *valid) {
     navit_set_destination(this->nav, NULL, NULL, 0);
 }
 
-static void
-gui_internal_cmd2_back(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static void gui_internal_cmd2_back(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
+                                   int *valid) {
     graphics_draw_mode(this->gra, draw_mode_begin);
     gui_internal_back(this, NULL, NULL);
     graphics_draw_mode(this->gra, draw_mode_end);
     gui_internal_check_exit(this);
 }
 
-static void
-gui_internal_cmd2_back_to_map(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static void gui_internal_cmd2_back_to_map(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
+        int *valid) {
     gui_internal_prune_menu(this, NULL);
     gui_internal_check_exit(this);
 }
 
 
-static void
-gui_internal_get_data(struct gui_priv *priv, char *command, struct attr **in, struct attr ***out) {
+static void gui_internal_get_data(struct gui_priv *priv, char *command, struct attr **in, struct attr ***out) {
     struct attr private_data = { attr_private_data, {(void *)&priv->data}};
     if (out)
         *out=attr_generic_add_attr(*out, &private_data);
 }
 
-static void
-gui_internal_cmd_log(struct gui_priv *this) {
+static void gui_internal_cmd_log(struct gui_priv *this) {
     struct widget *w,*wb,*wk,*wl,*we,*wnext;
     gui_internal_enter(this, 1);
     gui_internal_set_click_coord(this, NULL);
@@ -978,8 +970,8 @@ gui_internal_cmd_log(struct gui_priv *this) {
     gui_internal_leave(this);
 }
 
-static void
-gui_internal_cmd_menu2(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static void gui_internal_cmd_menu2(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
+                                   int *valid) {
     char *href=NULL;
     int i=0, ignore=0, replace=0;
 
@@ -1001,8 +993,8 @@ gui_internal_cmd_menu2(struct gui_priv *this, char *function, struct attr **in,
     gui_internal_cmd_menu(this, ignore, href);
 }
 
-static void
-gui_internal_cmd2_position(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static void gui_internal_cmd2_position(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
+                                       int *valid) {
     const char *name=_("Position");
     int flags=-1;
 
@@ -1020,20 +1012,20 @@ gui_internal_cmd2_position(struct gui_priv *this, char *function, struct attr **
     gui_internal_cmd_position_do(this, NULL, in[0]->u.coord_geo, NULL, name, flags);
 }
 
-static void
-gui_internal_cmd_redraw_map(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static void gui_internal_cmd_redraw_map(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
+                                        int *valid) {
     this->redraw=1;
 }
 
-static void
-gui_internal_cmd2_refresh(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static void gui_internal_cmd2_refresh(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
+                                      int *valid) {
     char *href=g_strdup(this->href);
     gui_internal_html_load_href(this, href, 1);
     g_free(href);
 }
 
-static void
-gui_internal_cmd2_set(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static void gui_internal_cmd2_set(struct gui_priv *this, char *function, struct attr **in, struct attr ***out,
+                                  int *valid) {
     char *pattern,*command=NULL;
     if (!in || !in[0] || !ATTR_IS_STRING(in[0]->type)) {
         dbg(lvl_error,"first parameter missing or wrong type");
@@ -1053,8 +1045,7 @@ gui_internal_cmd2_set(struct gui_priv *this, char *function, struct attr **in, s
 
 }
 
-void
-gui_internal_cmd2_quit(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+void gui_internal_cmd2_quit(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
     struct attr navit;
     gui_internal_prune_menu(this, NULL);
     navit.type=attr_navit;
@@ -1063,8 +1054,7 @@ gui_internal_cmd2_quit(struct gui_priv *this, char *function, struct attr **in,
     event_main_loop_quit();
 }
 
-static char *
-gui_internal_append_attr(char *str, enum escape_mode mode, char *pre, struct attr *attr, char *post) {
+static char *gui_internal_append_attr(char *str, enum escape_mode mode, char *pre, struct attr *attr, char *post) {
     char *astr=NULL;
     if (ATTR_IS_STRING(attr->type))
         astr=gui_internal_escape(mode, attr->u.str);
@@ -1081,8 +1071,8 @@ gui_internal_append_attr(char *str, enum escape_mode mode, char *pre, struct att
     return str;
 }
 
-static void
-gui_internal_cmd_write(struct gui_priv * this, char *function, struct attr **in, struct attr ***out, int *valid) {
+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",function,in,out,valid);
     if (!in)
@@ -1101,8 +1091,7 @@ gui_internal_cmd_write(struct gui_priv * this, char *function, struct attr **in,
     g_free(str);
 }
 
-static void
-gui_internal_onclick(struct attr ***in, char **onclick, char *set) {
+static void gui_internal_onclick(struct attr ***in, char **onclick, char *set) {
     struct attr **i=*in;
     char *c,*str=NULL,*args=NULL,*sep="";
 
@@ -1180,8 +1169,8 @@ error:
     return;
 }
 
-static void
-gui_internal_cmd_img(struct gui_priv * this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static void gui_internal_cmd_img(struct gui_priv * this, char *function, struct attr **in, struct attr ***out,
+                                 int *valid) {
     char *str=g_strdup("<img"),*suffix=NULL,*onclick=g_strdup(""),*html;
 
     if (ATTR_IS_STRING((*in)->type)) {
@@ -1231,8 +1220,8 @@ error:
     return;
 }
 
-static void
-gui_internal_cmd_debug(struct gui_priv * this, char *function, struct attr **in, struct attr ***out, int *valid) {
+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");
     if (in) {
@@ -1246,8 +1235,7 @@ gui_internal_cmd_debug(struct gui_priv * this, char *function, struct attr **in,
     dbg(lvl_debug,"done");
 }
 
-static void
-gui_internal_cmd2(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static void gui_internal_cmd2(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid) {
     int entering=0;
     int ignore=1;
     if (in && in[0] && ATTR_IS_INT(in[0]->type)) {
@@ -1334,8 +1322,7 @@ static struct command_table commands[] = {
 #endif
 };
 
-void
-gui_internal_command_init(struct gui_priv *this, struct attr **attrs) {
+void gui_internal_command_init(struct gui_priv *this, struct attr **attrs) {
     struct attr *attr;
     if ((attr=attr_search(attrs, NULL, attr_callback_list))) {
         command_add_table(attr->u.callback_list, commands, sizeof(commands)/sizeof(struct command_table), this);
diff --git a/navit/gui/internal/gui_internal_gesture.c b/navit/gui/internal/gui_internal_gesture.c
index f2b70171b..0ed2805cc 100644
--- a/navit/gui/internal/gui_internal_gesture.c
+++ b/navit/gui/internal/gui_internal_gesture.c
@@ -27,21 +27,18 @@
 #include "gui_internal_menu.h"
 #include "gui_internal_gesture.h"
 
-void
-gui_internal_gesture_ring_clear(struct gui_priv *this) {
+void gui_internal_gesture_ring_clear(struct gui_priv *this) {
     this->gesture_ring_last=this->gesture_ring_first=0;
 };
 
-static struct gesture_elem *
-gui_internal_gesture_ring_get(struct gui_priv *this, int i) {
+static struct gesture_elem *gui_internal_gesture_ring_get(struct gui_priv *this, int i) {
     int n=(this->gesture_ring_last-i+GESTURE_RINGSIZE)%GESTURE_RINGSIZE;
     if(n==this->gesture_ring_first)
         return NULL;
     return this->gesture_ring+n;
 };
 
-void
-gui_internal_gesture_ring_add(struct gui_priv *this, struct point *p) {
+void gui_internal_gesture_ring_add(struct gui_priv *this, struct point *p) {
     long long msec;
 #ifndef HAVE_API_WIN32_CE
     struct timeval tv;
@@ -61,8 +58,7 @@ gui_internal_gesture_ring_add(struct gui_priv *this, struct point *p) {
     dbg(lvl_info,"msec="LONGLONG_FMT" x=%d y=%d",msec,p->x,p->y);
 };
 
-int
-gui_internal_gesture_get_vector(struct gui_priv *this, long long msec, struct point *p0, int *dx, int *dy) {
+int gui_internal_gesture_get_vector(struct gui_priv *this, long long msec, struct point *p0, int *dx, int *dy) {
     struct gesture_elem *g;
     int x,y,dt;
     int i;
@@ -100,8 +96,7 @@ gui_internal_gesture_get_vector(struct gui_priv *this, long long msec, struct po
     return dt;
 }
 
-int
-gui_internal_gesture_do(struct gui_priv *this) {
+int gui_internal_gesture_do(struct gui_priv *this) {
     int dt;
     int dx,dy;
 
diff --git a/navit/gui/internal/gui_internal_html.c b/navit/gui/internal/gui_internal_html.c
index dc664b05b..ca33581be 100644
--- a/navit/gui/internal/gui_internal_html.c
+++ b/navit/gui/internal/gui_internal_html.c
@@ -40,8 +40,7 @@ struct html_tag_map {
 };
 
 
-static const char *
-find_attr(const char **names, const char **values, const char *name) {
+static const char *find_attr(const char **names, const char **values, const char *name) {
     while (*names) {
         if (!g_ascii_strcasecmp(*names, name))
             return *values;
@@ -51,24 +50,20 @@ find_attr(const char **names, const char **values, const char *name) {
     return NULL;
 }
 
-static char *
-find_attr_dup(const char **names, const char **values, const char *name) {
+static char *find_attr_dup(const char **names, const char **values, const char *name) {
     return g_strdup(find_attr(names, values, name));
 }
 
-void
-gui_internal_html_main_menu(struct gui_priv *this) {
+void gui_internal_html_main_menu(struct gui_priv *this) {
     gui_internal_prune_menu(this, NULL);
     gui_internal_html_load_href(this, "#Main Menu", 0);
 }
 
-static void
-gui_internal_html_command(struct gui_priv *this, struct widget *w, void *data) {
+static void gui_internal_html_command(struct gui_priv *this, struct widget *w, void *data) {
     gui_internal_evaluate(this,w->command);
 }
 
-static void
-gui_internal_html_submit_set(struct gui_priv *this, struct widget *w, struct form *form) {
+static void gui_internal_html_submit_set(struct gui_priv *this, struct widget *w, struct form *form) {
     GList *l;
     if (w->form == form && w->name) {
         struct attr *attr=attr_new_from_text(w->name, w->text?w->text:"");
@@ -85,8 +80,7 @@ gui_internal_html_submit_set(struct gui_priv *this, struct widget *w, struct for
 
 }
 
-static void
-gui_internal_html_submit(struct gui_priv *this, struct widget *w, void *data) {
+static void gui_internal_html_submit(struct gui_priv *this, struct widget *w, void *data) {
     struct widget *menu;
     GList *l;
 
@@ -101,8 +95,7 @@ gui_internal_html_submit(struct gui_priv *this, struct widget *w, void *data) {
     gui_internal_evaluate(this,w->form->onsubmit);
 }
 
-void
-gui_internal_html_load_href(struct gui_priv *this, char *href, int replace) {
+void 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] == '#') {
@@ -113,8 +106,7 @@ gui_internal_html_load_href(struct gui_priv *this, char *href, int replace) {
     }
 }
 
-void
-gui_internal_html_href(struct gui_priv *this, struct widget *w, void *data) {
+void gui_internal_html_href(struct gui_priv *this, struct widget *w, void *data) {
     gui_internal_html_load_href(this, w->command, 0);
 }
 
@@ -146,8 +138,7 @@ struct div_flags_map {
     {"orientation","horizontal_vertical",orientation_horizontal_vertical},
 };
 
-static enum flags
-div_flag(const char **names, const char **values, char *name) {
+static enum flags div_flag(const char **names, const char **values, char *name) {
     int i;
     enum flags ret=0;
     const char *value=find_attr(names, values, name);
@@ -160,8 +151,7 @@ div_flag(const char **names, const char **values, char *name) {
     return ret;
 }
 
-static enum flags
-div_flags(const char **names, const char **values) {
+static enum flags div_flags(const char **names, const char **values) {
     enum flags flags;
     flags = div_flag(names, values, "gravity");
     flags |= div_flag(names, values, "orientation");
@@ -170,8 +160,7 @@ div_flags(const char **names, const char **values) {
     return flags;
 }
 
-static struct widget *
-html_image(struct gui_priv *this, const char **names, const char **values) {
+static struct widget *html_image(struct gui_priv *this, const char **names, const char **values) {
     const char *src, *size;
     struct graphics_image *img=NULL;
 
@@ -197,9 +186,9 @@ html_image(struct gui_priv *this, const char **names, const char **values) {
     return gui_internal_image_new(this, img);
 }
 
-static void
-gui_internal_html_start(xml_context *dummy, const char *tag_name, const char **names, const char **values, void *data,
-                        GError **error) {
+static void gui_internal_html_start(xml_context *dummy, const char *tag_name, const char **names, const char **values,
+                                    void *data,
+                                    GError **error) {
     struct gui_priv *this=data;
     int i;
     enum html_tag tag=html_tag_none;
@@ -298,8 +287,7 @@ gui_internal_html_start(xml_context *dummy, const char *tag_name, const char **n
     this->html_depth++;
 }
 
-static void
-gui_internal_html_end(xml_context *dummy, const char *tag_name, void *data, GError **error) {
+static void gui_internal_html_end(xml_context *dummy, const char *tag_name, void *data, GError **error) {
     struct gui_priv *this=data;
     struct html *html;
     struct html *parent=NULL;
@@ -351,8 +339,7 @@ gui_internal_html_end(xml_context *dummy, const char *tag_name, void *data, GErr
     g_free(html->refresh_cond);
 }
 
-static void
-gui_internal_refresh_callback_called(struct gui_priv *this, struct menu_data *menu_data) {
+static void gui_internal_refresh_callback_called(struct gui_priv *this, struct menu_data *menu_data) {
     if (gui_internal_menu_data(this) == menu_data) {
         char *href=g_strdup(menu_data->href);
         gui_internal_html_load_href(this, href, 1);
@@ -360,8 +347,7 @@ 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) {
+static void gui_internal_set_refresh_callback(struct gui_priv *this, char *cond) {
     dbg(lvl_info,"cond=%s",cond);
     if (cond) {
         enum attr_type type;
@@ -387,8 +373,7 @@ gui_internal_set_refresh_callback(struct gui_priv *this, char *cond) {
     }
 }
 
-static void
-gui_internal_html_text(xml_context *dummy, const char *text, gsize len, void *data, GError **error) {
+static void gui_internal_html_text(xml_context *dummy, const char *text, gsize len, void *data, GError **error) {
     struct gui_priv *this=data;
     struct widget *w;
     int depth=this->html_depth-1;
@@ -459,13 +444,11 @@ gui_internal_html_text(xml_context *dummy, const char *text, gsize len, void *da
     g_free(text_stripped);
 }
 
-void
-gui_internal_html_parse_text(struct gui_priv *this, char *doc) {
+void gui_internal_html_parse_text(struct gui_priv *this, char *doc) {
     xml_parse_text(doc, this, gui_internal_html_start, gui_internal_html_end, gui_internal_html_text);
 }
 
-void
-gui_internal_html_menu(struct gui_priv *this, const char *document, char *anchor) {
+void gui_internal_html_menu(struct gui_priv *this, const char *document, char *anchor) {
     char *doc=g_strdup(document);
     graphics_draw_mode(this->gra, draw_mode_begin);
     this->html_container=NULL;
diff --git a/navit/gui/internal/gui_internal_keyboard.c b/navit/gui/internal/gui_internal_keyboard.c
index 49b936382..323c5f4ba 100644
--- a/navit/gui/internal/gui_internal_keyboard.c
+++ b/navit/gui/internal/gui_internal_keyboard.c
@@ -19,8 +19,7 @@
  *
  * @param this The internal GUI instance
  */
-void
-gui_internal_keyboard_to_upper_case(struct gui_priv *this) {
+void gui_internal_keyboard_to_upper_case(struct gui_priv *this) {
     struct menu_data *md;
 
     if (!this->keyboard)
@@ -43,8 +42,7 @@ gui_internal_keyboard_to_upper_case(struct gui_priv *this) {
  *
  * @param this The internal GUI instance
  */
-void
-gui_internal_keyboard_to_lower_case(struct gui_priv *this) {
+void gui_internal_keyboard_to_lower_case(struct gui_priv *this) {
     struct menu_data *md;
 
     if (!this->keyboard)
@@ -70,15 +68,13 @@ gui_internal_keyboard_to_lower_case(struct gui_priv *this) {
  * @param wm
  * @param data Not used
  */
-static void
-gui_internal_cmd_keypress(struct gui_priv *this, struct widget *wm, void *data) {
+static void gui_internal_cmd_keypress(struct gui_priv *this, struct widget *wm, void *data) {
     gui_internal_keypress_do(this, (char *) wm->data);
 }
 
-static struct widget *
-gui_internal_keyboard_key_data(struct gui_priv *this, struct widget *wkbd, char *text, int font,
-                               void(*func)(struct gui_priv *priv, struct widget *widget, void *data), void *data, void (*data_free)(void *data), int w,
-                               int h) {
+static struct widget *gui_internal_keyboard_key_data(struct gui_priv *this, struct widget *wkbd, char *text, int font,
+        void(*func)(struct gui_priv *priv, struct widget *widget, void *data), void *data, void (*data_free)(void *data), int w,
+        int h) {
     struct widget *wk;
     gui_internal_widget_append(wkbd, wk=gui_internal_button_font_new_with_callback(this, text, font,
                                         NULL, gravity_center|orientation_vertical, func, data));
@@ -93,8 +89,8 @@ gui_internal_keyboard_key_data(struct gui_priv *this, struct widget *wkbd, char
     return wk;
 }
 
-static struct widget *
-gui_internal_keyboard_key(struct gui_priv *this, struct widget *wkbd, char *text, char *key, int w, int h) {
+static struct widget *gui_internal_keyboard_key(struct gui_priv *this, struct widget *wkbd, char *text, char *key,
+        int w, int h) {
     return gui_internal_keyboard_key_data(this, wkbd, text, 0, gui_internal_cmd_keypress, g_strdup(key), g_free_func,w,h);
 }
 
@@ -552,8 +548,7 @@ gui_internal_keyboard(struct gui_priv *this, int mode) {
     return gui_internal_keyboard_do(this, NULL, mode);
 }
 
-static void
-gui_internal_keyboard_change(struct gui_priv *this, struct widget *key, void *data) {
+static void gui_internal_keyboard_change(struct gui_priv *this, struct widget *key, void *data) {
     gui_internal_keyboard_do(this, key->data, key->datai);
 }
 
@@ -568,8 +563,7 @@ gui_internal_keyboard_change(struct gui_priv *this, struct widget *key, void *da
  * @return {@code VKBD_CYRILLIC_UPPER} for countries using the Cyrillic alphabet,
  * {@code VKBD_LATIN_UPPER} otherwise
  */
-int
-gui_internal_keyboard_init_mode(char *lang) {
+int gui_internal_keyboard_init_mode(char *lang) {
     int ret=0;
     /* do not crash if lang is NULL, which may be returned by getenv*/
     if(lang == NULL)
diff --git a/navit/gui/internal/gui_internal_menu.c b/navit/gui/internal/gui_internal_menu.c
index fe479331d..9da7f2e4c 100644
--- a/navit/gui/internal/gui_internal_menu.c
+++ b/navit/gui/internal/gui_internal_menu.c
@@ -17,8 +17,7 @@
 
 extern char *version;
 
-static void
-gui_internal_menu_destroy(struct gui_priv *this, struct widget *w) {
+static void gui_internal_menu_destroy(struct gui_priv *this, struct widget *w) {
     struct menu_data *menu_data=w->menu_data;
     if (menu_data) {
         if (menu_data->refresh_callback_obj.type) {
@@ -37,8 +36,7 @@ gui_internal_menu_destroy(struct gui_priv *this, struct widget *w) {
     this->root.children=g_list_remove(this->root.children, w);
 }
 
-static void
-gui_internal_prune_menu_do(struct gui_priv *this, struct widget *w, int render) {
+static void gui_internal_prune_menu_do(struct gui_priv *this, struct widget *w, int render) {
     GList *l;
     struct widget *wr,*wd;
     gui_internal_search_idle_end(this);
@@ -70,13 +68,11 @@ gui_internal_prune_menu_do(struct gui_priv *this, struct widget *w, int render)
     }
 }
 
-void
-gui_internal_prune_menu(struct gui_priv *this, struct widget *w) {
+void gui_internal_prune_menu(struct gui_priv *this, struct widget *w) {
     gui_internal_prune_menu_do(this, w, 1);
 }
 
-void
-gui_internal_prune_menu_count(struct gui_priv *this, int count, int render) {
+void gui_internal_prune_menu_count(struct gui_priv *this, int count, int render) {
     GList *l=g_list_last(this->root.children);
     struct widget *w=NULL;
     while (l && count-- > 0)
@@ -206,8 +202,7 @@ gui_internal_menu_data(struct gui_priv *this) {
     return menu->menu_data;
 }
 
-void
-gui_internal_menu_reset_pack(struct gui_priv *this) {
+void gui_internal_menu_reset_pack(struct gui_priv *this) {
     GList *l;
     struct widget *top_box;
 
@@ -216,8 +211,7 @@ gui_internal_menu_reset_pack(struct gui_priv *this) {
     gui_internal_widget_reset_pack(this, top_box);
 }
 
-void
-gui_internal_menu_render(struct gui_priv *this) {
+void gui_internal_menu_render(struct gui_priv *this) {
     GList *l;
     struct widget *menu;
 
diff --git a/navit/gui/internal/gui_internal_poi.c b/navit/gui/internal/gui_internal_poi.c
index c17d034af..839a5d061 100644
--- a/navit/gui/internal/gui_internal_poi.c
+++ b/navit/gui/internal/gui_internal_poi.c
@@ -94,8 +94,7 @@ struct selector selectors[]= {
  * @return  Pointer to graphics_image object, or NULL if no picture available.
  */
 
-static struct graphics_image *
-gui_internal_poi_icon(struct gui_priv *this, struct item *item) {
+static struct graphics_image *gui_internal_poi_icon(struct gui_priv *this, struct item *item) {
     struct attr layout;
     struct attr icon_src;
     GList *layer;
@@ -155,8 +154,7 @@ gui_internal_poi_icon(struct gui_priv *this, struct item *item) {
  * @param p reference to the object to be freed.
  */
 
-void
-gui_internal_poi_param_free(void *p) {
+void gui_internal_poi_param_free(void *p) {
     if(((struct poi_param *)p)->filterstr)
         g_free(((struct poi_param *)p)->filterstr);
     if(((struct poi_param *)p)->filter)
@@ -171,8 +169,7 @@ gui_internal_poi_param_free(void *p) {
  * @return  Cloned object reference.
  */
 
-static struct poi_param *
-gui_internal_poi_param_clone(struct poi_param *p) {
+static struct poi_param *gui_internal_poi_param_clone(struct poi_param *p) {
     struct poi_param *r=g_new(struct poi_param,1);
     GList *l=p->filter;
     memcpy(r,p,sizeof(struct poi_param));
@@ -196,8 +193,7 @@ gui_internal_poi_param_clone(struct poi_param *p) {
  * @param text filter text.
  */
 
-void
-gui_internal_poi_param_set_filter(struct poi_param *param, char *text) {
+void gui_internal_poi_param_set_filter(struct poi_param *param, char *text) {
     char *s1, *s2;
 
     param->filterstr=removecase(text);
@@ -215,8 +211,7 @@ gui_internal_poi_param_set_filter(struct poi_param *param, char *text) {
     } while(s2 && *s2);
 }
 
-static struct widget *
-gui_internal_cmd_pois_selector(struct gui_priv *this, struct pcoord *c, int pagenb) {
+static struct widget *gui_internal_cmd_pois_selector(struct gui_priv *this, struct pcoord *c, int pagenb) {
     struct widget *wl,*wb;
     int nitems,nrows;
     int i;
@@ -266,8 +261,7 @@ gui_internal_cmd_pois_selector(struct gui_priv *this, struct pcoord *c, int page
  * @return  Pointer to new widget.
  */
 
-static void
-format_dist(int dist, char *distbuf) {
+static void format_dist(int dist, char *distbuf) {
     if (dist > 10000)
         sprintf(distbuf,"%d ", dist/1000);
     else if (dist>0)
@@ -336,8 +330,7 @@ gui_internal_cmd_pois_item(struct gui_priv *this, struct coord *center, struct i
  * @return  Pointer to string representation of address. To be g_free()d after use.
  */
 
-char *
-gui_internal_compose_item_address_string(struct item *item, int prependPostal) {
+char *gui_internal_compose_item_address_string(struct item *item, int prependPostal) {
     char *s=g_strdup("");
     struct attr attr;
     if(prependPostal && item_attr_get(item, attr_postal, &attr))
@@ -362,8 +355,7 @@ gui_internal_compose_item_address_string(struct item *item, int prependPostal) {
     return s;
 }
 
-static int
-gui_internal_cmd_pois_item_selected(struct poi_param *param, struct item *item) {
+static int gui_internal_cmd_pois_item_selected(struct poi_param *param, struct item *item) {
     enum item_type *types;
     struct selector *sel = param->sel? &selectors[param->selnb]: NULL;
     enum item_type type=item->type;
@@ -424,8 +416,7 @@ gui_internal_cmd_pois_item_selected(struct poi_param *param, struct item *item)
  * @param wm called widget.
  * @param data event data.
  */
-static void
-gui_internal_cmd_pois_more(struct gui_priv *this, struct widget *wm, void *data) {
+static void gui_internal_cmd_pois_more(struct gui_priv *this, struct widget *wm, void *data) {
     struct widget *w=g_new0(struct widget,1);
     w->data=wm->data;
     w->c=wm->c;
@@ -444,8 +435,7 @@ gui_internal_cmd_pois_more(struct gui_priv *this, struct widget *wm, void *data)
  * @param wm called widget.
  * @param data event data (pointer to editor widget containg filter text).
  */
-static void
-gui_internal_cmd_pois_filter_do(struct gui_priv *this, struct widget *wm, void *data) {
+static void gui_internal_cmd_pois_filter_do(struct gui_priv *this, struct widget *wm, void *data) {
     struct widget *w=data;
     struct poi_param *param;
 
@@ -477,8 +467,7 @@ gui_internal_cmd_pois_filter_do(struct gui_priv *this, struct widget *wm, void *
  *
  */
 
-static void
-gui_internal_cmd_pois_filter_changed(struct gui_priv *this, struct widget *wm, void *data) {
+static void gui_internal_cmd_pois_filter_changed(struct gui_priv *this, struct widget *wm, void *data) {
     if (wm->text && wm->reason==gui_internal_reason_keypress_finish) {
         gui_internal_cmd_pois_filter_do(this, wm, wm);
     }
@@ -492,8 +481,7 @@ gui_internal_cmd_pois_filter_changed(struct gui_priv *this, struct widget *wm, v
  * @param wm called widget.
  * @param data event data.
  */
-void
-gui_internal_cmd_pois_filter(struct gui_priv *this, struct widget *wm, void *data) {
+void gui_internal_cmd_pois_filter(struct gui_priv *this, struct widget *wm, void *data) {
     struct widget *wb, *w, *wr, *wk, *we;
     int keyboard_mode;
     keyboard_mode = VKBD_FLAG_2 | gui_internal_keyboard_init_mode(getenv("LANG"));
@@ -544,8 +532,7 @@ gui_internal_cmd_pois_filter(struct gui_priv *this, struct widget *wm, void *dat
  * @param wm called widget.
  * @param data event data, reference to poi_param or NULL.
  */
-void
-gui_internal_cmd_pois(struct gui_priv *this, struct widget *wm, void *data) {
+void gui_internal_cmd_pois(struct gui_priv *this, struct widget *wm, void *data) {
     struct map_selection *sel,*selm;
     struct coord c,center;
     struct mapset_handle *h;
diff --git a/navit/gui/internal/gui_internal_search.c b/navit/gui/internal/gui_internal_search.c
index 56a258029..c90d4b22d 100644
--- a/navit/gui/internal/gui_internal_search.c
+++ b/navit/gui/internal/gui_internal_search.c
@@ -22,14 +22,12 @@
 #include "gui_internal_keyboard.h"
 #include "gui_internal_search.h"
 
-static void
-gui_internal_search_country(struct gui_priv *this, struct widget *widget, void *data) {
+static void gui_internal_search_country(struct gui_priv *this, struct widget *widget, void *data) {
     gui_internal_prune_menu_count(this, 1, 0);
     gui_internal_search(this,_("Country"),"Country",0);
 }
 
-static void
-gui_internal_search_town(struct gui_priv *this, struct widget *wm, void *data) {
+static void gui_internal_search_town(struct gui_priv *this, struct widget *wm, void *data) {
     if (this->sl)
         search_list_select(this->sl, attr_country_all, 0, 0);
     g_free(this->country_iso2);
@@ -37,20 +35,17 @@ gui_internal_search_town(struct gui_priv *this, struct widget *wm, void *data) {
     gui_internal_search(this,_("Town"),"Town",0);
 }
 
-static void
-gui_internal_search_street(struct gui_priv *this, struct widget *widget, void *data) {
+static void gui_internal_search_street(struct gui_priv *this, struct widget *widget, void *data) {
     search_list_select(this->sl, attr_town_or_district_name, 0, 0);
     gui_internal_search(this,_("Street"),"Street",0);
 }
 
-static void
-gui_internal_search_house_number(struct gui_priv *this, struct widget *widget, void *data) {
+static void gui_internal_search_house_number(struct gui_priv *this, struct widget *widget, void *data) {
     search_list_select(this->sl, attr_street_name, 0, 0);
     gui_internal_search(this,_("House number"),"House number",0);
 }
 
-void
-gui_internal_search_idle_end(struct gui_priv *this) {
+void gui_internal_search_idle_end(struct gui_priv *this) {
     if (this->idle) {
         event_remove_idle(this->idle);
         this->idle=NULL;
@@ -61,8 +56,7 @@ gui_internal_search_idle_end(struct gui_priv *this) {
     }
 }
 
-static int
-gui_internal_search_cmp(gconstpointer _a, gconstpointer _b) {
+static int gui_internal_search_cmp(gconstpointer _a, gconstpointer _b) {
     struct widget *a=(struct widget *)_a, *b=(struct widget *)_b;
     char *sa,*sb;
     int r;
@@ -87,8 +81,7 @@ gui_internal_search_cmp(gconstpointer _a, gconstpointer _b) {
     return r;
 }
 
-static char *
-postal_str(struct search_list_result *res, int level) {
+static char *postal_str(struct search_list_result *res, int level) {
     char *ret=NULL;
     if (res->town->common.postal)
         ret=res->town->common.postal;
@@ -109,8 +102,7 @@ postal_str(struct search_list_result *res, int level) {
     return ret;
 }
 
-static char *
-get_string_from_attr_list(struct attr **attrs, enum attr_type type, char *dflt) {
+static char *get_string_from_attr_list(struct attr **attrs, enum attr_type type, char *dflt) {
     struct attr attr;
     if(attr_generic_get_attr(attrs,NULL,type,&attr,NULL))
         return attr.u.str;
@@ -118,8 +110,7 @@ get_string_from_attr_list(struct attr **attrs, enum attr_type type, char *dflt)
         return dflt;
 }
 
-static char *
-district_str(struct search_list_result *res, int level, enum attr_type district, char *dflt) {
+static char *district_str(struct search_list_result *res, int level, enum attr_type district, char *dflt) {
     char *ret=dflt;
 
     ret=get_string_from_attr_list(res->town->common.attrs, district, ret);
@@ -136,8 +127,7 @@ district_str(struct search_list_result *res, int level, enum attr_type district,
     return ret;
 }
 
-static char *
-town_display_label(struct search_list_result *res, int level, int flags) {
+static char *town_display_label(struct search_list_result *res, int level, int flags) {
     char *town=district_str(res, level,attr_town_name,"");
     char *district=district_str(res, level,attr_district_name,NULL);
     char *postal=postal_str(res, level);
@@ -178,8 +168,8 @@ town_display_label(struct search_list_result *res, int level, int flags) {
                            county);
 }
 
-static void
-gui_internal_find_next_possible_key(char *search_text, char *wm_name, char *possible_keys, char *item_name) {
+static void gui_internal_find_next_possible_key(char *search_text, char *wm_name, char *possible_keys,
+        char *item_name) {
     gchar* trunk_name;
     if (item_name) {
 
@@ -205,8 +195,7 @@ gui_internal_find_next_possible_key(char *search_text, char *wm_name, char *poss
     }
 }
 
-static void
-gui_internal_highlight_possible_keys(struct gui_priv *this, char *possible_keys) {
+static void gui_internal_highlight_possible_keys(struct gui_priv *this, char *possible_keys) {
     struct menu_data *md;
     int first_available_key_found = 0;
 
@@ -259,8 +248,7 @@ gui_internal_highlight_possible_keys(struct gui_priv *this, char *possible_keys)
 
 }
 
-static int
-gui_internal_get_match_quality(char *item_name, char* search_text, int is_house_number_without_street) {
+static int gui_internal_get_match_quality(char *item_name, char* search_text, int is_house_number_without_street) {
     enum match_quality {
         full_string_match, word_match, substring_match, housenum_but_no_street_match
     }
@@ -299,9 +287,9 @@ gui_internal_get_match_quality(char *item_name, char* search_text, int is_house_
     return match_quality;
 }
 
-static struct widget*
-gui_internal_create_resultlist_entry(struct gui_priv *this, struct search_list_result *res, char *result_main_label,
-                                     char *result_sublabel, void *param, char *widget_name, struct item *item) {
+static struct widget* gui_internal_create_resultlist_entry(struct gui_priv *this, struct search_list_result *res,
+        char *result_main_label,
+        char *result_sublabel, void *param, char *widget_name, struct item *item) {
     struct widget *resultlist_entry;
     if(result_sublabel) {
         struct widget *entry_sublabel;
@@ -337,8 +325,7 @@ gui_internal_create_resultlist_entry(struct gui_priv *this, struct search_list_r
  */
 char possible_keys_incremental_search[256]="";
 
-static void
-gui_internal_search_idle(struct gui_priv *this, char *wm_name, struct widget *search_list, void *param) {
+static void gui_internal_search_idle(struct gui_priv *this, char *wm_name, struct widget *search_list, void *param) {
     char *result_main_label=NULL,*result_sublabel=NULL,*item_name=NULL, *widget_name=NULL, *search_text;
     struct search_list_result *res;
     struct item *item=NULL;
@@ -408,15 +395,14 @@ gui_internal_search_idle(struct gui_priv *this, char *wm_name, struct widget *se
     g_free(result_sublabel);
 }
 
-static void
-gui_internal_search_idle_start(struct gui_priv *this, char *wm_name, struct widget *search_list, void *param) {
+static void gui_internal_search_idle_start(struct gui_priv *this, char *wm_name, struct widget *search_list,
+        void *param) {
     this->idle_cb=callback_new_4(callback_cast(gui_internal_search_idle), this, wm_name, search_list, param);
     this->idle=event_add_idle(50,this->idle_cb);
     callback_call_0(this->idle_cb);
 }
 
-static void
-gui_internal_search_changed(struct gui_priv *this, struct widget *wm, void *data) {
+static void gui_internal_search_changed(struct gui_priv *this, struct widget *wm, void *data) {
     GList *l;
     struct widget *search_list=gui_internal_menu_data(this)->search_list;
     void *param=(void *)3;
@@ -456,8 +442,7 @@ gui_internal_search_changed(struct gui_priv *this, struct widget *wm, void *data
     gui_internal_widget_render(this, l->data);
 }
 
-static void
-gui_internal_search_list_set_default_country(struct gui_priv *this) {
+static void gui_internal_search_list_set_default_country(struct gui_priv *this) {
     struct attr search_attr, country_name, country_iso2, *country_attr;
     struct item *item;
     struct country_search *cs;
@@ -497,8 +482,7 @@ gui_internal_search_list_set_default_country(struct gui_priv *this) {
     }
 }
 
-static void
-gui_internal_search_list_new(struct gui_priv *this) {
+static void gui_internal_search_list_new(struct gui_priv *this) {
     struct mapset *ms=navit_get_mapset(this->nav);
     if (! this->sl) {
         this->sl=search_list_new(ms);
@@ -506,16 +490,14 @@ gui_internal_search_list_new(struct gui_priv *this) {
     }
 }
 
-void
-gui_internal_search_list_destroy(struct gui_priv *this) {
+void gui_internal_search_list_destroy(struct gui_priv *this) {
     if (this->sl) {
         search_list_destroy(this->sl);
         this->sl=NULL;
     }
 }
 
-void
-gui_internal_search(struct gui_priv *this, const char *what, const char *type, int flags) {
+void gui_internal_search(struct gui_priv *this, const char *what, const char *type, int flags) {
     struct widget *wb,*wk,*w,*wr,*we,*wl,*wnext=NULL;
     char *country;
     int keyboard_mode;
@@ -584,24 +566,21 @@ gui_internal_search(struct gui_priv *this, const char *what, const char *type, i
     gui_internal_menu_render(this);
 }
 
-void
-gui_internal_search_house_number_in_street(struct gui_priv *this, struct widget *widget, void *data) {
+void gui_internal_search_house_number_in_street(struct gui_priv *this, struct widget *widget, void *data) {
     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);
 }
 
-void
-gui_internal_search_street_in_town(struct gui_priv *this, struct widget *widget, void *data) {
+void gui_internal_search_street_in_town(struct gui_priv *this, struct widget *widget, void *data) {
     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);
 }
 
-void
-gui_internal_search_town_in_country(struct gui_priv *this, struct widget *widget) {
+void gui_internal_search_town_in_country(struct gui_priv *this, struct widget *widget) {
     struct search_list_common *slc;
     dbg(lvl_info,"id %d", widget->selection_id);
     search_list_select(this->sl, attr_country_all, 0, 0);
diff --git a/navit/gui/internal/gui_internal_widget.c b/navit/gui/internal/gui_internal_widget.c
index 89f2f0fa7..aa4c9eeef 100644
--- a/navit/gui/internal/gui_internal_widget.c
+++ b/navit/gui/internal/gui_internal_widget.c
@@ -13,8 +13,7 @@
 
 static void gui_internal_scroll_buttons_init(struct gui_priv *this, struct widget *widget, struct scroll_buttons *sb);
 
-static void
-gui_internal_background_render(struct gui_priv *this, struct widget *w) {
+static void gui_internal_background_render(struct gui_priv *this, struct widget *w) {
     struct point pnt=w->p;
     if (w->state & STATE_HIGHLIGHTED)
         graphics_draw_rectangle(this->gra, this->highlight_background, &pnt, w->w, w->h);
@@ -89,8 +88,7 @@ gui_internal_image_new(struct gui_priv *this, struct graphics_image *image) {
     return widget;
 }
 
-static void
-gui_internal_image_render(struct gui_priv *this, struct widget *w) {
+static void gui_internal_image_render(struct gui_priv *this, struct widget *w) {
     struct point pnt;
 
     gui_internal_background_render(this, w);
@@ -108,8 +106,7 @@ gui_internal_image_render(struct gui_priv *this, struct widget *w) {
  * @param this The internal GUI instance
  * @param w The widget to render
  */
-static void
-gui_internal_label_render(struct gui_priv *this, struct widget *w) {
+static void gui_internal_label_render(struct gui_priv *this, struct widget *w) {
     struct point pnt=w->p;
     gui_internal_background_render(this, w);
     if (w->state & STATE_EDIT)
@@ -231,8 +228,7 @@ gui_internal_find_widget(struct widget *wi, struct point *p, int flags) {
 
 }
 
-void
-gui_internal_highlight_do(struct gui_priv *this, struct widget *found) {
+void gui_internal_highlight_do(struct gui_priv *this, struct widget *found) {
     if (found == this->highlighted)
         return;
 
@@ -258,8 +254,7 @@ gui_internal_highlight_do(struct gui_priv *this, struct widget *found) {
 //# Comment:
 //# Authors: Martin Schaller (04/2008)
 //##############################################################################################################
-void
-gui_internal_highlight(struct gui_priv *this) {
+void gui_internal_highlight(struct gui_priv *this) {
     struct widget *menu,*found=NULL;
     if (this->current.x > -1 && this->current.y > -1) {
         menu=g_list_last(this->root.children)->data;
@@ -604,8 +599,7 @@ static void gui_internal_box_pack(struct gui_priv *this, struct widget *w) {
     }
 }
 
-void
-gui_internal_widget_reset_pack(struct gui_priv *this, struct widget *w) {
+void gui_internal_widget_reset_pack(struct gui_priv *this, struct widget *w) {
     struct widget *wc;
     GList *l;
 
@@ -627,8 +621,7 @@ gui_internal_widget_reset_pack(struct gui_priv *this, struct widget *w) {
  * @param parent The parent widget
  * @param child The child widget
  */
-void
-gui_internal_widget_append(struct widget *parent, struct widget *child) {
+void gui_internal_widget_append(struct widget *parent, struct widget *child) {
     if (! child)
         return;
     if (! child->background)
@@ -643,8 +636,7 @@ gui_internal_widget_append(struct widget *parent, struct widget *child) {
  * @param parent The parent widget
  * @param child The child widget
  */
-void
-gui_internal_widget_prepend(struct widget *parent, struct widget *child) {
+void gui_internal_widget_prepend(struct widget *parent, struct widget *child) {
     if (! child->background)
         child->background=parent->background;
     parent->children=g_list_prepend(parent->children, child);
@@ -660,8 +652,7 @@ gui_internal_widget_prepend(struct widget *parent, struct widget *child) {
  * @param child The child widget
  * @param func The comparison function
  */
-void
-gui_internal_widget_insert_sorted(struct widget *parent, struct widget *child, GCompareFunc func) {
+void gui_internal_widget_insert_sorted(struct widget *parent, struct widget *child, GCompareFunc func) {
     if (! child->background)
         child->background=parent->background;
 
@@ -678,8 +669,7 @@ gui_internal_widget_insert_sorted(struct widget *parent, struct widget *child, G
  * @param this The internal GUI instance
  * @param w The widget whose children are to be destroyed
  */
-void
-gui_internal_widget_children_destroy(struct gui_priv *this, struct widget *w) {
+void gui_internal_widget_children_destroy(struct gui_priv *this, struct widget *w) {
     GList *l;
     struct widget *wc;
 
@@ -703,8 +693,7 @@ gui_internal_widget_children_destroy(struct gui_priv *this, struct widget *w) {
  * @param this The internal GUI instance
  * @param w The widget to destroy
  */
-void
-gui_internal_widget_destroy(struct gui_priv *this, struct widget *w) {
+void gui_internal_widget_destroy(struct gui_priv *this, struct widget *w) {
     gui_internal_widget_children_destroy(this, w);
     g_free(w->command);
     g_free(w->speech);
@@ -728,8 +717,7 @@ gui_internal_widget_destroy(struct gui_priv *this, struct widget *w) {
 }
 
 
-void
-gui_internal_widget_render(struct gui_priv *this, struct widget *w) {
+void gui_internal_widget_render(struct gui_priv *this, struct widget *w) {
     if(w->p.x > this->root.w || w->p.y > this->root.h || w->state & STATE_INVISIBLE)
         return;
 
@@ -751,8 +739,7 @@ gui_internal_widget_render(struct gui_priv *this, struct widget *w) {
     }
 }
 
-void
-gui_internal_widget_pack(struct gui_priv *this, struct widget *w) {
+void gui_internal_widget_pack(struct gui_priv *this, struct widget *w) {
     switch (w->type) {
     case widget_box:
         gui_internal_box_pack(this, w);
@@ -785,8 +772,7 @@ gui_internal_button_label(struct gui_priv *this, const char *label, int mode) {
     return wlb;
 }
 
-static void
-gui_internal_scroll_buttons_init(struct gui_priv *this, struct widget *widget, struct scroll_buttons *sb) {
+static void gui_internal_scroll_buttons_init(struct gui_priv *this, struct widget *widget, struct scroll_buttons *sb) {
     sb->next_button =  gui_internal_button_new_with_callback(this, _("Next"), image_new_xs(this, "gui_arrow_right"),
                        gravity_center|orientation_horizontal|flags_swap, gui_internal_table_button_next, widget);
     sb->prev_button =  gui_internal_button_new_with_callback(this, _("Prev"), image_new_xs(this, "gui_arrow_left"),
@@ -881,8 +867,7 @@ void gui_internal_widget_table_clear(struct gui_priv * this,struct widget * tabl
  *
  * @return GList pointer to the next row in the children list, or NULL if there are no any rows left.
  */
-GList *
-gui_internal_widget_table_next_row(GList * row) {
+GList *gui_internal_widget_table_next_row(GList * row) {
     while((row=g_list_next(row))!=NULL) {
         if(row->data && ((struct widget *)(row->data))->type == widget_table_row)
             break;
@@ -897,8 +882,7 @@ gui_internal_widget_table_next_row(GList * row) {
  *
  * @return GList pointer to the previous row in the children list, or NULL if there are no any rows left.
  */
-GList *
-gui_internal_widget_table_prev_row(GList * row) {
+GList *gui_internal_widget_table_prev_row(GList * row) {
     while((row=g_list_previous(row))!=NULL) {
         if(row->data && ((struct widget *)(row->data))->type == widget_table_row)
             break;
@@ -913,8 +897,7 @@ gui_internal_widget_table_prev_row(GList * row) {
  *
  * @return GList pointer to the first row in the children list, or NULL if table is empty.
  */
-GList *
-gui_internal_widget_table_first_row(GList * row) {
+GList *gui_internal_widget_table_first_row(GList * row) {
     if(!row)
         return NULL;
 
@@ -929,8 +912,7 @@ gui_internal_widget_table_first_row(GList * row) {
  *
  * @return GList pointer to the top row in the children list, or NULL.
  */
-GList *
-gui_internal_widget_table_top_row(struct gui_priv *this, struct widget * table) {
+GList *gui_internal_widget_table_top_row(struct gui_priv *this, struct widget * table) {
     if(table && table->type==widget_table) {
         struct table_data *d=table->data;
         return gui_internal_widget_table_first_row(d->top_row);
@@ -943,8 +925,7 @@ gui_internal_widget_table_top_row(struct gui_priv *this, struct widget * table)
  *
  * @return GList pointer to the top row in the children list of the table.
  */
-GList *
-gui_internal_widget_table_set_top_row(struct gui_priv *this, struct widget * table, struct widget *row) {
+GList *gui_internal_widget_table_set_top_row(struct gui_priv *this, struct widget * table, struct widget *row) {
     if(table && table->type==widget_table) {
         struct table_data *d=table->data;
         d->top_row=table->children;
@@ -988,8 +969,7 @@ gui_internal_widget_table_row_new(struct gui_priv * this, enum flags flags) {
  *
  * The caller is responsible for freeing the returned list.
  */
-static GList *
-gui_internal_compute_table_dimensions(struct gui_priv * this,struct widget * w) {
+static GList *gui_internal_compute_table_dimensions(struct gui_priv * this,struct widget * w) {
 
     GList * column_desc = NULL;
     GList * current_desc=NULL;
@@ -1076,8 +1056,7 @@ gui_internal_compute_table_dimensions(struct gui_priv * this,struct widget * w)
  * @param this The graphics context
  * @param w The widget to pack.
  */
-void
-gui_internal_table_pack(struct gui_priv * this, struct widget * w) {
+void gui_internal_table_pack(struct gui_priv * this, struct widget * w) {
 
     int height=0;
     int width=0;
@@ -1140,8 +1119,7 @@ gui_internal_table_pack(struct gui_priv * this, struct widget * w) {
  *
  * @param table_data Data from the table object.
  */
-void
-gui_internal_table_hide_rows(struct table_data * table_data) {
+void gui_internal_table_hide_rows(struct table_data * table_data) {
     GList*cur_row;
     for(cur_row=table_data->top_row; cur_row ; cur_row = g_list_next(cur_row)) {
         struct widget * cur_row_widget = (struct widget*)cur_row->data;
@@ -1163,8 +1141,7 @@ gui_internal_table_hide_rows(struct table_data * table_data) {
  * @param this The graphics context
  * @param w The table widget to render.
  */
-void
-gui_internal_table_render(struct gui_priv * this, struct widget * w) {
+void gui_internal_table_render(struct gui_priv * this, struct widget * w) {
 
     int x;
     int y;
@@ -1341,8 +1318,7 @@ gui_internal_table_render(struct gui_priv * this, struct widget * w) {
  * @param wm The button widget that was pressed.
  * @param data
  */
-void
-gui_internal_table_button_next(struct gui_priv * this, struct widget * wm, void *data) {
+void gui_internal_table_button_next(struct gui_priv * this, struct widget * wm, void *data) {
     struct widget * table_widget=NULL;
     struct table_data * table_data = NULL;
 
@@ -1379,8 +1355,7 @@ gui_internal_table_button_next(struct gui_priv * this, struct widget * wm, void
  * @param this The graphics context.
  * @param wm The button widget that was pressed.
  */
-void
-gui_internal_table_button_prev(struct gui_priv * this, struct widget * wm, void *data) {
+void gui_internal_table_button_prev(struct gui_priv * this, struct widget * wm, void *data) {
     struct widget * table_widget = NULL;
     struct table_data * table_data = NULL;
 
diff --git a/navit/gui/qml/gui_qml.cpp b/navit/gui/qml/gui_qml.cpp
index 49716debc..8c6f232f8 100644
--- a/navit/gui/qml/gui_qml.cpp
+++ b/navit/gui/qml/gui_qml.cpp
@@ -224,8 +224,7 @@ static void gui_qml_keypress(void *data, char *key) {
     return;
 }
 
-static void
-gui_qml_window_closed(struct gui_priv *data) {
+static void gui_qml_window_closed(struct gui_priv *data) {
     struct gui_priv *this_=(struct gui_priv*) data;
     this_->navitProxy->quit();
 }
@@ -328,8 +327,7 @@ static int gui_qml_set_graphics(struct gui_priv *this_, struct graphics *gra) {
     return 0;
 }
 
-static int
-gui_qml_get_attr(struct gui_priv *this_, enum attr_type type, struct attr *attr) {
+static int gui_qml_get_attr(struct gui_priv *this_, enum attr_type type, struct attr *attr) {
     switch (type) {
     case attr_fullscreen:
         attr->u.num=this_->fullscreen;
@@ -350,8 +348,7 @@ gui_qml_get_attr(struct gui_priv *this_, enum attr_type type, struct attr *attr)
     return 1;
 }
 
-static int
-gui_qml_set_attr(struct gui_priv *this_, struct attr *attr) {
+static int gui_qml_set_attr(struct gui_priv *this_, struct attr *attr) {
     switch (attr->type) {
     case attr_fullscreen:
         if (!(this_->fullscreen) && (attr->u.num)) {
@@ -387,8 +384,7 @@ struct gui_methods gui_qml_methods = {
     gui_qml_set_attr,
 };
 
-static void
-gui_qml_command(struct gui_priv *this_, char *function, struct attr **in, struct attr ***out, int *valid) {
+static void gui_qml_command(struct gui_priv *this_, char *function, struct attr **in, struct attr ***out, int *valid) {
     this_->guiProxy->processCommand(function);
 }
 
diff --git a/navit/gui/qt5_qml/gui_qt5_qml.cpp b/navit/gui/qt5_qml/gui_qt5_qml.cpp
index 7d70a3d39..dfdbf5d14 100644
--- a/navit/gui/qt5_qml/gui_qt5_qml.cpp
+++ b/navit/gui/qt5_qml/gui_qt5_qml.cpp
@@ -95,8 +95,7 @@ struct gui_priv {
 
 #include "backend.h"
 
-static void
-gui_qt5_qml_button(void* data, int pressed, int button, struct point* p) {
+static void gui_qt5_qml_button(void* data, int pressed, int button, struct point* p) {
     struct gui_priv* gui_priv = (struct gui_priv*)data;
 
     /* check if navit wants to handle this */
@@ -114,24 +113,21 @@ gui_qt5_qml_button(void* data, int pressed, int button, struct point* p) {
     }
 }
 
-static void
-gui_qt5_qml_motion(void* data, struct point* p) {
+static void gui_qt5_qml_motion(void* data, struct point* p) {
     struct gui_priv* gui_priv = (struct gui_priv*)data;
     dbg(lvl_debug, "enter (%d, %d)", p->x, p->y);
     /* forward this to navit  */
     navit_handle_motion(gui_priv->nav, p);
 }
 
-static void
-gui_qt5_qml_resize(void* data, int w, int h) {
+static void gui_qt5_qml_resize(void* data, int w, int h) {
     struct gui_priv* gui_priv = (struct gui_priv*)data;
     dbg(lvl_debug, "enter");
     /* forward this to navit */
     navit_handle_resize(gui_priv->nav, w, h);
 }
 
-static void
-gui_qml_keypress(void* data, char* key) {
+static void gui_qml_keypress(void* data, char* key) {
     struct gui_priv* this_ = (struct gui_priv*)data;
     int w, h;
     struct point p;
@@ -175,8 +171,7 @@ gui_qml_keypress(void* data, char* key) {
     return;
 }
 
-static int
-gui_qt5_qml_set_graphics(struct gui_priv* gui_priv, struct graphics* gra) {
+static int gui_qt5_qml_set_graphics(struct gui_priv* gui_priv, struct graphics* gra) {
     struct transformation* trans;
     dbg(lvl_debug, "enter");
 
@@ -246,14 +241,12 @@ gui_qt5_qml_set_graphics(struct gui_priv* gui_priv, struct graphics* gra) {
     return 0;
 }
 
-static int
-gui_qt5_qml_get_attr(struct gui_priv* gui_priv, enum attr_type type, struct attr* attr) {
+static int gui_qt5_qml_get_attr(struct gui_priv* gui_priv, enum attr_type type, struct attr* attr) {
     dbg(lvl_debug, "enter");
     return 1;
 }
 
-static int
-gui_qt5_qml_set_attr(struct gui_priv* gui_priv, struct attr* attr) {
+static int gui_qt5_qml_set_attr(struct gui_priv* gui_priv, struct attr* attr) {
     dbg(lvl_debug, "enter");
     return 1;
 }
@@ -271,8 +264,8 @@ struct gui_methods gui_qt5_qml_methods = {
     gui_qt5_qml_set_attr,
 };
 
-static struct gui_priv*
-gui_qt5_qml_new(struct navit* nav, struct gui_methods* meth, struct attr** attrs, struct gui* gui) {
+static struct gui_priv* gui_qt5_qml_new(struct navit* nav, struct gui_methods* meth, struct attr** attrs,
+                                        struct gui* gui) {
     struct gui_priv* gui_priv;
     struct attr* attr;