From d6445f8abfa78c0a9c8680a3ba7422d331391f8f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 7 Nov 2008 22:04:53 +0000 Subject: Merge revisions 36685:36729 from trunk. svn path=/branches/kill-bonobo/; revision=36763 --- plugins/mail-to-task/ChangeLog | 7 +++++++ plugins/mail-to-task/mail-to-task.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'plugins/mail-to-task') diff --git a/plugins/mail-to-task/ChangeLog b/plugins/mail-to-task/ChangeLog index 7b9ac83950..ad020a8f0c 100644 --- a/plugins/mail-to-task/ChangeLog +++ b/plugins/mail-to-task/ChangeLog @@ -1,3 +1,10 @@ +2008-10-31 Matthew Barnes + + ** Fixes part of bug #558726 (patch by Frederic van Starbmann) + + * mail-to-task.c (do_mail_to_task): + Fix a potential format string crash. + 2008-08-27 Sankar P License Changes diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c index 89075dfd28..2717bb29be 100644 --- a/plugins/mail-to-task/mail-to-task.c +++ b/plugins/mail-to-task/mail-to-task.c @@ -287,7 +287,7 @@ do_mail_to_task (AsyncData *data) e_notice (NULL, GTK_MESSAGE_ERROR, _("Cannot open calendar. %s"), err ? err->message : ""); } else if (!e_cal_is_read_only (client, &readonly, &err) || readonly) { if (err) - e_notice (NULL, GTK_MESSAGE_ERROR, err->message); + e_notice (NULL, GTK_MESSAGE_ERROR, "%s", err->message); else e_notice (NULL, GTK_MESSAGE_ERROR, _("Selected source is read only, thus cannot create task there. Select other source, please.")); } else { -- cgit