diff options
| author | Lionel AINS <lains@caramail.com> | 2018-11-26 19:02:05 +0100 |
|---|---|---|
| committer | Lionel AINS <lains@caramail.com> | 2018-11-26 19:02:05 +0100 |
| commit | f6a110206c4af4b0ab6570df19d46d5b52e5d947 (patch) | |
| tree | 96884043c4c04d8a1eb782981df6170bc1a6f510 | |
| parent | 9a71d6d29d51dd9b1e565252d092087b4b47457f (diff) | |
| download | navit-f6a110206c4af4b0ab6570df19d46d5b52e5d947.tar.gz | |
Fixing indentation
| -rw-r--r-- | navit/gui/internal/gui_internal_menu.c | 3 | ||||
| -rw-r--r-- | navit/gui/internal/gui_internal_widget.c | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/navit/gui/internal/gui_internal_menu.c b/navit/gui/internal/gui_internal_menu.c index b5d27955b..6a0d6a52b 100644 --- a/navit/gui/internal/gui_internal_menu.c +++ b/navit/gui/internal/gui_internal_menu.c @@ -230,7 +230,8 @@ gui_internal_menu(struct gui_priv *this, const char *label) { menu=gui_internal_box_new(this, gravity_left_center|orientation_vertical); menu->on_resize=gui_internal_menu_menu_resize; topbox->on_resize(this, topbox, NULL, this->root.w, this->root.h); - menu->on_resize(this, menu, NULL, topbox->w, topbox->h); /* We also have to invoke onresize() handler on menu because it is not (yet) set as a child of topbox */ + /* We also have to invoke onresize() handler on menu because it is not (yet) set as a child of topbox */ + menu->on_resize(this, menu, NULL, topbox->w, topbox->h); menu->background=this->background; gui_internal_apply_config(this); topbox->menu_data=g_new0(struct menu_data, 1); diff --git a/navit/gui/internal/gui_internal_widget.c b/navit/gui/internal/gui_internal_widget.c index 65f786484..0894be5aa 100644 --- a/navit/gui/internal/gui_internal_widget.c +++ b/navit/gui/internal/gui_internal_widget.c @@ -22,7 +22,8 @@ void gui_internal_box_pack(struct gui_priv *this, struct widget *w); * @param[in,out] second The second widget * @param move_only If non nul, transfer only the second widget into the first widget. The second widget is then deallocated and should be be used anymore (this is a move operation) */ -static void gui_internal_widget_transfer_content(struct gui_priv *this, struct widget *first, struct widget *second, int move_only) { +static void gui_internal_widget_transfer_content(struct gui_priv *this, struct widget *first, struct widget *second, + int move_only) { struct widget *temp; if (!first) { @@ -37,8 +38,10 @@ static void gui_internal_widget_transfer_content(struct gui_priv *this, struct w memcpy(temp, first, sizeof(struct widget)); memcpy(first, second, sizeof(struct widget)); if (move_only) { - gui_internal_widget_destroy(this, temp); /* This will do a g_free(temp), but will also deallocate all children widgets */ - g_free(second); /* We also free the struct widget pointed to by second, so variable second should not be used anymore from this point */ + gui_internal_widget_destroy(this, temp); + /* gui_internal_widget_destroy() will do a g_free(temp), but will also deallocate all children widgets */ + /* Now, we also free the struct widget pointed to by second, so variable second should not be used anymore from this point */ + g_free(second); } else { memcpy(second, temp, sizeof(struct widget)); g_free(temp); |