[balsa/stop-using-gtkbox-child-properties: 2/23] Various: Stop using GtkBox child properties

[Peter Bloomfield <peterb src gnome org>]

commit e41390c59722b01d0e39637113c49130d12b86e9
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sat Jun 6 17:40:54 2020 -0400

    Various: Stop using GtkBox child properties
    
    Stop using GtkBox padding, fill and expand child properties
    
    Apparently, when the child is a GtkScrolledWindow, we must use
    container_add(…) instead of pack_start(…, FALSE, FALSE, 0).
    
    * libbalsa/address.c (libbalsa_address_get_edit_widget):
    * libbalsa/autocrypt.c (autocrypt_db_dialog_run):
    * libbalsa/html.c (libbalsa_html_new):

 ChangeLog            | 8 ++++++++
 libbalsa/address.c   | 6 ++++--
 libbalsa/autocrypt.c | 7 +++++--
 libbalsa/html.c      | 5 ++++-
 4 files changed, 21 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 01e6d80d0..d0b542673 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -205,6 +205,14 @@
        * src/filter-run-dialog.c (balsa_filter_run_dialog_new): call
        prepare-threading to get ready for filtering.
 
+2020-06-06  Peter Bloomfield  <pbloomfield bellsouth net>
+
+       Various: Stop using GtkBox padding, fill and expand child properties
+
+       * libbalsa/address.c (libbalsa_address_get_edit_widget):
+       * libbalsa/autocrypt.c (autocrypt_db_dialog_run):
+       * libbalsa/html.c (libbalsa_html_new):
+
 2020-06-06  Peter Bloomfield  <pbloomfield bellsouth net>
 
        balsa-message: Do not crash
diff --git a/libbalsa/address.c b/libbalsa/address.c
index 59bbb5319..390afe2bd 100644
--- a/libbalsa/address.c
+++ b/libbalsa/address.c
@@ -999,8 +999,10 @@ libbalsa_address_get_edit_widget(LibBalsaAddress *address,
             GtkWidget *tree_view;
 
             entries[cnt] = lba_addr_list_widget(changed_cb, changed_data);
-            gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 1);
-            gtk_box_pack_start(GTK_BOX(box), but,   FALSE, FALSE, 1);
+            g_object_set(label, "margin", 1, NULL);
+            gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 0);
+            g_object_set(but, "margin", 1, NULL);
+            gtk_box_pack_start(GTK_BOX(box), but,   FALSE, FALSE, 0);
             lhs = box;
             tree_view = gtk_bin_get_child(GTK_BIN(entries[cnt]));
             g_signal_connect(but, "clicked", G_CALLBACK(add_row), tree_view);
diff --git a/libbalsa/autocrypt.c b/libbalsa/autocrypt.c
index af081fa83..d8a89d04e 100644
--- a/libbalsa/autocrypt.c
+++ b/libbalsa/autocrypt.c
@@ -441,12 +441,15 @@ autocrypt_db_dialog_run(const gchar *date_string, GtkWindow *parent)
     gtk_widget_set_vexpand (vbox, TRUE);
     label = gtk_label_new(_("Double-click key to show details"));
     gtk_widget_set_halign(label, GTK_ALIGN_START);
-    gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 0);
+    gtk_widget_set_valign(label, GTK_ALIGN_FILL);
+    gtk_container_add(GTK_CONTAINER(vbox), label);
 
     scrolled_window = gtk_scrolled_window_new(NULL, NULL);
     gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window), GTK_SHADOW_ETCHED_IN);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), GTK_POLICY_AUTOMATIC, 
GTK_POLICY_AUTOMATIC);
-    gtk_box_pack_start(GTK_BOX(vbox), scrolled_window, TRUE, TRUE, 0);
+    gtk_widget_set_vexpand(scrolled_window, TRUE);
+    gtk_widget_set_valign(scrolled_window, GTK_ALIGN_FILL);
+    gtk_container_add(GTK_CONTAINER(vbox), scrolled_window);
 
     model = gtk_list_store_new(AC_DB_VIEW_COLUMNS, G_TYPE_STRING,      /* address */
        G_TYPE_STRING,                                                                                        
  /* formatted last seen timestamp */
diff --git a/libbalsa/html.c b/libbalsa/html.c
index 6a0f14fbc..003152f66 100644
--- a/libbalsa/html.c
+++ b/libbalsa/html.c
@@ -765,7 +765,6 @@ libbalsa_html_new(LibBalsaMessageBody * body,
                      G_CALLBACK(lbh_context_menu_cb), info);
 
     vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-    gtk_box_pack_end(GTK_BOX(vbox), GTK_WIDGET(info->web_view), TRUE, TRUE, 0);
 
     /* Simple check for possible resource requests: */
     if (have_src_oth) {
@@ -774,6 +773,10 @@ libbalsa_html_new(LibBalsaMessageBody * body,
         g_debug("%s shows info_bar", __func__);
     }
 
+    gtk_widget_set_vexpand(GTK_WIDGET(info->web_view), TRUE);
+    gtk_widget_set_valign(GTK_WIDGET(info->web_view), GTK_ALIGN_FILL);
+    gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(info->web_view), FALSE, FALSE, 0);
+
     webkit_web_view_load_html(info->web_view, text, NULL);
     g_free(text);