[gnome-commander/gcmd-1-2-8] 1_2_8: Make code compile with -Werror=format-security

[Uwe Scholz <uwescholz src gnome org>]

commit ee68a6afb147c8ed5ec18f9960c7b7d6095348f8
Author: Mamoru TASAKA <mtasaka fedoraproject org>
Date:   Sat Dec 28 00:23:20 2013 +0900

    1_2_8: Make code compile with -Werror=format-security
    
    Signed-off-by: Uwe Scholz <uwescholz src gnome org>

 libgcmd/libgcmd-widget-factory.cc    |    4 ++--
 src/gnome-cmd-prepare-xfer-dialog.cc |    1 +
 src/utils.cc                         |    4 ++--
 src/utils.h                          |    3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/libgcmd/libgcmd-widget-factory.cc b/libgcmd/libgcmd-widget-factory.cc
index 22871e4..f2c803c 100644
--- a/libgcmd/libgcmd-widget-factory.cc
+++ b/libgcmd/libgcmd-widget-factory.cc
@@ -653,7 +653,7 @@ create_error_dialog (const gchar *msg, ...)
     va_end (argptr);
 
     dialog = gtk_message_dialog_new (GTK_WINDOW (main_win_widget), GTK_DIALOG_MODAL,
-                                     GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, string);
+                                     GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", string);
 
     gtk_signal_connect (GTK_OBJECT (dialog), "response", GTK_SIGNAL_FUNC (on_response), dialog);
 
@@ -674,7 +674,7 @@ create_warning_dialog (const gchar *msg, ...)
 
     dialog = gtk_message_dialog_new (
         GTK_WINDOW (main_win_widget), GTK_DIALOG_MODAL,
-        GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, msg);
+        GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", msg);
 
     gtk_signal_connect (GTK_OBJECT (dialog), "response",
                         GTK_SIGNAL_FUNC (on_response), dialog);
diff --git a/src/gnome-cmd-prepare-xfer-dialog.cc b/src/gnome-cmd-prepare-xfer-dialog.cc
index 3c82c19..3890b04 100644
--- a/src/gnome-cmd-prepare-xfer-dialog.cc
+++ b/src/gnome-cmd-prepare-xfer-dialog.cc
@@ -193,6 +193,7 @@ static void on_ok (GtkButton *button, GnomeCmdPrepareXferDialog *dialog)
                                                             (GtkDialogFlags) 0,
                                                             GTK_MESSAGE_QUESTION,
                                                             GTK_BUTTONS_OK_CANCEL,
+                                                            "%s",
                                                             msg);
                 gint choice = gtk_dialog_run (GTK_DIALOG (dialog));
                 gtk_widget_destroy (dialog);
diff --git a/src/utils.cc b/src/utils.cc
index b631e88..2b82912 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -194,7 +194,7 @@ gint run_simple_dialog (GtkWidget *parent, gboolean ignore_close_box,
     button_titles = convert_varargs_to_name_array (button_title_args);
     va_end (button_title_args);
 
-    dialog = gtk_message_dialog_new (GTK_WINDOW (main_win), GTK_DIALOG_MODAL, msg_type, GTK_BUTTONS_NONE, 
text);
+    dialog = gtk_message_dialog_new (GTK_WINDOW (main_win), GTK_DIALOG_MODAL, msg_type, GTK_BUTTONS_NONE, 
"%s", text);
     if (title)
         gtk_window_set_title (GTK_WINDOW (dialog), title);
 
@@ -591,7 +591,7 @@ void mime_exec_single (GnomeCmdFile *f)
         {
             gchar *msg = g_strdup_printf (_("%s does not know how to open remote file. Do you want to 
download the file to a temporary location and then open it?"), gnome_cmd_app_get_name (app));
             GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (main_win), GTK_DIALOG_MODAL,
-                                                        GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, msg);
+                                                        GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", msg);
             TmpDlData *dldata = g_new0 (TmpDlData, 1);
             args[0] = (gpointer) app;
             // args[2] is NULL here (don't set exec dir for temporarily downloaded files)
diff --git a/src/utils.h b/src/utils.h
index 3396e18..51a14dd 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -257,10 +257,11 @@ inline void gnome_cmd_show_message (GtkWindow *parent, std::string message, cons
                                              GTK_DIALOG_DESTROY_WITH_PARENT,
                                              GTK_MESSAGE_ERROR,
                                              GTK_BUTTONS_OK,
+                                             "%s",
                                              message.c_str());
 
     if (secondary_text)
-        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dlg), secondary_text);
+        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dlg), "%s", secondary_text);
 
     gtk_dialog_run (GTK_DIALOG (dlg));
     gtk_widget_destroy (dlg);