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

filechooser: Oops, cancel a file operation that was missing

Browse Source 
In addition, remove a list of pending_cancellables that was no longer being used.

Signed-off-by: Federico Mena Quintero <federico@gnome.org>
This commit is contained in:
Federico Mena Quintero 2013-02-13 15:07:33 -06:00
parent 69d844fbbb
commit 22e5e77232
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkfilechooserdefault.c
View File

@ -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);

1
gtk/gtkfilechooserprivate.h
View File

@ -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;