Adapt to CamelOperation API changes.

1 files changed, 4 insertions, 8 deletions

diff --git a/mail/message-list.c b/mail/message-list.c
index 1e903a3f48..e01f42fca2 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -4999,20 +4999,16 @@ mail_regen_cancel (MessageList *ml)
 {
 	/* cancel any outstanding regeneration requests, not we don't clear, they clear themselves */
 	if (ml->regen) {
-		GList *l;
+		GList *link;
 
 		g_mutex_lock (ml->regen_lock);
 
-		l = ml->regen;
-		while (l) {
-			MailMsg *mm = l->data;
+		for (link = ml->regen; link != NULL; link = link->next) {
+			MailMsg *mm = link->data;
 			GCancellable *cancellable;
 
 			cancellable = e_activity_get_cancellable (mm->activity);
-			if (CAMEL_IS_OPERATION (cancellable))
-				camel_operation_cancel (
-					CAMEL_OPERATION (cancellable));
-			l = l->next;
+			g_cancellable_cancel (cancellable);
 		}
 
 		g_mutex_unlock (ml->regen_lock);