From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 6 Jan 2023 13:35:14 +0000 (+0000)
Subject: Merge branch 'drop-file-dialog-shortcuts' into 'main'
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~8^2~95
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=68700f8722c01a53abf3037f97d54989ba0cd540;p=gtk4.git

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

filedialog: Drop shortcut folders

See merge request GNOME/gtk!5396
---

68700f8722c01a53abf3037f97d54989ba0cd540
diff --cc gtk/gtkfiledialog.c
index 6cf4f6bb0b,0c3a75ac7b..84c038c457
--- a/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;