filechooserwidget: Move keynav handling to column view

diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 5516d6c438549b10fa4a0d15d724a2b7b915bf08..10c2808cd07d3d60b003dac30a8ac99f9df9001e 100644 (file)
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -6825,9 +6825,9 @@ list_selection_changed (GtkTreeSelection     *selection,
 }
 
 static gboolean
-browse_files_tree_view_keynav_failed_cb (GtkWidget        *widget,
-                                         GtkDirectionType  direction,
-                                         gpointer          user_data)
+browse_files_column_view_keynav_failed_cb (GtkWidget        *widget,
+                                           GtkDirectionType  direction,
+                                           gpointer          user_data)
 {
  GtkFileChooserWidget *impl = user_data;
 
@@ -7509,7 +7509,7 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
   gtk_widget_class_bind_template_callback (widget_class, file_list_query_tooltip_cb);
   gtk_widget_class_bind_template_callback (widget_class, list_row_activated);
   gtk_widget_class_bind_template_callback (widget_class, list_selection_changed);
-  gtk_widget_class_bind_template_callback (widget_class, browse_files_tree_view_keynav_failed_cb);
+  gtk_widget_class_bind_template_callback (widget_class, browse_files_column_view_keynav_failed_cb);
   gtk_widget_class_bind_template_callback (widget_class, filter_combo_changed);
   gtk_widget_class_bind_template_callback (widget_class, path_bar_clicked);
   gtk_widget_class_bind_template_callback (widget_class, places_sidebar_open_location_cb);

diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index 7e18b2ac4700a188b2a2928455795e9605c9b0dd..0b9b7206eabada7f319163fd420184530e572066 100644 (file)
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -141,6 +141,7 @@
                                         <property name="vexpand">1</property>
                                         <child>
                                           <object class="GtkColumnView" id="browse_files_column_view">
+                                            <signal name="keynav-failed" handler="browse_files_column_view_keynav_failed_cb"/>
 
                                             <child>
                                               <object class="GtkColumnViewColumn" id="column_view_name_column">
@@ -372,7 +373,6 @@
                                             </child>
                                             <signal name="query-tooltip" handler="file_list_query_tooltip_cb" swapped="no"/>
                                             <signal name="row-activated" handler="list_row_activated" swapped="no"/>
-                                            <signal name="keynav-failed" handler="browse_files_tree_view_keynav_failed_cb"/>
                                             <child internal-child="selection">
                                               <object class="GtkTreeSelection" id="treeview-selection2">
                                                 <signal name="changed" handler="list_selection_changed" swapped="no"/>