From 22e5e77232a02c8dcdec165d736fed3105bd4c19 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Wed, 13 Feb 2013 15:07:33 -0600 Subject: [PATCH] filechooser: Oops, cancel a file operation that was missing In addition, remove a list of pending_cancellables that was no longer being used. Signed-off-by: Federico Mena Quintero --- gtk/gtkfilechooserdefault.c | 18 ++++++------------ gtk/gtkfilechooserprivate.h | 1 - 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index d8f7ea8d1c..45d53b09cb 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -5720,18 +5720,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) @@ -5772,6 +5760,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 b349b726cd..96329ad7de 100644 --- a/gtk/gtkfilechooserprivate.h +++ b/gtk/gtkfilechooserprivate.h @@ -234,7 +234,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;