From becd78e26ed61ff386d0b229f85bdcf590c28e94 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 17 Jul 2009 16:51:53 -0400 Subject: Fix an activity cancellation crasher. --- mail/mail-mt.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'mail') diff --git a/mail/mail-mt.c b/mail/mail-mt.c index 490f54f8e5..eb14674117 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -937,6 +937,13 @@ struct _op_status_msg { gpointer data; }; +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) { @@ -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); -- cgit v1.2.3