[file-roller/wip/gtk4: 42/54] dialogs: fixed padding and removed unused utility function

[Paolo Bacchilega <paobac src gnome org>]

commit 71398a6a86afe03ef2cccb3e806a62f90a5ac914
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sat Oct 1 22:54:50 2022 +0200

    dialogs: fixed padding and removed unused utility function

 src/fr-file-selector-dialog.c |  1 -
 src/fr-new-archive-dialog.c   |  1 -
 src/fr-window.c               |  5 ++++-
 src/gtk-utils.c               | 15 ---------------
 src/gtk-utils.h               |  2 --
 src/ui/progress-dialog.ui     |  3 +++
 6 files changed, 7 insertions(+), 20 deletions(-)
---
diff --git a/src/fr-file-selector-dialog.c b/src/fr-file-selector-dialog.c
index 19c5ee60..811cd9c6 100644
--- a/src/fr-file-selector-dialog.c
+++ b/src/fr-file-selector-dialog.c
@@ -607,7 +607,6 @@ fr_file_selector_dialog_init (FrFileSelectorDialog *self)
        self->action_map = g_simple_action_group_new ();
        self->file_context_menu = GTK_POPOVER (gtk_popover_menu_new_from_model (G_MENU_MODEL 
(gtk_builder_get_object (self->builder, "file_list_context_menu_model"))));
 
-       _gtk_widget_set_margin (GTK_WIDGET (self), 5);
        _gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), GET_WIDGET 
("content"), TRUE, TRUE);
 
        gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (GET_WIDGET ("files_liststore")), 
FILE_LIST_COLUMN_NAME, files_name_column_sort_func, self, NULL);
diff --git a/src/fr-new-archive-dialog.c b/src/fr-new-archive-dialog.c
index 428cd131..d4810bd1 100644
--- a/src/fr-new-archive-dialog.c
+++ b/src/fr-new-archive-dialog.c
@@ -206,7 +206,6 @@ _fr_new_archive_dialog_construct (FrNewArchiveDialog *self,
 
        gtk_window_set_transient_for (GTK_WINDOW (self), parent);
        gtk_window_set_resizable (GTK_WINDOW (self), FALSE);
-       _gtk_widget_set_margin (GTK_WIDGET (self), 5);
 
        self->builder = gtk_builder_new_from_resource (FILE_ROLLER_RESOURCE_UI_PATH "new-archive-dialog.ui");
 
diff --git a/src/fr-window.c b/src/fr-window.c
index f2b4d081..c9b0c04f 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -2385,7 +2385,10 @@ create_the_progress_dialog (FrWindow *window)
                               "use-header-bar", use_header_bar,
                               "default-width", PROGRESS_DIALOG_DEFAULT_WIDTH,
                               NULL);
-       _gtk_dialog_set_content (GTK_DIALOG (dialog), _gtk_builder_get_widget (builder, 
"progress_dialog_content"));
+       _gtk_box_pack_end (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                          _gtk_builder_get_widget (builder, "progress_dialog_content"),
+                          TRUE,
+                          TRUE);
        gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
        gtk_window_set_title (GTK_WINDOW (dialog), title);
        gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
diff --git a/src/gtk-utils.c b/src/gtk-utils.c
index 8fe16c8c..4a4c57c4 100644
--- a/src/gtk-utils.c
+++ b/src/gtk-utils.c
@@ -690,18 +690,3 @@ _gtk_widget_set_margin (GtkWidget *widget, int margin)
        gtk_widget_set_margin_top (widget, margin);
        gtk_widget_set_margin_bottom (widget, margin);
 }
-
-
-#define DIALOG_CONTENT_MARGIN 15
-
-
-void
-_gtk_dialog_set_content (GtkDialog  *dialog,
-                        GtkWidget  *content)
-{
-       _gtk_widget_set_margin (content, DIALOG_CONTENT_MARGIN);
-       _gtk_box_pack_end (GTK_BOX (gtk_dialog_get_content_area (dialog)),
-                          content,
-                          TRUE,
-                          FALSE);
-}
diff --git a/src/gtk-utils.h b/src/gtk-utils.h
index c88a3670..667afbbd 100644
--- a/src/gtk-utils.h
+++ b/src/gtk-utils.h
@@ -112,7 +112,5 @@ void          _gtk_box_pack_end              (GtkBox     *box,
                                              gboolean    vexpand);
 void          _gtk_widget_set_margin         (GtkWidget  *widget,
                                              int         margin);
-void          _gtk_dialog_set_content        (GtkDialog  *dialog,
-                                             GtkWidget  *content);
 
 #endif
diff --git a/src/ui/progress-dialog.ui b/src/ui/progress-dialog.ui
index 5b331621..c49306f9 100644
--- a/src/ui/progress-dialog.ui
+++ b/src/ui/progress-dialog.ui
@@ -4,6 +4,9 @@
   <object class="GtkBox" id="progress_dialog_content">
     <property name="orientation">horizontal</property>
     <property name="spacing">15</property>
+    <style>
+      <class name="dialog-content"/>
+    </style>
     <child>
       <object class="GtkBox" id="box2">
         <property name="orientation">vertical</property>