[evolution-groupwise] Bug #672175 - Make CamelFolderSearch cancellable

[Milan Crha <mcrha src gnome org>]

commit cd1c2ee6f23c933dcc17fcb846f3e928f9788e68
Author: Milan Crha <mcrha redhat com>
Date:   Tue Mar 27 17:17:45 2012 +0200

    Bug #672175 - Make CamelFolderSearch cancellable

 src/camel/camel-groupwise-folder.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/src/camel/camel-groupwise-folder.c b/src/camel/camel-groupwise-folder.c
index 0d93198..407e3a4 100644
--- a/src/camel/camel-groupwise-folder.c
+++ b/src/camel/camel-groupwise-folder.c
@@ -406,6 +406,7 @@ groupwise_folder_rename (CamelFolder *folder,
 static GPtrArray *
 groupwise_folder_search_by_expression (CamelFolder *folder,
                                        const gchar *expression,
+				       GCancellable *cancellable,
                                        GError **error)
 {
 	CamelGroupwiseFolder *gw_folder = CAMEL_GROUPWISE_FOLDER (folder);
@@ -413,7 +414,7 @@ groupwise_folder_search_by_expression (CamelFolder *folder,
 
 	CAMEL_GROUPWISE_FOLDER_LOCK (gw_folder, search_lock);
 	camel_folder_search_set_folder (gw_folder->search, folder);
-	matches = camel_folder_search_search (gw_folder->search, expression, NULL, error);
+	matches = camel_folder_search_search (gw_folder->search, expression, NULL, cancellable, error);
 	CAMEL_GROUPWISE_FOLDER_UNLOCK (gw_folder, search_lock);
 
 	return matches;
@@ -422,6 +423,7 @@ groupwise_folder_search_by_expression (CamelFolder *folder,
 static guint32
 groupwise_folder_count_by_expression (CamelFolder *folder,
                                       const gchar *expression,
+				      GCancellable *cancellable,
                                       GError **error)
 {
 	CamelGroupwiseFolder *gw_folder = CAMEL_GROUPWISE_FOLDER (folder);
@@ -429,7 +431,7 @@ groupwise_folder_count_by_expression (CamelFolder *folder,
 
 	CAMEL_GROUPWISE_FOLDER_LOCK (gw_folder, search_lock);
 	camel_folder_search_set_folder (gw_folder->search, folder);
-	matches = camel_folder_search_count (gw_folder->search, expression, error);
+	matches = camel_folder_search_count (gw_folder->search, expression, cancellable, error);
 	CAMEL_GROUPWISE_FOLDER_UNLOCK (gw_folder, search_lock);
 
 	return matches;
@@ -439,6 +441,7 @@ static GPtrArray *
 groupwise_folder_search_by_uids (CamelFolder *folder,
                                  const gchar *expression,
                                  GPtrArray *uids,
+				 GCancellable *cancellable,
                                  GError **error)
 {
 	CamelGroupwiseFolder *gw_folder = CAMEL_GROUPWISE_FOLDER (folder);
@@ -450,7 +453,7 @@ groupwise_folder_search_by_uids (CamelFolder *folder,
 	CAMEL_GROUPWISE_FOLDER_LOCK (gw_folder, search_lock);
 
 	camel_folder_search_set_folder (gw_folder->search, folder);
-	matches = camel_folder_search_search (gw_folder->search, expression, uids, error);
+	matches = camel_folder_search_search (gw_folder->search, expression, uids, cancellable, error);
 
 	CAMEL_GROUPWISE_FOLDER_UNLOCK (gw_folder, search_lock);