[evolution/email-factory-3-4: 27/38] Associate GCancellable with most operations and errors.

[Srinivasa Ragavan <sragavan src gnome org>]

commit e831fddb71734354b0fa27b2d37194c35c3838f9
Author: Srinivasa Ragavan <sragavan gnome org>
Date:   Thu Dec 1 15:44:18 2011 +0200

    Associate GCancellable with most operations and errors.

 libemail-utils/mail-mt.c |    4 ++--
 libemail-utils/mail-mt.h |    2 +-
 mail/e-mail-backend.c    |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/libemail-utils/mail-mt.c b/libemail-utils/mail-mt.c
index 045db03..e932bd6 100644
--- a/libemail-utils/mail-mt.c
+++ b/libemail-utils/mail-mt.c
@@ -242,10 +242,10 @@ mail_msg_check_error (gpointer msg)
 		char *what;
 
 		if (m->info->desc && (what = m->info->desc (m))) {
-			alert_error (what, m->error->message);
+			alert_error (m->cancellable, what, m->error->message);
 			g_free (what);
 		} else
-			alert_error (NULL, m->error->message);
+			alert_error (m->cancellable, NULL, m->error->message);
 	}
 }	
 
diff --git a/libemail-utils/mail-mt.h b/libemail-utils/mail-mt.h
index edae135..52da408 100644
--- a/libemail-utils/mail-mt.h
+++ b/libemail-utils/mail-mt.h
@@ -42,7 +42,7 @@ typedef void    (*MailMsgSubmitActivityFunc)	(GCancellable *cancellable);
 typedef void    (*MailMsgFreeActivityFunc)	(GCancellable *cancellable);
 typedef void    (*MailMsgCompleteActivityFunc)	(GCancellable *cancellable);
 typedef void    (*MailMsgCancelActivityFunc)	(GCancellable *cancellable);
-typedef void    (*MailMsgAlertErrorFunc)	(const char *what, const char *message);
+typedef void    (*MailMsgAlertErrorFunc)	(GCancellable *cancellable, const char *what, const char *message);
 
 struct _MailMsg {
 	MailMsgInfo *info;
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index d3dbf1b..3dab677 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -841,7 +841,7 @@ mail_mt_cancel_activity (GCancellable *cancellable)
 }
 
 static void    
-mail_mt_alert_error (const char *what, const char *message)
+mail_mt_alert_error (GCancellable *cancellable, const char *what, const char *message)
 {
 	EShell *shell;
 	EShellView *shell_view;