[nautilus/wip/antoniof/gnome-42: 34/72] Revert "view-icon-controller: Stop using gtk_container_get_focus_child()"




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

    Revert "view-icon-controller: Stop using gtk_container_get_focus_child()"
    
    This reverts commit 8a7f041c8865008ecb959541356b58c257fa9009.

 src/nautilus-gtk4-helpers.c         | 8 --------
 src/nautilus-gtk4-helpers.h         | 1 -
 src/nautilus-view-icon-controller.c | 3 +--
 3 files changed, 1 insertion(+), 11 deletions(-)
---
diff --git a/src/nautilus-gtk4-helpers.c b/src/nautilus-gtk4-helpers.c
index e61cf0611..4c3000083 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_widget_get_focus_child (GtkWidget *widget)
-{
-    g_assert (GTK_IS_CONTAINER (widget));
-
-    return gtk_container_get_focus_child (GTK_CONTAINER (widget));
-}
-
 GtkWidget *
 gtk_scrolled_window_get_child (GtkScrolledWindow *scrolled)
 {
diff --git a/src/nautilus-gtk4-helpers.h b/src/nautilus-gtk4-helpers.h
index cdcb1068f..925afc338 100644
--- a/src/nautilus-gtk4-helpers.h
+++ b/src/nautilus-gtk4-helpers.h
@@ -32,7 +32,6 @@ 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_widget_get_focus_child (GtkWidget *widget);
 GtkWidget *gtk_scrolled_window_get_child (GtkScrolledWindow *scrolled);
 
 void gtk_style_context_add_provider_for_display    (GdkDisplay       *display,
diff --git a/src/nautilus-view-icon-controller.c b/src/nautilus-view-icon-controller.c
index 98599862c..df4d96f04 100644
--- a/src/nautilus-view-icon-controller.c
+++ b/src/nautilus-view-icon-controller.c
@@ -9,7 +9,6 @@
 #include "nautilus-directory.h"
 #include "nautilus-global-preferences.h"
 #include "nautilus-thumbnails.h"
-#include "nautilus-gtk4-helpers.h"
 
 struct _NautilusViewIconController
 {
@@ -719,7 +718,7 @@ real_reveal_for_selection_context_menu (NautilusFilesView *files_view)
 
     /* Get the focused item_ui, if selected.
      * Otherwise, get the selected item_ui which is sorted the lowest.*/
-    item_ui = gtk_widget_get_focus_child (GTK_WIDGET (self->view_ui));
+    item_ui = gtk_container_get_focus_child (GTK_CONTAINER (self->view_ui));
     if (item_ui == NULL || !gtk_flow_box_child_is_selected (GTK_FLOW_BOX_CHILD (item_ui)))
     {
         g_autoptr (GList) list = gtk_flow_box_get_selected_children (self->view_ui);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]