New upstream version 1.35.91 upstream/1.35.91

19 files changed, 125 insertions, 125 deletions

diff --git a/src/libnmt-newt/nmt-newt-button-box.c b/src/libnmt-newt/nmt-newt-button-box.c
index d86a154c..f3c8b27e 100644
--- a/src/libnmt-newt/nmt-newt-button-box.c
+++ b/src/libnmt-newt/nmt-newt-button-box.c
@@ -29,7 +29,7 @@ G_DEFINE_TYPE(NmtNewtButtonBox, nmt_newt_button_box, NMT_TYPE_NEWT_CONTAINER)
 
 typedef struct {
     NmtNewtButtonBoxOrientation orientation;
-    GPtrArray *                 start_buttons, *end_buttons;
+    GPtrArray                  *start_buttons, *end_buttons;
 } NmtNewtButtonBoxPrivate;
 
 enum {
@@ -193,7 +193,7 @@ static newtComponent *
 nmt_newt_button_box_get_components(NmtNewtWidget *widget)
 {
     NmtNewtButtonBoxPrivate *priv = NMT_NEWT_BUTTON_BOX_GET_PRIVATE(widget);
-    GPtrArray *              cos;
+    GPtrArray               *cos;
 
     cos = g_ptr_array_new();
     add_buttons(priv->start_buttons, cos);
@@ -231,7 +231,7 @@ size_request_buttons(NmtNewtButtonBox *bbox, GPtrArray *buttons, int *width, int
 static void
 nmt_newt_button_box_size_request(NmtNewtWidget *widget, int *width, int *height)
 {
-    NmtNewtButtonBox *       bbox = NMT_NEWT_BUTTON_BOX(widget);
+    NmtNewtButtonBox        *bbox = NMT_NEWT_BUTTON_BOX(widget);
     NmtNewtButtonBoxPrivate *priv = NMT_NEWT_BUTTON_BOX_GET_PRIVATE(widget);
 
     *width = *height = 0;
@@ -248,7 +248,7 @@ static void
 nmt_newt_button_box_size_allocate(NmtNewtWidget *widget, int x, int y, int width, int height)
 {
     NmtNewtButtonBoxPrivate *priv = NMT_NEWT_BUTTON_BOX_GET_PRIVATE(widget);
-    NmtNewtWidget *          child;
+    NmtNewtWidget           *child;
     int                      child_x, child_y, child_width, child_height;
     int                      i;
 
@@ -295,10 +295,10 @@ nmt_newt_button_box_size_allocate(NmtNewtWidget *widget, int x, int y, int width
 }
 
 static void
-nmt_newt_button_box_set_property(GObject *     object,
+nmt_newt_button_box_set_property(GObject      *object,
                                  guint         prop_id,
                                  const GValue *value,
-                                 GParamSpec *  pspec)
+                                 GParamSpec   *pspec)
 {
     NmtNewtButtonBoxPrivate *priv = NMT_NEWT_BUTTON_BOX_GET_PRIVATE(object);
 
@@ -330,8 +330,8 @@ nmt_newt_button_box_get_property(GObject *object, guint prop_id, GValue *value,
 static void
 nmt_newt_button_box_class_init(NmtNewtButtonBoxClass *bbox_class)
 {
-    GObjectClass *         object_class    = G_OBJECT_CLASS(bbox_class);
-    NmtNewtWidgetClass *   widget_class    = NMT_NEWT_WIDGET_CLASS(bbox_class);
+    GObjectClass          *object_class    = G_OBJECT_CLASS(bbox_class);
+    NmtNewtWidgetClass    *widget_class    = NMT_NEWT_WIDGET_CLASS(bbox_class);
     NmtNewtContainerClass *container_class = NMT_NEWT_CONTAINER_CLASS(bbox_class);
 
     g_type_class_add_private(bbox_class, sizeof(NmtNewtButtonBoxPrivate));
diff --git a/src/libnmt-newt/nmt-newt-button.c b/src/libnmt-newt/nmt-newt-button.c
index 974d05bd..b21ae537 100644
--- a/src/libnmt-newt/nmt-newt-button.c
+++ b/src/libnmt-newt/nmt-newt-button.c
@@ -108,7 +108,7 @@ nmt_newt_button_build_component(NmtNewtComponent *component, gboolean sensitive)
 {
     NmtNewtButtonPrivate *priv = NMT_NEWT_BUTTON_GET_PRIVATE(component);
     newtComponent         co;
-    gs_free char *        label_lc = NULL;
+    gs_free char         *label_lc = NULL;
 
     if (sensitive) {
         label_lc = nmt_newt_locale_from_utf8(priv->label);
@@ -183,9 +183,9 @@ nmt_newt_button_get_property(GObject *object, guint prop_id, GValue *value, GPar
 static void
 nmt_newt_button_class_init(NmtNewtButtonClass *button_class)
 {
-    GObjectClass *         object_class    = G_OBJECT_CLASS(button_class);
+    GObjectClass          *object_class    = G_OBJECT_CLASS(button_class);
     NmtNewtComponentClass *component_class = NMT_NEWT_COMPONENT_CLASS(button_class);
-    NmtNewtWidgetClass *   widget_class    = NMT_NEWT_WIDGET_CLASS(button_class);
+    NmtNewtWidgetClass    *widget_class    = NMT_NEWT_WIDGET_CLASS(button_class);
 
     g_type_class_add_private(button_class, sizeof(NmtNewtButtonPrivate));
 
diff --git a/src/libnmt-newt/nmt-newt-checkbox.c b/src/libnmt-newt/nmt-newt-checkbox.c
index cf825e08..26e7ebf0 100644
--- a/src/libnmt-newt/nmt-newt-checkbox.c
+++ b/src/libnmt-newt/nmt-newt-checkbox.c
@@ -21,7 +21,7 @@ G_DEFINE_TYPE(NmtNewtCheckbox, nmt_newt_checkbox, NMT_TYPE_NEWT_COMPONENT)
     (G_TYPE_INSTANCE_GET_PRIVATE((o), NMT_TYPE_NEWT_CHECKBOX, NmtNewtCheckboxPrivate))
 
 typedef struct {
-    char *   label_lc;
+    char    *label_lc;
     gboolean active;
 } NmtNewtCheckboxPrivate;
 
@@ -139,12 +139,12 @@ nmt_newt_checkbox_build_component(NmtNewtComponent *component, gboolean sensitiv
 }
 
 static void
-nmt_newt_checkbox_set_property(GObject *     object,
+nmt_newt_checkbox_set_property(GObject      *object,
                                guint         prop_id,
                                const GValue *value,
-                               GParamSpec *  pspec)
+                               GParamSpec   *pspec)
 {
-    NmtNewtCheckbox *       checkbox = NMT_NEWT_CHECKBOX(object);
+    NmtNewtCheckbox        *checkbox = NMT_NEWT_CHECKBOX(object);
     NmtNewtCheckboxPrivate *priv     = NMT_NEWT_CHECKBOX_GET_PRIVATE(object);
 
     switch (prop_id) {
@@ -182,7 +182,7 @@ nmt_newt_checkbox_get_property(GObject *object, guint prop_id, GValue *value, GP
 static void
 nmt_newt_checkbox_class_init(NmtNewtCheckboxClass *checkbox_class)
 {
-    GObjectClass *         object_class    = G_OBJECT_CLASS(checkbox_class);
+    GObjectClass          *object_class    = G_OBJECT_CLASS(checkbox_class);
     NmtNewtComponentClass *component_class = NMT_NEWT_COMPONENT_CLASS(checkbox_class);
 
     g_type_class_add_private(checkbox_class, sizeof(NmtNewtCheckboxPrivate));
diff --git a/src/libnmt-newt/nmt-newt-component.c b/src/libnmt-newt/nmt-newt-component.c
index 8d7a9005..d3cb12c6 100644
--- a/src/libnmt-newt/nmt-newt-component.c
+++ b/src/libnmt-newt/nmt-newt-component.c
@@ -89,7 +89,7 @@ static newtComponent *
 nmt_newt_component_get_components(NmtNewtWidget *widget)
 {
     NmtNewtComponentPrivate *priv = NMT_NEWT_COMPONENT_GET_PRIVATE(widget);
-    newtComponent *          cos;
+    newtComponent           *cos;
 
     priv->own_component = FALSE;
     cos                 = g_new0(newtComponent, 2);
@@ -209,10 +209,10 @@ nmt_newt_component_set_sensitive(NmtNewtComponent *component, gboolean sensitive
 }
 
 static void
-nmt_newt_component_set_property(GObject *     object,
+nmt_newt_component_set_property(GObject      *object,
                                 guint         prop_id,
                                 const GValue *value,
-                                GParamSpec *  pspec)
+                                GParamSpec   *pspec)
 {
     NmtNewtComponent *component = NMT_NEWT_COMPONENT(object);
 
@@ -247,7 +247,7 @@ nmt_newt_component_get_property(GObject *object, guint prop_id, GValue *value, G
 static void
 nmt_newt_component_class_init(NmtNewtComponentClass *component_class)
 {
-    GObjectClass *      object_class = G_OBJECT_CLASS(component_class);
+    GObjectClass       *object_class = G_OBJECT_CLASS(component_class);
     NmtNewtWidgetClass *widget_class = NMT_NEWT_WIDGET_CLASS(component_class);
 
     g_type_class_add_private(component_class, sizeof(NmtNewtComponentPrivate));
diff --git a/src/libnmt-newt/nmt-newt-container.c b/src/libnmt-newt/nmt-newt-container.c
index 4cc8db24..65e0a644 100644
--- a/src/libnmt-newt/nmt-newt-container.c
+++ b/src/libnmt-newt/nmt-newt-container.c
@@ -42,7 +42,7 @@ nmt_newt_container_init(NmtNewtContainer *container)
 static void
 nmt_newt_container_finalize(GObject *object)
 {
-    NmtNewtContainer *       container = NMT_NEWT_CONTAINER(object);
+    NmtNewtContainer        *container = NMT_NEWT_CONTAINER(object);
     NmtNewtContainerPrivate *priv      = NMT_NEWT_CONTAINER_GET_PRIVATE(object);
 
     while (priv->children->len)
@@ -178,7 +178,7 @@ static NmtNewtWidget *
 nmt_newt_container_find_component(NmtNewtWidget *widget, newtComponent co)
 {
     NmtNewtContainerPrivate *priv = NMT_NEWT_CONTAINER_GET_PRIVATE(widget);
-    NmtNewtWidget *          found, *child;
+    NmtNewtWidget           *found, *child;
     int                      i;
 
     for (i = 0; i < priv->children->len; i++) {
@@ -204,7 +204,7 @@ GSList *
 nmt_newt_container_get_children(NmtNewtContainer *container)
 {
     NmtNewtContainerPrivate *priv = NMT_NEWT_CONTAINER_GET_PRIVATE(container);
-    GSList *                 ret;
+    GSList                  *ret;
     int                      i;
 
     for (i = 0, ret = NULL; i < priv->children->len; i++)
@@ -215,7 +215,7 @@ nmt_newt_container_get_children(NmtNewtContainer *container)
 static void
 nmt_newt_container_class_init(NmtNewtContainerClass *container_class)
 {
-    GObjectClass *      object_class = G_OBJECT_CLASS(container_class);
+    GObjectClass       *object_class = G_OBJECT_CLASS(container_class);
     NmtNewtWidgetClass *widget_class = NMT_NEWT_WIDGET_CLASS(container_class);
 
     g_type_class_add_private(container_class, sizeof(NmtNewtContainerPrivate));
diff --git a/src/libnmt-newt/nmt-newt-entry-numeric.c b/src/libnmt-newt/nmt-newt-entry-numeric.c
index 7e8edd6c..829eac11 100644
--- a/src/libnmt-newt/nmt-newt-entry-numeric.c
+++ b/src/libnmt-newt/nmt-newt-entry-numeric.c
@@ -84,7 +84,7 @@ nmt_newt_entry_numeric_new_full(int width, gint64 min, gint64 max, gboolean opti
 
 static gboolean
 newt_entry_numeric_filter(NmtNewtEntry *entry,
-                          const char *  text,
+                          const char   *text,
                           int           ch,
                           int           position,
                           gpointer      user_data)
@@ -136,10 +136,10 @@ nmt_newt_entry_numeric_constructed(GObject *object)
 }
 
 static void
-nmt_newt_entry_numeric_set_property(GObject *     object,
+nmt_newt_entry_numeric_set_property(GObject      *object,
                                     guint         prop_id,
                                     const GValue *value,
-                                    GParamSpec *  pspec)
+                                    GParamSpec   *pspec)
 {
     NmtNewtEntryNumericPrivate *priv = NMT_NEWT_ENTRY_NUMERIC_GET_PRIVATE(object);
 
@@ -160,9 +160,9 @@ nmt_newt_entry_numeric_set_property(GObject *     object,
 }
 
 static void
-nmt_newt_entry_numeric_get_property(GObject *   object,
+nmt_newt_entry_numeric_get_property(GObject    *object,
                                     guint       prop_id,
-                                    GValue *    value,
+                                    GValue     *value,
                                     GParamSpec *pspec)
 {
     NmtNewtEntryNumericPrivate *priv = NMT_NEWT_ENTRY_NUMERIC_GET_PRIVATE(object);
diff --git a/src/libnmt-newt/nmt-newt-entry.c b/src/libnmt-newt/nmt-newt-entry.c
index 76a96df2..3b0a21be 100644
--- a/src/libnmt-newt/nmt-newt-entry.c
+++ b/src/libnmt-newt/nmt-newt-entry.c
@@ -28,7 +28,7 @@ G_DEFINE_TYPE(NmtNewtEntry, nmt_newt_entry, NMT_TYPE_NEWT_COMPONENT)
 typedef struct {
     int               width;
     NmtNewtEntryFlags flags;
-    char *            text;
+    char             *text;
     int               last_cursor_pos;
     guint             idle_update;
 
@@ -150,7 +150,7 @@ nmt_newt_entry_check_valid(NmtNewtEntry *entry)
  * will not be considered #NmtNewtWidget:valid.
  */
 void
-nmt_newt_entry_set_validator(NmtNewtEntry *        entry,
+nmt_newt_entry_set_validator(NmtNewtEntry         *entry,
                              NmtNewtEntryValidator validator,
                              gpointer              user_data)
 {
@@ -296,7 +296,7 @@ idle_update_entry(gpointer entry)
 {
     NmtNewtEntryPrivate *priv = NMT_NEWT_ENTRY_GET_PRIVATE(entry);
     newtComponent        co   = nmt_newt_component_get_component(entry);
-    char *               text;
+    char                *text;
 
     priv->idle_update = 0;
     if (!co)
@@ -351,7 +351,7 @@ nmt_newt_entry_build_component(NmtNewtComponent *component, gboolean sensitive)
 {
     NmtNewtEntryPrivate *priv = NMT_NEWT_ENTRY_GET_PRIVATE(component);
     newtComponent        co;
-    char *               text_lc;
+    char                *text_lc;
     int                  flags;
 
     flags = convert_flags(priv->flags);
@@ -385,7 +385,7 @@ nmt_newt_entry_activated(NmtNewtWidget *widget)
 static void
 nmt_newt_entry_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
 {
-    NmtNewtEntry *       entry = NMT_NEWT_ENTRY(object);
+    NmtNewtEntry        *entry = NMT_NEWT_ENTRY(object);
     NmtNewtEntryPrivate *priv  = NMT_NEWT_ENTRY_GET_PRIVATE(entry);
 
     switch (prop_id) {
@@ -415,7 +415,7 @@ nmt_newt_entry_set_property(GObject *object, guint prop_id, const GValue *value,
 static void
 nmt_newt_entry_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 {
-    NmtNewtEntry *       entry = NMT_NEWT_ENTRY(object);
+    NmtNewtEntry        *entry = NMT_NEWT_ENTRY(object);
     NmtNewtEntryPrivate *priv  = NMT_NEWT_ENTRY_GET_PRIVATE(entry);
 
     switch (prop_id) {
@@ -440,8 +440,8 @@ nmt_newt_entry_get_property(GObject *object, guint prop_id, GValue *value, GPara
 static void
 nmt_newt_entry_class_init(NmtNewtEntryClass *entry_class)
 {
-    GObjectClass *         object_class    = G_OBJECT_CLASS(entry_class);
-    NmtNewtWidgetClass *   widget_class    = NMT_NEWT_WIDGET_CLASS(entry_class);
+    GObjectClass          *object_class    = G_OBJECT_CLASS(entry_class);
+    NmtNewtWidgetClass    *widget_class    = NMT_NEWT_WIDGET_CLASS(entry_class);
     NmtNewtComponentClass *component_class = NMT_NEWT_COMPONENT_CLASS(entry_class);
 
     g_type_class_add_private(entry_class, sizeof(NmtNewtEntryPrivate));
diff --git a/src/libnmt-newt/nmt-newt-entry.h b/src/libnmt-newt/nmt-newt-entry.h
index da1a9aee..81221812 100644
--- a/src/libnmt-newt/nmt-newt-entry.h
+++ b/src/libnmt-newt/nmt-newt-entry.h
@@ -41,7 +41,7 @@ typedef enum {
 NmtNewtWidget *nmt_newt_entry_new(int width, NmtNewtEntryFlags flags);
 
 void nmt_newt_entry_set_filter(NmtNewtEntry *entry, NmtNewtEntryFilter filter, gpointer user_data);
-void nmt_newt_entry_set_validator(NmtNewtEntry *        entry,
+void nmt_newt_entry_set_validator(NmtNewtEntry         *entry,
                                   NmtNewtEntryValidator validator,
                                   gpointer              user_data);
 
diff --git a/src/libnmt-newt/nmt-newt-form.c b/src/libnmt-newt/nmt-newt-form.c
index 825f7cfe..7d28c80e 100644
--- a/src/libnmt-newt/nmt-newt-form.c
+++ b/src/libnmt-newt/nmt-newt-form.c
@@ -34,7 +34,7 @@ typedef struct {
     guint    padding;
     gboolean fixed_x, fixed_y;
     gboolean fixed_width, fixed_height;
-    char *   title_lc;
+    char    *title_lc;
 
     gboolean       dirty, escape_exits;
     NmtNewtWidget *focus;
@@ -137,7 +137,7 @@ nmt_newt_form_needs_rebuild(NmtNewtWidget *widget)
 static void
 nmt_newt_form_remove(NmtNewtContainer *container, NmtNewtWidget *widget)
 {
-    NmtNewtFormPrivate *   priv         = NMT_NEWT_FORM_GET_PRIVATE(container);
+    NmtNewtFormPrivate    *priv         = NMT_NEWT_FORM_GET_PRIVATE(container);
     NmtNewtContainerClass *parent_class = NMT_NEWT_CONTAINER_CLASS(nmt_newt_form_parent_class);
 
     g_return_if_fail(widget == priv->content);
@@ -156,7 +156,7 @@ nmt_newt_form_remove(NmtNewtContainer *container, NmtNewtWidget *widget)
 void
 nmt_newt_form_set_content(NmtNewtForm *form, NmtNewtWidget *content)
 {
-    NmtNewtFormPrivate *   priv         = NMT_NEWT_FORM_GET_PRIVATE(form);
+    NmtNewtFormPrivate    *priv         = NMT_NEWT_FORM_GET_PRIVATE(form);
     NmtNewtContainerClass *parent_class = NMT_NEWT_CONTAINER_CLASS(nmt_newt_form_parent_class);
 
     if (priv->content)
@@ -173,7 +173,7 @@ nmt_newt_form_build(NmtNewtForm *form)
 {
     NmtNewtFormPrivate *priv = NMT_NEWT_FORM_GET_PRIVATE(form);
     int                 screen_height, screen_width, form_height, form_width;
-    newtComponent *     cos;
+    newtComponent      *cos;
     int                 i;
 
     priv->dirty = FALSE;
@@ -260,8 +260,8 @@ nmt_newt_form_destroy(NmtNewtForm *form)
 static void
 nmt_newt_form_iterate(NmtNewtForm *form)
 {
-    NmtNewtFormPrivate *  priv = NMT_NEWT_FORM_GET_PRIVATE(form);
-    NmtNewtWidget *       focus;
+    NmtNewtFormPrivate   *priv = NMT_NEWT_FORM_GET_PRIVATE(form);
+    NmtNewtWidget        *focus;
     struct newtExitStruct es;
 
     if (priv->dirty) {
@@ -301,7 +301,7 @@ nmt_newt_form_iterate(NmtNewtForm *form)
  * nmt_newt_form_keypress_callback() iterates the top-most form, so it can
  * process the keypress.
  */
-static GSList * form_stack;
+static GSList  *form_stack;
 static GSource *keypress_source;
 
 static gboolean
@@ -552,9 +552,9 @@ nmt_newt_form_get_property(GObject *object, guint prop_id, GValue *value, GParam
 static void
 nmt_newt_form_class_init(NmtNewtFormClass *form_class)
 {
-    GObjectClass *         object_class    = G_OBJECT_CLASS(form_class);
+    GObjectClass          *object_class    = G_OBJECT_CLASS(form_class);
     NmtNewtContainerClass *container_class = NMT_NEWT_CONTAINER_CLASS(form_class);
-    NmtNewtWidgetClass *   widget_class    = NMT_NEWT_WIDGET_CLASS(form_class);
+    NmtNewtWidgetClass    *widget_class    = NMT_NEWT_WIDGET_CLASS(form_class);
 
     g_type_class_add_private(form_class, sizeof(NmtNewtFormPrivate));
 
diff --git a/src/libnmt-newt/nmt-newt-grid.c b/src/libnmt-newt/nmt-newt-grid.c
index a68a496b..1078723d 100644
--- a/src/libnmt-newt/nmt-newt-grid.c
+++ b/src/libnmt-newt/nmt-newt-grid.c
@@ -37,16 +37,16 @@ G_DEFINE_TYPE(NmtNewtGrid, nmt_newt_grid, NMT_TYPE_NEWT_CONTAINER)
     (G_TYPE_INSTANCE_GET_PRIVATE((o), NMT_TYPE_NEWT_GRID, NmtNewtGridPrivate))
 
 typedef struct {
-    NmtNewtWidget *  widget;
+    NmtNewtWidget   *widget;
     int              x, y;
     NmtNewtGridFlags flags;
     int              req_height, req_width;
 } NmtNewtGridChild;
 
 typedef struct {
-    GArray *  children;
+    GArray   *children;
     int       max_x, max_y;
-    int *     row_heights, *col_widths;
+    int      *row_heights, *col_widths;
     gboolean *expand_rows, *expand_cols;
     int       n_expand_rows, n_expand_cols;
     int       req_height, req_width;
@@ -103,9 +103,9 @@ static newtComponent *
 nmt_newt_grid_get_components(NmtNewtWidget *widget)
 {
     NmtNewtGridPrivate *priv = NMT_NEWT_GRID_GET_PRIVATE(widget);
-    NmtNewtGridChild *  children;
-    GPtrArray *         cos;
-    newtComponent *     child_cos;
+    NmtNewtGridChild   *children;
+    GPtrArray          *cos;
+    newtComponent      *child_cos;
     int                 i, c;
 
     g_array_sort(priv->children, child_sort_func);
@@ -130,9 +130,9 @@ nmt_newt_grid_get_components(NmtNewtWidget *widget)
 static void
 nmt_newt_grid_size_request(NmtNewtWidget *widget, int *width, int *height)
 {
-    NmtNewtGrid *       grid     = NMT_NEWT_GRID(widget);
+    NmtNewtGrid        *grid     = NMT_NEWT_GRID(widget);
     NmtNewtGridPrivate *priv     = NMT_NEWT_GRID_GET_PRIVATE(grid);
-    NmtNewtGridChild *  children = (NmtNewtGridChild *) priv->children->data;
+    NmtNewtGridChild   *children = (NmtNewtGridChild *) priv->children->data;
     int                 row, col, i;
 
     g_free(priv->row_heights);
@@ -190,7 +190,7 @@ static void
 nmt_newt_grid_size_allocate(NmtNewtWidget *widget, int x, int y, int width, int height)
 {
     NmtNewtGridPrivate *priv     = NMT_NEWT_GRID_GET_PRIVATE(widget);
-    NmtNewtGridChild *  children = (NmtNewtGridChild *) priv->children->data, *child;
+    NmtNewtGridChild   *children = (NmtNewtGridChild *) priv->children->data, *child;
     int                 i, row, col;
     int                 child_x, child_y, child_width, child_height;
     int                 extra, extra_all, extra_some;
@@ -268,7 +268,7 @@ static void
 nmt_newt_grid_find_size(NmtNewtGrid *grid)
 {
     NmtNewtGridPrivate *priv     = NMT_NEWT_GRID_GET_PRIVATE(grid);
-    NmtNewtGridChild *  children = (NmtNewtGridChild *) priv->children->data;
+    NmtNewtGridChild   *children = (NmtNewtGridChild *) priv->children->data;
     int                 i;
 
     priv->max_x = priv->max_y = 0;
@@ -315,7 +315,7 @@ static int
 find_child(NmtNewtGrid *grid, NmtNewtWidget *widget)
 {
     NmtNewtGridPrivate *priv     = NMT_NEWT_GRID_GET_PRIVATE(grid);
-    NmtNewtGridChild *  children = (NmtNewtGridChild *) priv->children->data;
+    NmtNewtGridChild   *children = (NmtNewtGridChild *) priv->children->data;
     int                 i;
 
     for (i = 0; i < priv->children->len; i++) {
@@ -329,7 +329,7 @@ find_child(NmtNewtGrid *grid, NmtNewtWidget *widget)
 static void
 nmt_newt_grid_remove(NmtNewtContainer *container, NmtNewtWidget *widget)
 {
-    NmtNewtGrid *       grid = NMT_NEWT_GRID(container);
+    NmtNewtGrid        *grid = NMT_NEWT_GRID(container);
     NmtNewtGridPrivate *priv = NMT_NEWT_GRID_GET_PRIVATE(grid);
     int                 i;
 
@@ -355,7 +355,7 @@ void
 nmt_newt_grid_move(NmtNewtGrid *grid, NmtNewtWidget *widget, int x, int y)
 {
     NmtNewtGridPrivate *priv     = NMT_NEWT_GRID_GET_PRIVATE(grid);
-    NmtNewtGridChild *  children = (NmtNewtGridChild *) priv->children->data;
+    NmtNewtGridChild   *children = (NmtNewtGridChild *) priv->children->data;
     int                 i;
 
     i = find_child(grid, widget);
@@ -411,7 +411,7 @@ void
 nmt_newt_grid_set_flags(NmtNewtGrid *grid, NmtNewtWidget *widget, NmtNewtGridFlags flags)
 {
     NmtNewtGridPrivate *priv     = NMT_NEWT_GRID_GET_PRIVATE(grid);
-    NmtNewtGridChild *  children = (NmtNewtGridChild *) priv->children->data;
+    NmtNewtGridChild   *children = (NmtNewtGridChild *) priv->children->data;
     int                 i;
 
     i = find_child(grid, widget);
@@ -422,8 +422,8 @@ nmt_newt_grid_set_flags(NmtNewtGrid *grid, NmtNewtWidget *widget, NmtNewtGridFla
 static void
 nmt_newt_grid_class_init(NmtNewtGridClass *grid_class)
 {
-    GObjectClass *         object_class    = G_OBJECT_CLASS(grid_class);
-    NmtNewtWidgetClass *   widget_class    = NMT_NEWT_WIDGET_CLASS(grid_class);
+    GObjectClass          *object_class    = G_OBJECT_CLASS(grid_class);
+    NmtNewtWidgetClass    *widget_class    = NMT_NEWT_WIDGET_CLASS(grid_class);
     NmtNewtContainerClass *container_class = NMT_NEWT_CONTAINER_CLASS(grid_class);
 
     g_type_class_add_private(grid_class, sizeof(NmtNewtGridPrivate));
diff --git a/src/libnmt-newt/nmt-newt-hacks.c b/src/libnmt-newt/nmt-newt-hacks.c
index 40114a29..a4539ed5 100644
--- a/src/libnmt-newt/nmt-newt-hacks.c
+++ b/src/libnmt-newt/nmt-newt-hacks.c
@@ -25,10 +25,10 @@ struct newtComponent_0_52_15_struct_hack {
     struct componentOps *ops;
 
     newtCallback callback;
-    void *       callbackData;
+    void        *callbackData;
 
     newtCallback destroyCallback;
-    void *       destroyCallbackData;
+    void        *destroyCallbackData;
 
     void *data;
 };
@@ -57,7 +57,7 @@ newtComponentGetPosition(newtComponent component, int *left, int *top)
 #ifndef HAVE_NEWTENTRYGETCURSORPOSITION
 struct newtEntry_0_52_15_struct_hack {
     int          flags;
-    char *       buf;
+    char        *buf;
     const char **resultPtr;
     int          bufAlloced;
     int          bufUsed;
@@ -69,7 +69,7 @@ int
 newtEntryGetCursorPosition(newtComponent component)
 {
     struct newtComponent_0_52_15_struct_hack *co_hack    = (void *) component;
-    struct newtEntry_0_52_15_struct_hack *    entry_hack = co_hack->data;
+    struct newtEntry_0_52_15_struct_hack     *entry_hack = co_hack->data;
 
     return entry_hack->cursorPosition;
 }
@@ -78,7 +78,7 @@ void
 newtEntrySetCursorPosition(newtComponent component, int position)
 {
     struct newtComponent_0_52_15_struct_hack *co_hack    = (void *) component;
-    struct newtEntry_0_52_15_struct_hack *    entry_hack = co_hack->data;
+    struct newtEntry_0_52_15_struct_hack     *entry_hack = co_hack->data;
 
     entry_hack->cursorPosition = position;
 }
diff --git a/src/libnmt-newt/nmt-newt-label.c b/src/libnmt-newt/nmt-newt-label.c
index 32c7809d..f823b9b2 100644
--- a/src/libnmt-newt/nmt-newt-label.c
+++ b/src/libnmt-newt/nmt-newt-label.c
@@ -24,7 +24,7 @@ G_DEFINE_TYPE(NmtNewtLabel, nmt_newt_label, NMT_TYPE_NEWT_COMPONENT)
     (G_TYPE_INSTANCE_GET_PRIVATE((o), NMT_TYPE_NEWT_LABEL, NmtNewtLabelPrivate))
 
 typedef struct {
-    char *            text;
+    char             *text;
     NmtNewtLabelStyle style;
     gboolean          highlight;
 } NmtNewtLabelPrivate;
@@ -193,7 +193,7 @@ nmt_newt_label_build_component(NmtNewtComponent *component, gboolean sensitive)
 {
     NmtNewtLabelPrivate *priv = NMT_NEWT_LABEL_GET_PRIVATE(component);
     newtComponent        co;
-    char *               text_lc;
+    char                *text_lc;
 
     text_lc = nmt_newt_locale_from_utf8(priv->text);
     co      = newtLabel(-1, -1, text_lc);
@@ -252,7 +252,7 @@ nmt_newt_label_get_property(GObject *object, guint prop_id, GValue *value, GPara
 static void
 nmt_newt_label_class_init(NmtNewtLabelClass *label_class)
 {
-    GObjectClass *         object_class    = G_OBJECT_CLASS(label_class);
+    GObjectClass          *object_class    = G_OBJECT_CLASS(label_class);
     NmtNewtComponentClass *component_class = NMT_NEWT_COMPONENT_CLASS(label_class);
 
     g_type_class_add_private(label_class, sizeof(NmtNewtLabelPrivate));
diff --git a/src/libnmt-newt/nmt-newt-listbox.c b/src/libnmt-newt/nmt-newt-listbox.c
index cfe23647..96e04c15 100644
--- a/src/libnmt-newt/nmt-newt-listbox.c
+++ b/src/libnmt-newt/nmt-newt-listbox.c
@@ -307,7 +307,7 @@ update_active_internal(NmtNewtListbox *listbox, int new_active)
 static void
 selection_changed_callback(newtComponent co, void *user_data)
 {
-    NmtNewtListbox *       listbox = user_data;
+    NmtNewtListbox        *listbox = user_data;
     NmtNewtListboxPrivate *priv    = NMT_NEWT_LISTBOX_GET_PRIVATE(listbox);
     int                    new_active;
 
@@ -369,12 +369,12 @@ nmt_newt_listbox_activated(NmtNewtWidget *widget)
 }
 
 static void
-nmt_newt_listbox_set_property(GObject *     object,
+nmt_newt_listbox_set_property(GObject      *object,
                               guint         prop_id,
                               const GValue *value,
-                              GParamSpec *  pspec)
+                              GParamSpec   *pspec)
 {
-    NmtNewtListbox *       listbox = NMT_NEWT_LISTBOX(object);
+    NmtNewtListbox        *listbox = NMT_NEWT_LISTBOX(object);
     NmtNewtListboxPrivate *priv    = NMT_NEWT_LISTBOX_GET_PRIVATE(object);
 
     switch (prop_id) {
@@ -430,8 +430,8 @@ nmt_newt_listbox_get_property(GObject *object, guint prop_id, GValue *value, GPa
 static void
 nmt_newt_listbox_class_init(NmtNewtListboxClass *listbox_class)
 {
-    GObjectClass *         object_class    = G_OBJECT_CLASS(listbox_class);
-    NmtNewtWidgetClass *   widget_class    = NMT_NEWT_WIDGET_CLASS(listbox_class);
+    GObjectClass          *object_class    = G_OBJECT_CLASS(listbox_class);
+    NmtNewtWidgetClass    *widget_class    = NMT_NEWT_WIDGET_CLASS(listbox_class);
     NmtNewtComponentClass *component_class = NMT_NEWT_COMPONENT_CLASS(listbox_class);
 
     g_type_class_add_private(listbox_class, sizeof(NmtNewtListboxPrivate));
diff --git a/src/libnmt-newt/nmt-newt-popup.c b/src/libnmt-newt/nmt-newt-popup.c
index 1822c9d9..c62951ca 100644
--- a/src/libnmt-newt/nmt-newt-popup.c
+++ b/src/libnmt-newt/nmt-newt-popup.c
@@ -59,7 +59,7 @@ enum {
 NmtNewtWidget *
 nmt_newt_popup_new(NmtNewtPopupEntry *entries)
 {
-    NmtNewtWidget *      widget;
+    NmtNewtWidget       *widget;
     NmtNewtPopupPrivate *priv;
     int                  i;
 
@@ -107,7 +107,7 @@ static newtComponent
 nmt_newt_popup_build_component(NmtNewtComponent *component, gboolean sensitive)
 {
     NmtNewtPopupPrivate *priv    = NMT_NEWT_POPUP_GET_PRIVATE(component);
-    NmtNewtPopupEntry *  entries = (NmtNewtPopupEntry *) priv->entries->data;
+    NmtNewtPopupEntry   *entries = (NmtNewtPopupEntry *) priv->entries->data;
 
     nmt_newt_button_set_label(NMT_NEWT_BUTTON(component), entries[priv->active].label);
     return NMT_NEWT_COMPONENT_CLASS(nmt_newt_popup_parent_class)
@@ -118,9 +118,9 @@ static void
 nmt_newt_popup_activated(NmtNewtWidget *widget)
 {
     NmtNewtPopupPrivate *priv    = NMT_NEWT_POPUP_GET_PRIVATE(widget);
-    NmtNewtPopupEntry *  entries = (NmtNewtPopupEntry *) priv->entries->data;
-    NmtNewtForm *        form;
-    NmtNewtWidget *      listbox, *ret;
+    NmtNewtPopupEntry   *entries = (NmtNewtPopupEntry *) priv->entries->data;
+    NmtNewtForm         *form;
+    NmtNewtWidget       *listbox, *ret;
     int                  button_x, button_y;
     int                  window_x, window_y;
     int                  list_w, list_h;
@@ -234,7 +234,7 @@ const char *
 nmt_newt_popup_get_active_id(NmtNewtPopup *popup)
 {
     NmtNewtPopupPrivate *priv    = NMT_NEWT_POPUP_GET_PRIVATE(popup);
-    NmtNewtPopupEntry *  entries = (NmtNewtPopupEntry *) priv->entries->data;
+    NmtNewtPopupEntry   *entries = (NmtNewtPopupEntry *) priv->entries->data;
 
     return entries[priv->active].id;
 }
@@ -250,7 +250,7 @@ void
 nmt_newt_popup_set_active_id(NmtNewtPopup *popup, const char *active_id)
 {
     NmtNewtPopupPrivate *priv    = NMT_NEWT_POPUP_GET_PRIVATE(popup);
-    NmtNewtPopupEntry *  entries = (NmtNewtPopupEntry *) priv->entries->data;
+    NmtNewtPopupEntry   *entries = (NmtNewtPopupEntry *) priv->entries->data;
     int                  i;
 
     for (i = 0; i < priv->entries->len; i++) {
@@ -300,8 +300,8 @@ nmt_newt_popup_get_property(GObject *object, guint prop_id, GValue *value, GPara
 static void
 nmt_newt_popup_class_init(NmtNewtPopupClass *popup_class)
 {
-    GObjectClass *         object_class    = G_OBJECT_CLASS(popup_class);
-    NmtNewtWidgetClass *   widget_class    = NMT_NEWT_WIDGET_CLASS(popup_class);
+    GObjectClass          *object_class    = G_OBJECT_CLASS(popup_class);
+    NmtNewtWidgetClass    *widget_class    = NMT_NEWT_WIDGET_CLASS(popup_class);
     NmtNewtComponentClass *component_class = NMT_NEWT_COMPONENT_CLASS(popup_class);
 
     g_type_class_add_private(popup_class, sizeof(NmtNewtPopupPrivate));
diff --git a/src/libnmt-newt/nmt-newt-section.c b/src/libnmt-newt/nmt-newt-section.c
index fa73ea4a..eb551273 100644
--- a/src/libnmt-newt/nmt-newt-section.c
+++ b/src/libnmt-newt/nmt-newt-section.c
@@ -47,7 +47,7 @@ typedef struct {
     NmtNewtWidget *border_open_label;
     NmtNewtWidget *border_closed_label;
     NmtNewtWidget *border_end_label;
-    GPtrArray *    border_line_labels;
+    GPtrArray     *border_line_labels;
 
     gboolean open;
 } NmtNewtSectionPrivate;
@@ -124,7 +124,7 @@ nmt_newt_section_set_header(NmtNewtSection *section, NmtNewtWidget *header)
 {
     NmtNewtSectionPrivate *priv         = NMT_NEWT_SECTION_GET_PRIVATE(section);
     NmtNewtContainerClass *parent_class = NMT_NEWT_CONTAINER_CLASS(nmt_newt_section_parent_class);
-    NmtNewtContainer *     container    = NMT_NEWT_CONTAINER(section);
+    NmtNewtContainer      *container    = NMT_NEWT_CONTAINER(section);
 
     if (priv->header)
         parent_class->remove(container, priv->header);
@@ -160,7 +160,7 @@ nmt_newt_section_set_body(NmtNewtSection *section, NmtNewtWidget *body)
 {
     NmtNewtSectionPrivate *priv         = NMT_NEWT_SECTION_GET_PRIVATE(section);
     NmtNewtContainerClass *parent_class = NMT_NEWT_CONTAINER_CLASS(nmt_newt_section_parent_class);
-    NmtNewtContainer *     container    = NMT_NEWT_CONTAINER(section);
+    NmtNewtContainer      *container    = NMT_NEWT_CONTAINER(section);
 
     if (priv->body)
         parent_class->remove(container, priv->body);
@@ -187,7 +187,7 @@ nmt_newt_section_get_body(NmtNewtSection *section)
 static void
 nmt_newt_section_remove(NmtNewtContainer *container, NmtNewtWidget *widget)
 {
-    NmtNewtSection *       section      = NMT_NEWT_SECTION(container);
+    NmtNewtSection        *section      = NMT_NEWT_SECTION(container);
     NmtNewtSectionPrivate *priv         = NMT_NEWT_SECTION_GET_PRIVATE(section);
     NmtNewtContainerClass *parent_class = NMT_NEWT_CONTAINER_CLASS(nmt_newt_section_parent_class);
 
@@ -205,8 +205,8 @@ static newtComponent *
 nmt_newt_section_get_components(NmtNewtWidget *widget)
 {
     NmtNewtSectionPrivate *priv = NMT_NEWT_SECTION_GET_PRIVATE(widget);
-    newtComponent *        child_cos;
-    GPtrArray *            cos;
+    newtComponent         *child_cos;
+    GPtrArray             *cos;
     int                    i;
 
     g_return_val_if_fail(priv->header != NULL && priv->body != NULL, NULL);
@@ -316,10 +316,10 @@ nmt_newt_section_size_allocate(NmtNewtWidget *widget, int x, int y, int width, i
 }
 
 static void
-nmt_newt_section_set_property(GObject *     object,
+nmt_newt_section_set_property(GObject      *object,
                               guint         prop_id,
                               const GValue *value,
-                              GParamSpec *  pspec)
+                              GParamSpec   *pspec)
 {
     NmtNewtSectionPrivate *priv = NMT_NEWT_SECTION_GET_PRIVATE(object);
 
@@ -359,8 +359,8 @@ nmt_newt_section_get_property(GObject *object, guint prop_id, GValue *value, GPa
 static void
 nmt_newt_section_class_init(NmtNewtSectionClass *section_class)
 {
-    GObjectClass *         object_class    = G_OBJECT_CLASS(section_class);
-    NmtNewtWidgetClass *   widget_class    = NMT_NEWT_WIDGET_CLASS(section_class);
+    GObjectClass          *object_class    = G_OBJECT_CLASS(section_class);
+    NmtNewtWidgetClass    *widget_class    = NMT_NEWT_WIDGET_CLASS(section_class);
     NmtNewtContainerClass *container_class = NMT_NEWT_CONTAINER_CLASS(section_class);
 
     g_type_class_add_private(section_class, sizeof(NmtNewtSectionPrivate));
diff --git a/src/libnmt-newt/nmt-newt-stack.c b/src/libnmt-newt/nmt-newt-stack.c
index e0fdb3b9..bb05e51b 100644
--- a/src/libnmt-newt/nmt-newt-stack.c
+++ b/src/libnmt-newt/nmt-newt-stack.c
@@ -87,7 +87,7 @@ nmt_newt_stack_get_components(NmtNewtWidget *widget)
 static void
 nmt_newt_stack_size_request(NmtNewtWidget *widget, int *width, int *height)
 {
-    NmtNewtStack *       stack = NMT_NEWT_STACK(widget);
+    NmtNewtStack        *stack = NMT_NEWT_STACK(widget);
     NmtNewtStackPrivate *priv  = NMT_NEWT_STACK_GET_PRIVATE(stack);
     int                  i, child_width, child_height;
 
@@ -142,7 +142,7 @@ nmt_newt_stack_add(NmtNewtStack *stack, const char *id, NmtNewtWidget *widget)
 static void
 nmt_newt_stack_remove(NmtNewtContainer *container, NmtNewtWidget *widget)
 {
-    NmtNewtStack *       stack = NMT_NEWT_STACK(container);
+    NmtNewtStack        *stack = NMT_NEWT_STACK(container);
     NmtNewtStackPrivate *priv  = NMT_NEWT_STACK_GET_PRIVATE(stack);
     int                  i;
 
@@ -293,8 +293,8 @@ nmt_newt_stack_get_property(GObject *object, guint prop_id, GValue *value, GPara
 static void
 nmt_newt_stack_class_init(NmtNewtStackClass *stack_class)
 {
-    GObjectClass *         object_class    = G_OBJECT_CLASS(stack_class);
-    NmtNewtWidgetClass *   widget_class    = NMT_NEWT_WIDGET_CLASS(stack_class);
+    GObjectClass          *object_class    = G_OBJECT_CLASS(stack_class);
+    NmtNewtWidgetClass    *widget_class    = NMT_NEWT_WIDGET_CLASS(stack_class);
     NmtNewtContainerClass *container_class = NMT_NEWT_CONTAINER_CLASS(stack_class);
 
     g_type_class_add_private(stack_class, sizeof(NmtNewtStackPrivate));
diff --git a/src/libnmt-newt/nmt-newt-textbox.c b/src/libnmt-newt/nmt-newt-textbox.c
index 128e539b..24aae9f9 100644
--- a/src/libnmt-newt/nmt-newt-textbox.c
+++ b/src/libnmt-newt/nmt-newt-textbox.c
@@ -76,7 +76,7 @@ void
 nmt_newt_textbox_set_text(NmtNewtTextbox *textbox, const char *text)
 {
     NmtNewtTextboxPrivate *priv = NMT_NEWT_TEXTBOX_GET_PRIVATE(textbox);
-    char **                lines;
+    char                 **lines;
     int                    i, width;
 
     if (!text)
@@ -151,8 +151,8 @@ nmt_newt_textbox_build_component(NmtNewtComponent *component, gboolean sensitive
 {
     NmtNewtTextboxPrivate *priv = NMT_NEWT_TEXTBOX_GET_PRIVATE(component);
     newtComponent          co;
-    const char *           text;
-    char *                 text_lc;
+    const char            *text;
+    char                  *text_lc;
 
     text = priv->text;
     if (!*text)
@@ -176,12 +176,12 @@ nmt_newt_textbox_build_component(NmtNewtComponent *component, gboolean sensitive
 }
 
 static void
-nmt_newt_textbox_set_property(GObject *     object,
+nmt_newt_textbox_set_property(GObject      *object,
                               guint         prop_id,
                               const GValue *value,
-                              GParamSpec *  pspec)
+                              GParamSpec   *pspec)
 {
-    NmtNewtTextbox *       textbox = NMT_NEWT_TEXTBOX(object);
+    NmtNewtTextbox        *textbox = NMT_NEWT_TEXTBOX(object);
     NmtNewtTextboxPrivate *priv    = NMT_NEWT_TEXTBOX_GET_PRIVATE(textbox);
 
     switch (prop_id) {
@@ -224,7 +224,7 @@ nmt_newt_textbox_get_property(GObject *object, guint prop_id, GValue *value, GPa
 static void
 nmt_newt_textbox_class_init(NmtNewtTextboxClass *textbox_class)
 {
-    GObjectClass *         object_class    = G_OBJECT_CLASS(textbox_class);
+    GObjectClass          *object_class    = G_OBJECT_CLASS(textbox_class);
     NmtNewtComponentClass *component_class = NMT_NEWT_COMPONENT_CLASS(textbox_class);
 
     g_type_class_add_private(textbox_class, sizeof(NmtNewtTextboxPrivate));
diff --git a/src/libnmt-newt/nmt-newt-toggle-button.c b/src/libnmt-newt/nmt-newt-toggle-button.c
index c48931e5..069dff84 100644
--- a/src/libnmt-newt/nmt-newt-toggle-button.c
+++ b/src/libnmt-newt/nmt-newt-toggle-button.c
@@ -20,7 +20,7 @@ G_DEFINE_TYPE(NmtNewtToggleButton, nmt_newt_toggle_button, NMT_TYPE_NEWT_BUTTON)
     (G_TYPE_INSTANCE_GET_PRIVATE((o), NMT_TYPE_NEWT_TOGGLE_BUTTON, NmtNewtToggleButtonPrivate))
 
 typedef struct {
-    char *   on_label, *off_label;
+    char    *on_label, *off_label;
     gboolean active;
 } NmtNewtToggleButtonPrivate;
 
@@ -115,10 +115,10 @@ nmt_newt_toggle_button_activated(NmtNewtWidget *widget)
 }
 
 static void
-nmt_newt_toggle_button_set_property(GObject *     object,
+nmt_newt_toggle_button_set_property(GObject      *object,
                                     guint         prop_id,
                                     const GValue *value,
-                                    GParamSpec *  pspec)
+                                    GParamSpec   *pspec)
 {
     NmtNewtToggleButtonPrivate *priv = NMT_NEWT_TOGGLE_BUTTON_GET_PRIVATE(object);
 
@@ -146,9 +146,9 @@ nmt_newt_toggle_button_set_property(GObject *     object,
 }
 
 static void
-nmt_newt_toggle_button_get_property(GObject *   object,
+nmt_newt_toggle_button_get_property(GObject    *object,
                                     guint       prop_id,
-                                    GValue *    value,
+                                    GValue     *value,
                                     GParamSpec *pspec)
 {
     NmtNewtToggleButtonPrivate *priv = NMT_NEWT_TOGGLE_BUTTON_GET_PRIVATE(object);
@@ -172,7 +172,7 @@ nmt_newt_toggle_button_get_property(GObject *   object,
 static void
 nmt_newt_toggle_button_class_init(NmtNewtToggleButtonClass *button_class)
 {
-    GObjectClass *      object_class = G_OBJECT_CLASS(button_class);
+    GObjectClass       *object_class = G_OBJECT_CLASS(button_class);
     NmtNewtWidgetClass *widget_class = NMT_NEWT_WIDGET_CLASS(button_class);
 
     g_type_class_add_private(button_class, sizeof(NmtNewtToggleButtonPrivate));
diff --git a/src/libnmt-newt/nmt-newt-utils.c b/src/libnmt-newt/nmt-newt-utils.c
index 99bde747..14825fab 100644
--- a/src/libnmt-newt/nmt-newt-utils.c
+++ b/src/libnmt-newt/nmt-newt-utils.c
@@ -19,13 +19,13 @@
 #include "libnm-glib-aux/nm-io-utils.h"
 
 static void
-nmt_newt_dialog_g_log_handler(const char *   log_domain,
+nmt_newt_dialog_g_log_handler(const char    *log_domain,
                               GLogLevelFlags log_level,
-                              const char *   message,
+                              const char    *message,
                               gpointer       user_data)
 {
-    const char *  level_name;
-    char *        full_message;
+    const char   *level_name;
+    char         *full_message;
     int           screen_width, screen_height;
     newtComponent text, ok, form;
     newtGrid      grid;
@@ -85,9 +85,9 @@ nmt_newt_dialog_g_log_handler(const char *   log_domain,
 }
 
 static void
-nmt_newt_basic_g_log_handler(const char *   log_domain,
+nmt_newt_basic_g_log_handler(const char    *log_domain,
                              GLogLevelFlags log_level,
-                             const char *   message,
+                             const char    *message,
                              gpointer       user_data)
 {
     newtSuspend();
@@ -133,7 +133,7 @@ nmt_newt_parse_colors(const char *s, bool is_newt)
         const char *name;
         const char *fg;
         const char *bg;
-        char *      parsed_s;
+        char       *parsed_s;
 
         parsed_s = (char *) lines[i];
         name     = parsed_s;
@@ -178,7 +178,7 @@ nmt_newt_parse_colors(const char *s, bool is_newt)
 static void
 nmt_newt_init_colors(gboolean is_newt)
 {
-    const char *  colors;
+    const char   *colors;
     gs_free char *file_content = NULL;
 
     colors = getenv(is_newt ? "NEWT_COLORS" : "NMT_NEWT_COLORS");
@@ -257,7 +257,7 @@ void
 nmt_newt_message_dialog(const char *message, ...)
 {
     va_list ap;
-    char *  msg, *msg_lc, *ok_lc;
+    char   *msg, *msg_lc, *ok_lc;
 
     va_start(ap, message);
     msg = g_strdup_vprintf(message, ap);
@@ -288,7 +288,7 @@ int
 nmt_newt_choice_dialog(const char *button1, const char *button2, const char *message, ...)
 {
     va_list ap;
-    char *  msg, *msg_lc, *button1_lc, *button2_lc;
+    char   *msg, *msg_lc, *button1_lc, *button2_lc;
     int     choice;
 
     va_start(ap, message);
@@ -402,10 +402,10 @@ char *
 nmt_newt_edit_string(const char *data)
 {
     gssize  len, nwrote;
-    char *  filename, *argv[3];
+    char   *filename, *argv[3];
     GError *error = NULL;
     int     fd, status;
-    char *  new_data = NULL;
+    char   *new_data = NULL;
 
     fd = g_file_open_tmp("XXXXXX.json", &filename, &error);
     if (fd == -1) {