aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/mail-mt.c8
2 files changed, 5 insertions, 7 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 9f187efc55..a47e7ffee5 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-18 Matthew Barnes <mbarnes@redhat.com>
+
+ * mail-mt.c (do_op_status): Fix another compiler warning.
+
2007-12-17 Srinivasa Ragavan <sragavan@novell.com>
* mail-mt.c: (mail_msg_free), (mail_msg_check_error): Fix some compiler warnings.
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 4dba37c7e3..686836ea72 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -952,12 +952,6 @@ void mail_disable_stop(void)
MAIL_MT_UNLOCK(status_lock);
}
-static void
-operation_cancel (CamelOperation *p)
-{
- camel_operation_cancel (p);
-}
-
/* ******************************************************************************** */
struct _op_status_msg {
@@ -1026,7 +1020,7 @@ static void do_op_status(struct _mail_msg *mm)
what = g_strdup("");
}
- data->activity_id = e_activity_handler_cancelable_operation_started (activity_handler, "evolution-mail", progress_icon, what, TRUE, operation_cancel, msg->cancel);
+ data->activity_id = e_activity_handler_cancelable_operation_started (activity_handler, "evolution-mail", progress_icon, what, TRUE, (void (*) (gpointer)) camel_operation_cancel, msg->cancel);
g_free (what);
MAIL_MT_LOCK (mail_msg_lock);