Pass GCancellable to Camel.

3 files changed, 16 insertions, 5 deletions

diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index 2db4eaf4e7..b753653229 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -103,12 +103,16 @@ install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data)
 
 			if (e_gw_connection_accept_shared_folder (cnc, folder_name, container_id, (gchar *)item_id, NULL) == E_GW_CONNECTION_STATUS_OK) {
 
-				folder = camel_store_get_folder (store, "Mailbox", 0, NULL);
+				/* FIXME Not passing a GCancellable or GError here. */
+				folder = camel_store_get_folder (store, "Mailbox", 0, NULL, NULL);
 				/*changes = camel_folder_change_info_new ();
 				camel_folder_change_info_remove_uid (changes, (gchar *) item_id);
 				camel_folder_summary_remove_uid (folder->summary, item_id);*/
 				/* camel_folder_delete_message (folder, item_id); */
-				camel_folder_set_message_flags (folder, item_id, CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED);
+				camel_folder_set_message_flags (
+					folder, item_id,
+					CAMEL_MESSAGE_DELETED,
+					CAMEL_MESSAGE_DELETED);
 				camel_folder_summary_touch (folder->summary);
 				/* camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", changes); */
 				uri = camel_url_to_string (((CamelService *) store)->url, CAMEL_URL_HIDE_ALL);
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index 1b6fb180ea..9a345f1ba6 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -142,9 +142,14 @@ create_folder_exec (struct _EMCreateFolder *m)
 {
 	d(printf ("creating folder parent='%s' name='%s' full_name='%s'\n", m->parent, m->name, m->full_name));
 
-	if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &m->base.error))) {
+	if ((m->fi = camel_store_create_folder (
+		m->store, m->parent, m->name,
+		m->base.cancellable, &m->base.error))) {
+
 		if (camel_store_supports_subscriptions (m->store))
-			camel_store_subscribe_folder (m->store, m->full_name, &m->base.error);
+			camel_store_subscribe_folder (
+				m->store, m->full_name,
+				m->base.cancellable, &m->base.error);
 	}
 }
 
diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c
index 2ff2764a12..61c1ac25f0 100644
--- a/plugins/groupwise-features/status-track.c
+++ b/plugins/groupwise-features/status-track.c
@@ -73,7 +73,9 @@ get_selected_message (EShellView *shell_view,
 		*folder = e_mail_reader_get_folder (reader);
 		*selected_uid = g_strdup (g_ptr_array_index (uids, 0));
 
-		msg = camel_folder_get_message (*folder, *selected_uid, NULL);
+		/* FIXME Not passing a GCancellable or GError here. */
+		msg = camel_folder_get_message (
+			*folder, *selected_uid, NULL, NULL);
 	}
 
 	em_utils_uids_free (uids);