diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index eab4200b2e..5ca5ffcd67 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -5576,18 +5576,6 @@ cancel_all_operations (GtkFileChooserDefault *impl) pending_select_files_free (impl); - /* cancel all pending operations */ - if (impl->pending_cancellables) - { - for (l = impl->pending_cancellables; l; l = l->next) - { - GCancellable *cancellable = G_CANCELLABLE (l->data); - g_cancellable_cancel (cancellable); - } - g_slist_free (impl->pending_cancellables); - impl->pending_cancellables = NULL; - } - if (impl->reload_icon_cancellables) { for (l = impl->reload_icon_cancellables; l; l = l->next) @@ -5628,6 +5616,12 @@ cancel_all_operations (GtkFileChooserDefault *impl) impl->should_respond_get_info_cancellable = NULL; } + if (impl->file_exists_get_info_cancellable) + { + g_cancellable_cancel (impl->file_exists_get_info_cancellable); + impl->file_exists_get_info_cancellable = NULL; + } + if (impl->update_from_entry_cancellable) { g_cancellable_cancel (impl->update_from_entry_cancellable); diff --git a/gtk/gtkfilechooserprivate.h b/gtk/gtkfilechooserprivate.h index b4f97e0477..dab74c3bdd 100644 --- a/gtk/gtkfilechooserprivate.h +++ b/gtk/gtkfilechooserprivate.h @@ -233,7 +233,6 @@ struct _GtkFileChooserDefault GCancellable *file_exists_get_info_cancellable; GCancellable *update_from_entry_cancellable; GCancellable *shortcuts_activate_iter_cancellable; - GSList *pending_cancellables; LoadState load_state; ReloadState reload_state;