[balsa/gtk4: 126/196] Various: Fix some alignment issues

[Peter Bloomfield <peterb src gnome org>]

commit a64777602760181ef8924eae2f6a7ee88084ee95
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Mon Aug 17 14:55:35 2020 -0400

    Various: Fix some alignment issues

 libbalsa/autocrypt.c                     | 1 -
 libbalsa/libbalsa-gpgme-cb.c             | 2 --
 libbalsa/source-viewer.c                 | 1 -
 libinit_balsa/assistant_page_directory.c | 3 ++-
 libinit_balsa/assistant_page_user.c      | 1 +
 src/balsa-message.c                      | 1 -
 6 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/libbalsa/autocrypt.c b/libbalsa/autocrypt.c
index 713b02c07..247d77ee1 100644
--- a/libbalsa/autocrypt.c
+++ b/libbalsa/autocrypt.c
@@ -444,7 +444,6 @@ autocrypt_db_dialog_run(const gchar *date_string, GtkWindow *parent)
 
     label = gtk_label_new(_("Double-click key to show details"));
     gtk_widget_set_halign(label, GTK_ALIGN_START);
-    gtk_widget_set_valign(label, GTK_ALIGN_FILL);
     gtk_container_add(GTK_CONTAINER(vbox), label);
 
     scrolled_window = gtk_scrolled_window_new();
diff --git a/libbalsa/libbalsa-gpgme-cb.c b/libbalsa/libbalsa-gpgme-cb.c
index 5cb077e6f..44fc079bf 100644
--- a/libbalsa/libbalsa-gpgme-cb.c
+++ b/libbalsa/libbalsa-gpgme-cb.c
@@ -219,12 +219,10 @@ lb_gpgme_select_key(const gchar * user_name, lb_key_sel_md_t mode, GList * keys,
        }
     label = libbalsa_create_wrap_label(prompt, FALSE);
     g_free(prompt);
-    gtk_widget_set_valign(label, GTK_ALIGN_FILL);
     gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
     label = gtk_label_new(_("Double-click key to show details"));
     gtk_widget_set_halign(label, GTK_ALIGN_START);
-    gtk_widget_set_valign(label, GTK_ALIGN_FILL);
     gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
     scrolled_window = gtk_scrolled_window_new(NULL, NULL);
diff --git a/libbalsa/source-viewer.c b/libbalsa/source-viewer.c
index 342a6cb32..ee30c4c6b 100644
--- a/libbalsa/source-viewer.c
+++ b/libbalsa/source-viewer.c
@@ -236,7 +236,6 @@ libbalsa_show_message_source(GtkApplication  * application,
 #if HAVE_MACOSX_DESKTOP
     libbalsa_macosx_menu(window, GTK_MENU_SHELL(menu_bar));
 #else
-    gtk_widget_set_valign(menu_bar, GTK_ALIGN_FILL);
     gtk_widget_set_margin_top(menu_bar, 1);
     gtk_widget_set_margin_bottom(menu_bar, 1);
     gtk_box_pack_start(GTK_BOX(vbox), menu_bar, FALSE, FALSE, 0);
diff --git a/libinit_balsa/assistant_page_directory.c b/libinit_balsa/assistant_page_directory.c
index 11f737188..c7e148dda 100644
--- a/libinit_balsa/assistant_page_directory.c
+++ b/libinit_balsa/assistant_page_directory.c
@@ -301,8 +301,9 @@ balsa_druid_page_directory_init(BalsaDruidPageDirectory * dir,
         g_free(preset);
     }
 
+    gtk_widget_set_vexpand(GTK_WIDGET(grid), TRUE);
     gtk_widget_set_valign(GTK_WIDGET(grid), GTK_ALIGN_FILL);
-    gtk_box_pack_start(GTK_BOX(page), GTK_WIDGET(grid), FALSE, FALSE, 0);
+    gtk_container_add(GTK_CONTAINER(page), GTK_WIDGET(grid));
     gtk_widget_show_all(GTK_WIDGET(grid));
 
     gtk_container_add(GTK_CONTAINER(page), verify_button(dir));
diff --git a/libinit_balsa/assistant_page_user.c b/libinit_balsa/assistant_page_user.c
index 09f7bc3a4..e6aef96f4 100644
--- a/libinit_balsa/assistant_page_user.c
+++ b/libinit_balsa/assistant_page_user.c
@@ -87,6 +87,7 @@ balsa_druid_page_user_init(BalsaDruidPageUser * user,
     user->ed4.controller = &(user->econtroller);
     label = GTK_LABEL(gtk_label_new(_(header2)));
     gtk_label_set_line_wrap(label, TRUE);
+    gtk_widget_set_vexpand(GTK_WIDGET(label), TRUE);
     gtk_widget_set_valign(GTK_WIDGET(label), GTK_ALIGN_FILL);
     gtk_box_pack_start(GTK_BOX(page), GTK_WIDGET(label), FALSE, FALSE, 0);
 
diff --git a/src/balsa-message.c b/src/balsa-message.c
index 577827e48..be32586eb 100644
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@ -2300,7 +2300,6 @@ add_part(BalsaMessage * balsa_message, BalsaPartInfo * info, GtkWidget * contain
     if (info->mime_widget == NULL)
        part_info_init(balsa_message, info);
 
-    gtk_widget_set_valign(GTK_WIDGET(info->mime_widget), TRUE);
     gtk_box_pack_start(GTK_BOX(container), GTK_WIDGET(info->mime_widget), FALSE, FALSE, 0);
 
     info_container = balsa_mime_widget_get_container(info->mime_widget);