Merge branch 'drop-file-dialog-shortcuts' into 'main'

filedialog: Drop shortcut folders

See merge request GNOME/gtk!5396

diff --cc gtk/gtkfiledialog.c
index 6cf4f6bb0b2f856f4bc824a9ff84e68704e61151,0c3a75ac7bb3c6dfe41d4463a5b02937b2d9cde1..84c038c4576283543af8b4aaf8a7662c8d16d3b8
--- 1/gtk/gtkfiledialog.c
--- 2/gtk/gtkfiledialog.c
+++ b/gtk/gtkfiledialog.c
@@@ -956,10 -866,11 +866,9 @@@ create_file_chooser (GtkFileDialo
          }
      }
  
-   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);
 -  if (self->initial_file)
 -    gtk_file_chooser_set_file (GTK_FILE_CHOOSER (chooser), self->initial_file, NULL);
 -  else if (self->initial_name)
 +  if (self->initial_name && action == GTK_FILE_CHOOSER_ACTION_SAVE)
      gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (chooser), self->initial_name);
  
    return chooser;