** Fixes bug 474651

2007-12-10  Tobias Mueller  <tobiasmue@svn.gnome.org>

        ** Fixes bug 474651

        * addressbook/gui/contact-editor/eab-editor.c:
        * plugins/save-calendar/ical-format.c:
        * plugins/save-calendar/csv-format.c:
        * plugins/save-calendar/rdf-format.c:
        * plugins/ipod-sync/ical-format.c:
        * plugins/ipod-sync/ipod-sync.c:
        * plugins/ipod-sync/evolution-ipod-sync.c:
        * calendar/gui/dialogs/changed-comp.c:
        * calendar/gui/dialogs/copy-source-dialog.c:
        * calendar/gui/dialogs/delete-error.c:
        Use format strings in gtk_message_dialog_new


svn path=/trunk/; revision=34680

10 files changed, 25 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index e37f38fccd..482f61da9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2007-12-10  Tobias Mueller  <tobiasmue@svn.gnome.org>
+
+	** Fixes bug 474651
+
+	* addressbook/gui/contact-editor/eab-editor.c:
+	* plugins/save-calendar/ical-format.c:
+	* plugins/save-calendar/csv-format.c:
+	* plugins/save-calendar/rdf-format.c:
+	* plugins/ipod-sync/ical-format.c:
+	* plugins/ipod-sync/ipod-sync.c:
+	* plugins/ipod-sync/evolution-ipod-sync.c:
+	* calendar/gui/dialogs/changed-comp.c:
+	* calendar/gui/dialogs/copy-source-dialog.c:
+	* calendar/gui/dialogs/delete-error.c:
+	Use format strings in gtk_message_dialog_new
+
 2007-12-05  Matthew Barnes  <mbarnes@redhat.com>
 
 	* configure.in:
diff --git a/addressbook/gui/contact-editor/eab-editor.c b/addressbook/gui/contact-editor/eab-editor.c
index b11c9af657..2c067ae683 100644
--- a/addressbook/gui/contact-editor/eab-editor.c
+++ b/addressbook/gui/contact-editor/eab-editor.c
@@ -337,6 +337,7 @@ eab_editor_confirm_delete (GtkWindow *parent, gboolean plural, gboolean is_list,
 					 0,
 					 GTK_MESSAGE_QUESTION,
 					 GTK_BUTTONS_NONE,
+					 "%s",
 					 msg);
 	g_free (msg);
 
diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c
index bfc89604e3..ff6870c514 100644
--- a/calendar/gui/dialogs/changed-comp.c
+++ b/calendar/gui/dialogs/changed-comp.c
@@ -105,7 +105,7 @@ changed_component_dialog (GtkWindow *parent, ECalComponent *comp, gboolean delet
 
 	dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL,
 					 GTK_MESSAGE_QUESTION,
-					 GTK_BUTTONS_YES_NO, str);
+					 GTK_BUTTONS_YES_NO, "%s", str);
 
 	icon_list = e_icon_factory_get_icon_list ("stock_calendar");
 	if (icon_list) {
diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c
index b8629bf86f..e4f5c55623 100644
--- a/calendar/gui/dialogs/copy-source-dialog.c
+++ b/calendar/gui/dialogs/copy-source-dialog.c
@@ -39,7 +39,7 @@ show_error (GtkWindow *parent, const char *msg)
 {
 	GtkWidget *dialog;
 
-	dialog = gtk_message_dialog_new (parent, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, msg);
+	dialog = gtk_message_dialog_new (parent, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", msg);
 	gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_destroy (dialog);
 }
diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c
index d8f4df3cfc..ea9406da73 100644
--- a/calendar/gui/dialogs/delete-error.c
+++ b/calendar/gui/dialogs/delete-error.c
@@ -105,7 +105,7 @@ delete_error_dialog (GError *error, ECalComponentVType vtype)
 
 	dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
 					 GTK_MESSAGE_ERROR,
-					 GTK_BUTTONS_OK, str);
+					 GTK_BUTTONS_OK, "%s", str);
 	if (vtype == E_CAL_COMPONENT_EVENT)
 		icon_list = e_icon_factory_get_icon_list ("stock_calendar");
 	else if (vtype == E_CAL_COMPONENT_TODO)
diff --git a/plugins/ipod-sync/ical-format.c b/plugins/ipod-sync/ical-format.c
index 38607a6e97..76dc433c69 100644
--- a/plugins/ipod-sync/ical-format.c
+++ b/plugins/ipod-sync/ical-format.c
@@ -47,7 +47,7 @@ display_error_message (GtkWidget *parent, const char *message)
 {
 	GtkWidget *dialog;
 
-	dialog = gtk_message_dialog_new (GTK_WINDOW (parent), 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, message);
+	dialog = gtk_message_dialog_new (GTK_WINDOW (parent), 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", message);
 	gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_destroy (dialog);
 }
diff --git a/plugins/ipod-sync/ipod-sync.c b/plugins/ipod-sync/ipod-sync.c
index 6366ea0385..31242fe83d 100644
--- a/plugins/ipod-sync/ipod-sync.c
+++ b/plugins/ipod-sync/ipod-sync.c
@@ -57,7 +57,7 @@ display_error_message (GtkWidget *parent, const char *message)
 {
 	GtkWidget *dialog;
 
-	dialog = gtk_message_dialog_new (GTK_WINDOW (parent), 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, message);
+	dialog = gtk_message_dialog_new (GTK_WINDOW (parent), 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", message);
 	gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_destroy (dialog);
 }
diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c
index 8deaf05282..d4b46058a0 100644
--- a/plugins/save-calendar/csv-format.c
+++ b/plugins/save-calendar/csv-format.c
@@ -65,7 +65,7 @@ display_error_message (GtkWidget *parent, GError *error)
 	GtkWidget *dialog;
 
 	dialog = gtk_message_dialog_new (GTK_WINDOW (parent), 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
-					 error->message);
+					 "%s", error->message);
 	gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_destroy (dialog);
 }
diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c
index ce57d00576..7c35dbc589 100644
--- a/plugins/save-calendar/ical-format.c
+++ b/plugins/save-calendar/ical-format.c
@@ -48,7 +48,7 @@ display_error_message (GtkWidget *parent, const char *message)
 {
 	GtkWidget *dialog;
 
-	dialog = gtk_message_dialog_new (GTK_WINDOW (parent), 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, message);
+	dialog = gtk_message_dialog_new (GTK_WINDOW (parent), 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", message);
 	gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_destroy (dialog);
 }
diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c
index 33cded34bd..768028b811 100644
--- a/plugins/save-calendar/rdf-format.c
+++ b/plugins/save-calendar/rdf-format.c
@@ -91,7 +91,7 @@ display_error_message (GtkWidget *parent, GError *error)
 	GtkWidget *dialog;
 
 	dialog = gtk_message_dialog_new (GTK_WINDOW (parent), 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
-					 error->message);
+					 "%s", error->message);
 	gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_destroy (dialog);
 }