[gthumb] save the partial result of a cancelled search as well

[Paolo Bacchilega <paobac src gnome org>]

commit 1288a6045922a72e243b28ca61e58d44b2f3dde8
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sat May 15 23:07:39 2010 +0200

    save the partial result of a cancelled search as well
    
    [bug #617952]

 extensions/search/gth-search-task.c |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/extensions/search/gth-search-task.c b/extensions/search/gth-search-task.c
index efe69c9..c85cba5 100644
--- a/extensions/search/gth-search-task.c
+++ b/extensions/search/gth-search-task.c
@@ -114,9 +114,13 @@ save_search_result_copy_done_cb (void     **buffer,
 {
 	GthSearchTask *task = user_data;
 
-	gth_browser_update_extra_widget (task->priv->browser);
-
 	task->priv->io_operation = FALSE;
+
+	gth_browser_update_extra_widget (task->priv->browser);
+	gth_monitor_folder_changed (gth_main_get_default_monitor (),
+				    task->priv->search_catalog,
+				    gth_catalog_get_file_list (GTH_CATALOG (task->priv->search)),
+				    GTH_MONITOR_EVENT_CREATED);
 	gth_task_completed (GTH_TASK (task), task->priv->error);
 }
 
@@ -137,16 +141,15 @@ done_func (GObject  *object,
 		if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
 			task->priv->error = g_error_new_literal (GTH_TASK_ERROR, GTH_TASK_ERROR_CANCELLED, "");
 			g_error_free (error);
+
+			/* reset the cancellable because it's re-used below to
+			 * save the partial result. */
+			g_cancellable_reset (gth_task_get_cancellable (GTH_TASK (task)));
 		}
 		else
 			task->priv->error = error;
 	}
 
-	gth_monitor_folder_changed (gth_main_get_default_monitor (),
-				    task->priv->search_catalog,
-				    gth_catalog_get_file_list (GTH_CATALOG (task->priv->search)),
-				    GTH_MONITOR_EVENT_CREATED);
-
 	/* save the search result */
 
 	doc = dom_document_new ();
@@ -286,6 +289,8 @@ clear_search_result_copy_done_cb (void     **buffer,
 	GFile         *parent;
 	GList         *files;
 
+	task->priv->io_operation = FALSE;
+
 	if (error != NULL) {
 		_gtk_error_dialog_from_gerror_show (GTK_WINDOW (task->priv->browser), _("Could not create the catalog"), &error);
 		return;
@@ -319,10 +324,11 @@ gth_search_task_exec (GthTask *base)
 	GFile         *search_result_real_file;
 
 	gth_catalog_set_file_list (GTH_CATALOG (task->priv->search), NULL);
-	task->priv->io_operation = FALSE;
 
 	/* save the search result */
 
+	task->priv->io_operation = TRUE;
+
 	doc = dom_document_new ();
 	dom_element_append_child (DOM_ELEMENT (doc), dom_domizable_create_element (DOM_DOMIZABLE (task->priv->search), doc));
 	data = dom_document_dump (doc, &size);