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

file chooser: Use the right model when getting the selection

Browse Source 
We don't need to make assumptions about which model is currently
used since gtk_tree_selection_get_selection hands us the model.

https://bugzilla.gnome.org/show_bug.cgi?id=761757
This commit is contained in:
Matthias Clasen 2016-02-12 20:35:26 -05:00
parent 4c37719639
commit 811a9b21c1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/gtkfilechooserwidget.c
View File

@ -6266,10 +6266,11 @@ get_selected_file_info_from_file_list (GtkFileChooserWidget *impl,
GtkTreeSelection *selection; GtkTreeSelection *selection;
GtkTreeIter iter; GtkTreeIter iter;
GFileInfo *info; GFileInfo *info;
GtkTreeModel *model;
g_assert (!priv->select_multiple); g_assert (!priv->select_multiple);
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->browse_files_tree_view)); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->browse_files_tree_view));
if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) if (!gtk_tree_selection_get_selected (selection, &model, &iter))
{ {
*had_selection = FALSE; *had_selection = FALSE;
return NULL; return NULL;
@ -6277,7 +6278,7 @@ get_selected_file_info_from_file_list (GtkFileChooserWidget *impl,
*had_selection = TRUE; *had_selection = TRUE;
info = _gtk_file_system_model_get_info (priv->browse_files_model, &iter); info = _gtk_file_system_model_get_info (GTK_FILE_SYSTEM_MODEL (model), &iter);
return info; return info;
} }