filedialog: Rename :current-filter to :default-filter

The last "current" removed from properties. None of these are current.

diff --git a/demos/gtk-demo/video_player.c b/demos/gtk-demo/video_player.c
index 78e7c69102be4c2540e4e9d52d7bbf98ca4acf41..688f097745d152b0174d6ab2036a88d3c7586065 100644 (file)
--- a/demos/gtk-demo/video_player.c
+++ b/demos/gtk-demo/video_player.c
@@ -56,7 +56,7 @@ open_clicked_cb (GtkWidget *button,
   gtk_file_filter_set_name (filter, "Video");
   g_list_store_append (filters, filter);
 
-  gtk_file_dialog_set_current_filter (dialog, filter);
+  gtk_file_dialog_set_default_filter (dialog, filter);
   g_object_unref (filter);
 
   gtk_file_dialog_set_filters (dialog, G_LIST_MODEL (filters));

diff --git a/gtk/gtkfiledialog.c b/gtk/gtkfiledialog.c
index 9e4d8723f0733c0438e28f3c8bba9c2218e2a7f1..df7b2a202af32450a4d85f9b4c1f2b9c2223f7bb 100644 (file)
--- a/gtk/gtkfiledialog.c
+++ b/gtk/gtkfiledialog.c
@@ -57,7 +57,7 @@ struct _GtkFileDialog
 
   GListModel *filters;
   GListModel *shortcut_folders;
-  GtkFileFilter *current_filter;
+  GtkFileFilter *default_filter;
   GFile *initial_folder;
   char *initial_name;
   GFile *initial_file;
@@ -67,7 +67,7 @@ enum
 {
   PROP_0,
   PROP_ACCEPT_LABEL,
-  PROP_CURRENT_FILTER,
+  PROP_DEFAULT_FILTER,
   PROP_FILTERS,
   PROP_INITIAL_FILE,
   PROP_INITIAL_FOLDER,
@@ -98,7 +98,7 @@ gtk_file_dialog_finalize (GObject *object)
   g_free (self->accept_label);
   g_clear_object (&self->filters);
   g_clear_object (&self->shortcut_folders);
-  g_clear_object (&self->current_filter);
+  g_clear_object (&self->default_filter);
   g_clear_object (&self->initial_folder);
   g_free (self->initial_name);
 
@@ -131,8 +131,8 @@ gtk_file_dialog_get_property (GObject      *object,
       g_value_set_object (value, self->shortcut_folders);
       break;
 
-    case PROP_CURRENT_FILTER:
-      g_value_set_object (value, self->current_filter);
+    case PROP_DEFAULT_FILTER:
+      g_value_set_object (value, self->default_filter);
       break;
 
     case PROP_INITIAL_FILE:
@@ -183,8 +183,8 @@ gtk_file_dialog_set_property (GObject      *object,
       gtk_file_dialog_set_shortcut_folders (self, g_value_get_object (value));
       break;
 
-    case PROP_CURRENT_FILTER:
-      gtk_file_dialog_set_current_filter (self, g_value_get_object (value));
+    case PROP_DEFAULT_FILTER:
+      gtk_file_dialog_set_default_filter (self, g_value_get_object (value));
       break;
 
     case PROP_INITIAL_FILE:
@@ -267,15 +267,15 @@ gtk_file_dialog_class_init (GtkFileDialogClass *class)
                            G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS|G_PARAM_EXPLICIT_NOTIFY);
 
   /**
-   * GtkFileDialog:current-filter: (attributes org.gtk.Property.get=gtk_file_dialog_get_current_filter org.gtk.Property.set=gtk_file_dialog_set_current_filter)
+   * GtkFileDialog:default-filter: (attributes org.gtk.Property.get=gtk_file_dialog_get_default_filter org.gtk.Property.set=gtk_file_dialog_set_default_filter)
    *
-   * The current filter, that is, the filter that is initially
+   * The default filter, that is, the filter that is initially
    * active in the file chooser dialog.
    *
    * Since: 4.10
    */
-  properties[PROP_CURRENT_FILTER] =
-      g_param_spec_object ("current-filter", NULL, NULL,
+  properties[PROP_DEFAULT_FILTER] =
+      g_param_spec_object ("default-filter", NULL, NULL,
                            GTK_TYPE_FILE_FILTER,
                            G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS|G_PARAM_EXPLICIT_NOTIFY);
 
@@ -581,7 +581,7 @@ gtk_file_dialog_set_shortcut_folders (GtkFileDialog *self,
 }
 
 /**
- * gtk_file_dialog_get_current_filter:
+ * gtk_file_dialog_get_default_filter:
  * @self: a `GtkFileDialog`
  *
  * Gets the filter that will be selected by default
@@ -592,34 +592,34 @@ gtk_file_dialog_set_shortcut_folders (GtkFileDialog *self,
  * Since: 4.10
  */
 GtkFileFilter *
-gtk_file_dialog_get_current_filter (GtkFileDialog *self)
+gtk_file_dialog_get_default_filter (GtkFileDialog *self)
 {
   g_return_val_if_fail (GTK_IS_FILE_DIALOG (self), NULL);
 
-  return self->current_filter;
+  return self->default_filter;
 }
 
 /**
- * gtk_file_dialog_set_current_filter:
+ * gtk_file_dialog_set_default_filter:
  * @self: a `GtkFileDialog`
  * @filter: (nullable): a `GtkFileFilter`
  *
- * Sets the filters that will be selected by default
+ * Sets the filter that will be selected by default
  * in the file chooser dialog.
  *
  * Since: 4.10
  */
 void
-gtk_file_dialog_set_current_filter (GtkFileDialog *self,
+gtk_file_dialog_set_default_filter (GtkFileDialog *self,
                                     GtkFileFilter *filter)
 {
   g_return_if_fail (GTK_IS_FILE_DIALOG (self));
   g_return_if_fail (filter == NULL || GTK_IS_FILE_FILTER (filter));
 
-  if (!g_set_object (&self->current_filter, filter))
+  if (!g_set_object (&self->default_filter, filter))
     return;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_CURRENT_FILTER]);
+  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_DEFAULT_FILTER]);
 }
 
 /**
@@ -931,8 +931,8 @@ create_file_chooser (GtkFileDialog        *self,
   gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), select_multiple);
 
   file_chooser_set_filters (GTK_FILE_CHOOSER (chooser), self->filters);
-  if (self->current_filter)
-    gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (chooser), self->current_filter);
+  if (self->default_filter)
+    gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (chooser), self->default_filter);
   file_chooser_set_shortcut_folders (GTK_FILE_CHOOSER (chooser), self->shortcut_folders);
   if (self->initial_folder)
     gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser), self->initial_folder, NULL);

diff --git a/gtk/gtkfiledialog.h b/gtk/gtkfiledialog.h
index 27c0f50abaff2da19b072347207074db852a8f0c..b68ed9914c8506a281f741ce4945184ae4a2e97d 100644 (file)
--- a/gtk/gtkfiledialog.h
+++ b/gtk/gtkfiledialog.h
@@ -58,10 +58,10 @@ void             gtk_file_dialog_set_filters         (GtkFileDialog        *self
                                                       GListModel           *filters);
 
 GDK_AVAILABLE_IN_4_10
-GtkFileFilter *  gtk_file_dialog_get_current_filter  (GtkFileDialog        *self);
+GtkFileFilter *  gtk_file_dialog_get_default_filter  (GtkFileDialog        *self);
 
 GDK_AVAILABLE_IN_4_10
-void             gtk_file_dialog_set_current_filter  (GtkFileDialog        *self,
+void             gtk_file_dialog_set_default_filter  (GtkFileDialog        *self,
                                                       GtkFileFilter        *filter);
 
 GDK_AVAILABLE_IN_4_10