[nautilus/wip/antoniof/gnome-42: 38/72] Revert "general: Prepare for non-GtkBin scrolled window"

[António Fernandes <antoniof src gnome org>]

commit 79d6f8fc1163c149279c02baee6ad629faea1e11
Author: António Fernandes <antoniof gnome org>
Date:   Fri Feb 11 19:01:48 2022 +0000

    Revert "general: Prepare for non-GtkBin scrolled window"
    
    This reverts commit be23d8a316756610dd567dbdb63ae0c6ace9199b.

 src/nautilus-files-view.c           | 2 +-
 src/nautilus-gtk4-helpers.c         | 8 --------
 src/nautilus-gtk4-helpers.h         | 2 +-
 src/nautilus-view-icon-controller.c | 3 +--
 4 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index c607e48a7..b48c3c5dc 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -3124,7 +3124,7 @@ nautilus_files_view_grab_focus (GtkWidget *widget)
 
     view = NAUTILUS_FILES_VIEW (widget);
     priv = nautilus_files_view_get_instance_private (view);
-    child = gtk_scrolled_window_get_child (GTK_SCROLLED_WINDOW (priv->scrolled_window));
+    child = gtk_bin_get_child (GTK_BIN (priv->scrolled_window));
 
     GTK_WIDGET_CLASS (nautilus_files_view_parent_class)->grab_focus (widget);
 
diff --git a/src/nautilus-gtk4-helpers.c b/src/nautilus-gtk4-helpers.c
index 4c3000083..98bea9c06 100644
--- a/src/nautilus-gtk4-helpers.c
+++ b/src/nautilus-gtk4-helpers.c
@@ -124,14 +124,6 @@ gtk_widget_get_first_child (GtkWidget *widget)
     return NULL;
 }
 
-GtkWidget *
-gtk_scrolled_window_get_child (GtkScrolledWindow *scrolled)
-{
-    g_assert (GTK_IS_SCROLLED_WINDOW (scrolled));
-
-    return gtk_bin_get_child (GTK_BIN (scrolled));
-}
-
 GdkDisplay *
 gtk_root_get_display (GtkRoot *root)
 {
diff --git a/src/nautilus-gtk4-helpers.h b/src/nautilus-gtk4-helpers.h
index 925afc338..6763788cb 100644
--- a/src/nautilus-gtk4-helpers.h
+++ b/src/nautilus-gtk4-helpers.h
@@ -32,7 +32,7 @@ void gtk_check_button_set_active   (GtkCheckButton    *button,
 
 gboolean gtk_check_button_get_active (GtkCheckButton  *button);
 GtkWidget *gtk_widget_get_first_child (GtkWidget *widget);
-GtkWidget *gtk_scrolled_window_get_child (GtkScrolledWindow *scrolled);
+
 
 void gtk_style_context_add_provider_for_display    (GdkDisplay       *display,
                                                     GtkStyleProvider *provider,
diff --git a/src/nautilus-view-icon-controller.c b/src/nautilus-view-icon-controller.c
index df4d96f04..d85bb2805 100644
--- a/src/nautilus-view-icon-controller.c
+++ b/src/nautilus-view-icon-controller.c
@@ -1420,8 +1420,7 @@ constructed (GObject *object)
                       (GCallback) on_longpress_gesture_pressed_callback,
                       self);
 
-    gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (content_widget),
-                                   GTK_WIDGET (self->view_ui));
+    gtk_container_add (GTK_CONTAINER (content_widget), GTK_WIDGET (self->view_ui));
 
     self->action_group = nautilus_files_view_get_action_group (NAUTILUS_FILES_VIEW (self));
     g_action_map_add_action_entries (G_ACTION_MAP (self->action_group),