Merge branch 'dboles/FileDialog_initial-folder_from_initial-file' into 'main'

Fix FileDialog: initial-file doesnʼt set initial-folder

See merge request GNOME/gtk!6137
This commit is contained in:
Matthias Clasen 2023-06-23 01:14:15 +00:00
commit 3e146171cb

View File

@ -703,7 +703,7 @@ gtk_file_dialog_set_initial_file (GtkFileDialog *self,
if (folder == NULL) if (folder == NULL)
goto invalid_file; goto invalid_file;
if (g_set_object (&self->initial_folder, NULL)) if (g_set_object (&self->initial_folder, folder))
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_INITIAL_FOLDER]); g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_INITIAL_FOLDER]);
info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME, 0, NULL, NULL); info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME, 0, NULL, NULL);