gtk4_squash: misc cleanups in various files

I'm lazy

src/trg-files-tree-view-common.h

@@ -20,6 +20,8 @@
 #ifndef TRG_FILES_TREE_VIEW_COMMON_H_
 #define TRG_FILES_TREE_VIEW_COMMON_H_
 
+#include <gtk/gtk.h>
+
 gboolean trg_files_tree_view_onViewButtonPressed(GtkWidget *w, GdkEventButton *event, gint pri_id,
                                                  gint enabled_id, GCallback rename_cb,
                                                  GCallback low_cb, GCallback normal_cb,

src/trg-persistent-tree-view.c

@@ -336,30 +336,30 @@ static GObject *trg_persistent_tree_view_constructor(GType type, guint n_constru
                  ->constructor(type, n_construct_properties, construct_params);
     TrgPersistentTreeView *ptv = TRG_PERSISTENT_TREE_VIEW(object);
 
-    hbox = trg_hbox_new(FALSE, 0);
+    hbox = trg_hbox_new(FALSE, 4);
 
     w = gtk_button_new_with_label(_("Add"));
     g_signal_connect(w, "clicked", G_CALLBACK(trg_persistent_tree_view_add_cb), object);
-    gtk_box_pack_start(GTK_BOX(hbox), w, FALSE, FALSE, 4);
+    gtk_box_append(GTK_BOX(hbox), w);
 
     w = ptv->delButton = gtk_button_new_with_label(_("Delete"));
     gtk_widget_set_sensitive(w, FALSE);
     g_signal_connect(w, "clicked", G_CALLBACK(trg_persistent_tree_view_del_cb), object);
-    gtk_box_pack_start(GTK_BOX(hbox), w, FALSE, FALSE, 4);
+    gtk_box_append(GTK_BOX(hbox), w);
 
     w = ptv->upButton = gtk_button_new_with_label(_("Up"));
     gtk_widget_set_sensitive(w, FALSE);
     g_signal_connect(w, "clicked", G_CALLBACK(trg_persistent_tree_view_up_cb), object);
-    gtk_box_pack_start(GTK_BOX(hbox), w, FALSE, FALSE, 4);
+    gtk_box_append(GTK_BOX(hbox), w);
 
     w = ptv->downButton = gtk_button_new_with_label(_("Down"));
     gtk_widget_set_sensitive(w, FALSE);
     g_signal_connect(w, "clicked", G_CALLBACK(trg_persistent_tree_view_down_cb), object);
-    gtk_box_pack_start(GTK_BOX(hbox), w, FALSE, FALSE, 4);
+    gtk_box_append(GTK_BOX(hbox), w);
 
     ptv->tv = trg_persistent_tree_view_tree_view_new(TRG_PERSISTENT_TREE_VIEW(object), ptv->model);
-    gtk_box_pack_start(GTK_BOX(object), my_scrolledwin_new(GTK_WIDGET(ptv->tv)), TRUE, TRUE, 4);
-    gtk_box_pack_start(GTK_BOX(object), hbox, FALSE, FALSE, 4);
+    gtk_box_append(GTK_BOX(object), my_scrolledwin_new(GTK_WIDGET(ptv->tv)));
+    gtk_box_append(GTK_BOX(object), hbox);
 
     ptv->wd = trg_pref_widget_desc_new(GTK_WIDGET(ptv->tv), ptv->key, ptv->conf_flags);
     ptv->wd->widget = GTK_WIDGET(object);

src/trg-stats-dialog.c

@@ -95,7 +95,7 @@ static void trg_stats_dialog_set_property(GObject *object, guint property_id, co
 
 static void trg_stats_response_cb(GtkDialog *dlg, gint res_id, gpointer data G_GNUC_UNUSED)
 {
-    gtk_widget_destroy(GTK_WIDGET(dlg));
+    gtk_window_destroy(GTK_WINDOW(dlg));
     instance = NULL;
 }
 
@@ -264,8 +264,6 @@ static GObject *trg_stats_dialog_constructor(GType type, guint n_construct_prope
     gtk_window_set_destroy_with_parent(GTK_WINDOW(obj), TRUE);
     gtk_dialog_add_button(GTK_DIALOG(obj), _("_Close"), GTK_RESPONSE_CLOSE);
 
-    gtk_container_set_border_width(GTK_CONTAINER(obj), GUI_PAD);
-
     gtk_dialog_set_default_response(GTK_DIALOG(obj), GTK_RESPONSE_CLOSE);
 
     g_signal_connect(G_OBJECT(obj), "response", G_CALLBACK(trg_stats_response_cb), NULL);
@@ -289,8 +287,7 @@ static GObject *trg_stats_dialog_constructor(GType type, guint n_construct_prope
 
     gtk_tree_view_set_model(GTK_TREE_VIEW(tv), GTK_TREE_MODEL(dlg->model));
 
-    gtk_container_set_border_width(GTK_CONTAINER(tv), GUI_PAD);
-    gtk_box_pack_start(GTK_BOX(gtk_bin_get_child(GTK_BIN(obj))), tv, TRUE, TRUE, 0);
+    gtk_box_append(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dlg))), tv);
 
     dispatch_rpc_async(dlg->client, session_stats(), on_stats_reply, obj);
 

src/trg-torrent-move-dialog.c

@@ -67,7 +67,8 @@ static void trg_torrent_move_response_cb(GtkDialog *dialog, gint res_id, gpointe
     } else {
         json_array_unref(dlg->ids);
     }
-    gtk_widget_destroy(GTK_WIDGET(dlg));
+
+    g_object_unref(dlg);
 }
 
 static void location_changed(GtkComboBox *w, gpointer data)
@@ -109,13 +110,9 @@ static GObject *trg_torrent_move_dialog_constructor(GType type, guint n_construc
         self->move_button,
         trg_destination_combo_has_text(TRG_DESTINATION_COMBO(self->location_combo)));
 
-    gtk_container_set_border_width(GTK_CONTAINER(object), GUI_PAD);
-
     gtk_dialog_set_default_response(GTK_DIALOG(object), GTK_RESPONSE_ACCEPT);
 
-    gtk_container_set_border_width(GTK_CONTAINER(t), GUI_PAD);
-
-    gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(object))), t, TRUE, TRUE, 0);
+    gtk_box_append(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(object))), t);
 
     count = gtk_tree_selection_count_selected_rows(
         gtk_tree_view_get_selection(GTK_TREE_VIEW(self->treeview)));

src/util.c

@@ -289,11 +289,10 @@ GtkWidget *gtr_combo_box_new_enum(const char *text_1, ...)
 
 GtkWidget *my_scrolledwin_new(GtkWidget *child)
 {
-    GtkWidget *scrolled_win = gtk_scrolled_window_new(NULL, NULL);
+    GtkWidget *scrolled_win = gtk_scrolled_window_new();
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_win), GTK_POLICY_AUTOMATIC,
                                    GTK_POLICY_AUTOMATIC);
-    gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_win), GTK_SHADOW_ETCHED_IN);
-    gtk_container_add(GTK_CONTAINER(scrolled_win), child);
+    gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(scrolled_win), child);
     return scrolled_win;
 }
 
@@ -319,8 +318,8 @@ void trg_error_dialog(GtkWindow *parent, gchar *msg)
     GtkWidget *dialog = gtk_message_dialog_new(parent, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR,
                                                GTK_BUTTONS_OK, "%s", msg);
     gtk_window_set_title(GTK_WINDOW(dialog), _("Error"));
-    gtk_dialog_run(GTK_DIALOG(dialog));
-    gtk_widget_destroy(dialog);
+    g_signal_connect(dialog, "response", G_CALLBACK(gtk_window_destroy), dialog);
+    gtk_window_present(GTK_WINDOW(dialog));
 }
 
 gchar *make_error_message(JsonObject *response, gint status, gchar *err_msg)