[evolution/kill-bonobo] Fix an activity cancellation crasher.

[Matthew Barnes <mbarnes src gnome org>]

commit becd78e26ed61ff386d0b229f85bdcf590c28e94
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Jul 17 16:51:53 2009 -0400

    Fix an activity cancellation crasher.

 mail/mail-mt.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 490f54f..eb14674 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -938,6 +938,13 @@ struct _op_status_msg {
 };
 
 static void
+op_cancelled_cb (EActivity *activity,
+                 gpointer user_data)
+{
+	mail_msg_cancel (GPOINTER_TO_UINT (user_data));
+}
+
+static void
 op_status_exec (struct _op_status_msg *m)
 {
 	EShell *shell;
@@ -1000,10 +1007,10 @@ op_status_exec (struct _op_status_msg *m)
 			e_activity_set_percent (data->activity, 0.0);
 			e_shell_backend_add_activity (shell_backend, data->activity);
 
-			g_signal_connect_swapped (
+			g_signal_connect (
 				data->activity, "cancelled",
-				G_CALLBACK (camel_operation_cancel),
-				msg->cancel);
+				G_CALLBACK (op_cancelled_cb),
+				GUINT_TO_POINTER (msg->seq));
 
 			g_free (what);
 			MAIL_MT_LOCK (mail_msg_lock);