[balsa/gtk4: 61/76] Merge branch 'stop-using-gtkbuttonbox' into stop-using-dialog-run

[Peter Bloomfield <peterb src gnome org>]

commit a969ff2178b30e3b66c53d1a96a563c002cbca4e
Merge: 058278ca0 1e69d674b
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Thu Oct 1 11:48:25 2020 -0400

    Merge branch 'stop-using-gtkbuttonbox' into stop-using-dialog-run

 libbalsa/misc.c                   | 61 +++++++++++++++++++++++++++++++++++++++
 libbalsa/misc.h                   |  4 +++
 src/ab-main.c                     | 19 ++++++------
 src/ab-window.c                   | 11 ++-----
 src/balsa-mime-widget-crypto.c    | 22 +++++---------
 src/balsa-mime-widget-message.c   | 16 +++++-----
 src/balsa-mime-widget-vcalendar.c | 13 +++------
 src/filter-edit-dialog.c          | 45 ++++++++++++++++-------------
 src/filter-run-dialog.c           | 31 +++++++++++++-------
 src/main-window.c                 |  8 ++---
 src/toolbar-prefs.c               |  9 ++----
 11 files changed, 148 insertions(+), 91 deletions(-)
---
diff --cc src/filter-edit-dialog.c
index 4b0cb7092,97f730dd5..6a22ff041
--- a/src/filter-edit-dialog.c
+++ b/src/filter-edit-dialog.c
@@@ -604,16 -595,17 +595,30 @@@ filters_edit_dialog(GtkWindow * parent
  
      /* main hbox */
      hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, FILTER_EDIT_PADDING);
++<<<<<<< HEAD
 +    gtk_widget_set_hexpand(hbox, TRUE);
 +    gtk_widget_set_halign(hbox, GTK_ALIGN_FILL);
 +    gtk_widget_set_margin_start(hbox, FILTER_EDIT_PADDING);
 +    gtk_widget_set_margin_end(hbox, FILTER_EDIT_PADDING);
 +    gtk_container_add(GTK_CONTAINER(content_area), hbox);
 +
 +    gtk_widget_set_margin_start(piece, FILTER_EDIT_PADDING);
 +    gtk_widget_set_margin_end(piece, FILTER_EDIT_PADDING);
 +    gtk_container_add(GTK_CONTAINER(hbox), piece);
 +
++=======
+     gtk_widget_set_vexpand(hbox, TRUE);
+     gtk_widget_set_valign(hbox, GTK_ALIGN_FILL);
+     gtk_widget_set_margin_top(hbox, FILTER_EDIT_PADDING);
+     gtk_widget_set_margin_bottom(hbox, FILTER_EDIT_PADDING);
+     gtk_container_add(GTK_CONTAINER(content_area), hbox);
+ 
+     gtk_widget_set_hexpand(piece, FALSE);
+     gtk_widget_set_margin_start(piece, FILTER_EDIT_PADDING);
+     gtk_widget_set_margin_end(piece, FILTER_EDIT_PADDING);
+     gtk_container_add(GTK_CONTAINER(hbox), piece);
+ 
++>>>>>>> stop-using-gtkbuttonbox
      gtk_container_add(GTK_CONTAINER(hbox),
                        gtk_separator_new(GTK_ORIENTATION_VERTICAL));