AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'filechooser-multi-folder' into 'main'

Browse Source 
filechooser: Don't assert for possible cases

Closes #5494

See merge request GNOME/gtk!5392
This commit is contained in:
Matthias Clasen 2023-01-05 14:01:35 +00:00
commit 77cf0f1719
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gtk/gtkfilechooserwidget.c
View File

@ -4914,17 +4914,31 @@ gtk_file_chooser_widget_get_shortcut_folders (GtkFileChooser *chooser)
static void
switch_to_selected_folder (GtkFileChooserWidget *impl)
{
GFileInfo *info;
GFile *file;
GtkBitsetIter iter;
GtkBitset *bitset;
unsigned int i;
g_assert (!impl->select_multiple);
g_assert (GTK_IS_SINGLE_SELECTION (impl->selection_model));
bitset = gtk_selection_model_get_selection (impl->selection_model);
info = gtk_single_selection_get_selected_item (GTK_SINGLE_SELECTION (impl->selection_model));
g_assert (info != NULL);
for (gtk_bitset_iter_init_first (&iter, bitset, &i);
gtk_bitset_iter_is_valid (&iter);
gtk_bitset_iter_next (&iter, &i))
{
GFileInfo *info;
file = _gtk_file_info_get_file (info);
change_folder_and_display_error (impl, file, FALSE);
info = g_list_model_get_item (G_LIST_MODEL (impl->selection_model), i);
if (_gtk_file_info_consider_as_directory (info))
{
GFile *file;
file = _gtk_file_info_get_file (info);
change_folder_and_display_error (impl, file, FALSE);
g_object_unref (info);
return;
}
g_clear_object (&info);
}
}
/* Gets the display name of the selected file in the file list; assumes single