callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't do remote checks on NULL files

Browse Source 
Calling _gtk_file_consider_as_remote() with a NULL argument
results in warnings being thrown.

Note that query->priv->location being NULL is a state that does
not seem to be invalid by itself.

This could happen if you do search-as-you-type in a filechooser,
which has a filter that does not match anything *and* the current
"place" selected is "Recent".

https://bugzilla.gnome.org/show_bug.cgi?id=761552
This commit is contained in:
Руслан Ижбулатов
2016-02-04 11:23:12 +00:00
parent 3756d92367
commit 4a49d8d14f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/gtkfilechooserwidget.c
View File

@ -7340,7 +7340,8 @@ search_start_query (GtkFileChooserWidget *impl,
_gtk_search_engine_start (priv->search_engine); _gtk_search_engine_start (priv->search_engine);
if (_gtk_file_consider_as_remote (gtk_query_get_location (priv->search_query))) if (gtk_query_get_location (priv->search_query) &&
_gtk_file_consider_as_remote (gtk_query_get_location (priv->search_query)))
gtk_widget_show (priv->remote_warning_bar); gtk_widget_show (priv->remote_warning_bar);
} }

3
gtk/gtksearchenginesimple.c
View File

@ -92,7 +92,8 @@ static void
queue_if_local (SearchThreadData *data, queue_if_local (SearchThreadData *data,
GFile *file) GFile *file)
{ {
if (!_gtk_file_consider_as_remote (file) && if (file &&
!_gtk_file_consider_as_remote (file) &&
!g_file_has_uri_scheme (file, "recent")) !g_file_has_uri_scheme (file, "recent"))
g_queue_push_tail (data->directories, g_object_ref (file)); g_queue_push_tail (data->directories, g_object_ref (file));
} }