diff options
| author | Руслан Ижбулатов <lrn1986@gmail.com> | 2016-02-04 11:23:12 +0000 |
|---|---|---|
| committer | Руслан Ижбулатов <lrn1986@gmail.com> | 2016-02-04 15:57:35 +0000 |
| commit | 4a49d8d14fa8a3e037364eb231f25c2e8bce0fa5 (patch) | |
| tree | 5a37fc89c13816e7171813cc2053740bfd1b7f95 | |
| parent | 3756d92367c2485c20a9c64d0f95e089bc187a95 (diff) | |
| download | gtk+-4a49d8d14fa8a3e037364eb231f25c2e8bce0fa5.tar.gz | |
Don't do remote checks on NULL files
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
| -rw-r--r-- | gtk/gtkfilechooserwidget.c | 3 | ||||
| -rw-r--r-- | gtk/gtksearchenginesimple.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index d1a2ed8b36..c77a8b7b96 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -7340,7 +7340,8 @@ search_start_query (GtkFileChooserWidget *impl, _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); } diff --git a/gtk/gtksearchenginesimple.c b/gtk/gtksearchenginesimple.c index b80af31b1f..6daf2f8631 100644 --- a/gtk/gtksearchenginesimple.c +++ b/gtk/gtksearchenginesimple.c @@ -92,7 +92,8 @@ static void queue_if_local (SearchThreadData *data, 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_queue_push_tail (data->directories, g_object_ref (file)); } |