From ed1c349e0b914621a5fc25c6add92a6c8bc2c0b4 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 3 Jul 2015 07:52:39 -0700 Subject: [PATCH] file chooser: Remove a wrong assumption The code for getting the selected files was assuming that we are always in browse mode, and was causing warnings when hitting Ctrl-L twice, right after opening the file chooser. The fix is to simple use the model that is passed into the callback. --- gtk/gtkfilechooserwidget.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index ba65dbf0c0..7ca2282585 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -5320,12 +5320,9 @@ get_files_foreach (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) { - struct get_files_closure *info; + GtkFileSystemModel *fs_model = GTK_FILE_SYSTEM_MODEL (model); + struct get_files_closure *info = data; GFile *file; - GtkFileSystemModel *fs_model; - - info = data; - fs_model = info->impl->priv->browse_files_model; file = _gtk_file_system_model_get_file (fs_model, iter); if (!file)