From 4886c93b4461799f9742275ed5ee5ed2d31dee22 Mon Sep 17 00:00:00 2001 From: Lionel AINS Date: Sun, 14 Oct 2018 14:21:26 +0200 Subject: Fixing compilation warning and indentation according to style --- navit/gui/internal/gui_internal.c | 5 ++--- navit/gui/internal/gui_internal_menu.c | 29 +++++++++++++++-------------- navit/gui/internal/gui_internal_widget.c | 1 - 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/navit/gui/internal/gui_internal.c b/navit/gui/internal/gui_internal.c index 23b1ba007..34ac3eab9 100644 --- a/navit/gui/internal/gui_internal.c +++ b/navit/gui/internal/gui_internal.c @@ -2710,7 +2710,7 @@ static void gui_internal_resize(void *data, int wnew, int hnew) { if (changed) { l = g_list_last(this->root.children); if (l) { - w=l->data; + w=l->data; void (*redisplay)(struct gui_priv *priv, struct widget *widget, void *data); redisplay=w->menu_data->redisplay; dbg(lvl_error, "redisplay%c=NULL", redisplay?'!':'='); @@ -2720,8 +2720,7 @@ static void gui_internal_resize(void *data, int wnew, int hnew) { gui_internal_menu_resize(this, wnew, hnew); gui_internal_menu_render(this); } - } - else { + } else { dbg(lvl_error,"Current GUI displayed is a menu"); } } else { diff --git a/navit/gui/internal/gui_internal_menu.c b/navit/gui/internal/gui_internal_menu.c index 4b9512b0a..7225c96b0 100644 --- a/navit/gui/internal/gui_internal_menu.c +++ b/navit/gui/internal/gui_internal_menu.c @@ -44,10 +44,10 @@ void gui_internal_menu_destroy(struct gui_priv *this, struct widget *w) { * @return the string for the href, or NULL if this menu has no href (or the widget is not a menu) */ static char *gui_internal_widget_get_href(struct widget *w) { - if (w && w->menu_data) - return w->menu_data->href; - else - return NULL; + if (w && w->menu_data) + return w->menu_data->href; + else + return NULL; } /** @@ -60,15 +60,15 @@ static char *gui_internal_widget_get_href(struct widget *w) { * @note If the widget provided in @p w has no href, we will return 0 */ int gui_internal_widget_reload_href(struct gui_priv *this, struct widget *w) { - char *ohref = gui_internal_widget_get_href(w); - if (ohref) { - char *href=g_strdup(ohref); - gui_internal_menu_destroy(this, w); - gui_internal_html_load_href(this, href, 0); - g_free(href); - return 1; - } - return 0; + char *ohref = gui_internal_widget_get_href(w); + if (ohref) { + char *href=g_strdup(ohref); + gui_internal_menu_destroy(this, w); + gui_internal_html_load_href(this, href, 0); + g_free(href); + return 1; + } + return 0; } /** @@ -82,7 +82,8 @@ static void gui_internal_prune_menu_do(struct gui_priv *this, struct widget *w, GList *l; struct widget *wr,*wd; gui_internal_search_idle_end(this); - while ((l = g_list_last(this->root.children))) { /* Destroy all menus, backwards, starting from the end until we reach widget w, and redraw widget w */ + /* Destroy all menus, backwards, starting from the end until we reach widget w, and redraw widget w */ + while ((l = g_list_last(this->root.children))) { wd=l->data; if (wd == w) { void (*redisplay)(struct gui_priv *priv, struct widget *widget, void *data); diff --git a/navit/gui/internal/gui_internal_widget.c b/navit/gui/internal/gui_internal_widget.c index 3e9d9e123..791c6826c 100644 --- a/navit/gui/internal/gui_internal_widget.c +++ b/navit/gui/internal/gui_internal_widget.c @@ -609,7 +609,6 @@ static void gui_internal_box_pack(struct gui_priv *this, struct widget *w) { } static void gui_internal_box_resize(struct gui_priv *this, struct widget *w, int wnew, int hnew) { - GList *l; gui_internal_widget_reset_pack(this, w); w->w = wnew; -- cgit v1.2.1