evolution r36710 - in branches/gnome-2-24: mail plugins/mail-to-task plugins/plugin-manager

[mbarnes svn gnome org]

Author: mbarnes
Date: Fri Oct 31 21:05:29 2008
New Revision: 36710
URL: http://svn.gnome.org/viewvc/evolution?rev=36710&view=rev

Log:
2008-10-31  Matthew Barnes  <mbarnes redhat com>

	** Fixes bug #558726 (patch by Frederic van Starbmann)

	* mail/em-format-html.c (emfh_multipart_related_check):
	* plugins/mail-to-task/mail-to-task.c (do_mail_to_task):
	* plugins/plugin-manager/plugin-manager.c (eppm_enable_toggled):
	Fix several potential format string crashes.



Modified:
   branches/gnome-2-24/mail/ChangeLog
   branches/gnome-2-24/mail/em-format-html.c
   branches/gnome-2-24/plugins/mail-to-task/ChangeLog
   branches/gnome-2-24/plugins/mail-to-task/mail-to-task.c
   branches/gnome-2-24/plugins/plugin-manager/ChangeLog
   branches/gnome-2-24/plugins/plugin-manager/plugin-manager.c

Modified: branches/gnome-2-24/mail/em-format-html.c
==============================================================================
--- branches/gnome-2-24/mail/em-format-html.c	(original)
+++ branches/gnome-2-24/mail/em-format-html.c	Fri Oct 31 21:05:29 2008
@@ -1060,7 +1060,7 @@
 		if (puri->use_count == 0) {
 			d(printf("part '%s' '%s' used '%d'\n", puri->uri?puri->uri:"", puri->cid, puri->use_count));
 			if (puri->func == emfh_write_related) {
-				g_string_printf(((EMFormat *)job->format)->part_id, puri->part_id);
+				g_string_printf(((EMFormat *)job->format)->part_id, "%s", puri->part_id);
 				em_format_part((EMFormat *)job->format, (CamelStream *)job->stream, puri->part);
 			}
 			/* else it was probably added by a previous format this loop */

Modified: branches/gnome-2-24/plugins/mail-to-task/mail-to-task.c
==============================================================================
--- branches/gnome-2-24/plugins/mail-to-task/mail-to-task.c	(original)
+++ branches/gnome-2-24/plugins/mail-to-task/mail-to-task.c	Fri Oct 31 21:05:29 2008
@@ -287,7 +287,7 @@
 		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 {

Modified: branches/gnome-2-24/plugins/plugin-manager/plugin-manager.c
==============================================================================
--- branches/gnome-2-24/plugins/plugin-manager/plugin-manager.c	(original)
+++ branches/gnome-2-24/plugins/plugin-manager/plugin-manager.c	Fri Oct 31 21:05:29 2008
@@ -196,7 +196,7 @@
 		gtk_tree_model_get (m->model, &iter, COL_PLUGIN_DATA, &plugin, -1);
 		e_plugin_enable (plugin, !plugin->enabled);
 
-		g_warning (plugin->name);
+		g_warning ("%s", plugin->name);
 
 		gtk_list_store_set (GTK_LIST_STORE(m->model), &iter,
 				    COL_PLUGIN_ENABLED, plugin->enabled,