From: Timm Bäder <mail@baedert.org>
Date: Fri, 18 Oct 2019 05:23:02 +0000 (+0200)
Subject: filechooserwidget: Rename a callback
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~691
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4826255ea31134ca6af6759f3bcf91e19c62fd32;p=gtk4.git

filechooserwidget: Rename a callback
---

diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index ea3c0e217e..c022c98a7a 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -1364,11 +1364,11 @@ should_trigger_location_entry (GtkFileChooserWidget *impl,
  * pressed.
  */
 static gboolean
-key_press_cb (GtkEventControllerKey *controller,
-              guint                  keyval,
-              guint                  keycode,
-              GdkModifierType        state,
-              gpointer               data)
+treeview_key_press_cb (GtkEventControllerKey *controller,
+                       guint                  keyval,
+                       guint                  keycode,
+                       GdkModifierType        state,
+                       gpointer               data)
 {
   GtkFileChooserWidget *impl = (GtkFileChooserWidget *) data;
   GtkFileChooserWidgetPrivate *priv = gtk_file_chooser_widget_get_instance_private (impl);
@@ -8520,7 +8520,7 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
   gtk_widget_class_bind_template_callback (widget_class, rename_file_end);
   gtk_widget_class_bind_template_callback (widget_class, click_cb);
   gtk_widget_class_bind_template_callback (widget_class, long_press_cb);
-  gtk_widget_class_bind_template_callback (widget_class, key_press_cb);
+  gtk_widget_class_bind_template_callback (widget_class, treeview_key_press_cb);
   gtk_widget_class_bind_template_callback (widget_class, widget_key_press_cb);
 
   gtk_widget_class_set_css_name (widget_class, I_("filechooser"));
diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index 623bd86aec..f5af3532cb 100644
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -153,7 +153,7 @@
                                             </child>
                                             <child>
                                               <object class="GtkEventControllerKey">
-                                                <signal name="key-pressed" handler="key_press_cb" swapped="no"/>
+                                                <signal name="key-pressed" handler="treeview_key_press_cb" swapped="no"/>
                                               </object>
                                             </child>
                                             <signal name="drag-data-received" handler="file_list_drag_data_received_cb" swapped="no"/>