[balsa/gtk4: 64/76] filter-edit-dialog: Delete trailing white space

[Peter Bloomfield <peterb src gnome org>]

commit f770fde525bbd42837c931240bbd402750120596
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Thu Oct 1 12:14:32 2020 -0400

    filter-edit-dialog: Delete trailing white space

 src/filter-edit-dialog.c | 33 ++++++++++-----------------------
 1 file changed, 10 insertions(+), 23 deletions(-)
---
diff --git a/src/filter-edit-dialog.c b/src/filter-edit-dialog.c
index 6a22ff041..eadd02117 100644
--- a/src/filter-edit-dialog.c
+++ b/src/filter-edit-dialog.c
@@ -5,14 +5,14 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option) 
+ * the Free Software Foundation; either version 2, or (at your option)
  * any later version.
- *  
+ *
  * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *  
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
  */
@@ -420,7 +420,7 @@ build_action_page(GtkWindow * window)
     gtk_grid_attach(GTK_GRID(grid), fe_popup_button, 0, 1, 1, 1);
     fe_popup_entry = gtk_entry_new();
     gtk_widget_set_hexpand(fe_popup_entry, TRUE);
-    gtk_entry_set_max_length(GTK_ENTRY(fe_popup_entry), 
+    gtk_entry_set_max_length(GTK_ENTRY(fe_popup_entry),
                              FILTER_EDIT_ENTRY_MAX_LENGTH);
     gtk_grid_attach(GTK_GRID(grid), fe_popup_entry, 1, 1, 1, 1);
     /* fe_popup_entry is initially sensitive, so to be consistent
@@ -570,7 +570,7 @@ filters_edit_dialog(GtkWindow * parent)
                                      gtk_get_current_event_time());
        return;
     }
-    
+
     fe_already_open=TRUE;
 
     piece = build_left_side();
@@ -595,18 +595,6 @@ 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);
@@ -618,7 +606,6 @@ filters_edit_dialog(GtkWindow * parent)
     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));
 
@@ -672,11 +659,11 @@ filters_edit_dialog(GtkWindow * parent)
        fe_collect_user_headers(fil->condition);
 
        cpfil->action=fil->action;
-       if (fil->action_string) 
-            cpfil->action_string=g_strdup(fil->action_string); 
+       if (fil->action_string)
+            cpfil->action_string=g_strdup(fil->action_string);
 
         gtk_list_store_append(GTK_LIST_STORE(model), &iter);
-        gtk_list_store_set(GTK_LIST_STORE(model), &iter, 
+        gtk_list_store_set(GTK_LIST_STORE(model), &iter,
                            0, cpfil->name, 1, cpfil, -1);
     }