Mamoru TASAKA
11 years ago
parent
5e74a37615
commit
afe87bc028
@ -1,65 +0,0 @@
|
||||
--- gnome-commander-1.2.8.15/libgcmd/libgcmd-widget-factory.cc.format 2011-12-07 04:10:27.000000000 +0900
|
||||
+++ gnome-commander-1.2.8.15/libgcmd/libgcmd-widget-factory.cc 2013-12-03 16:29:16.321596112 +0900
|
||||
@@ -652,7 +652,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", msg);
|
||||
|
||||
gtk_signal_connect (GTK_OBJECT (dialog), "response", GTK_SIGNAL_FUNC (on_response), dialog);
|
||||
|
||||
@@ -673,7 +673,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);
|
||||
--- gnome-commander-1.2.8.15/src/gnome-cmd-prepare-xfer-dialog.cc.format 2011-12-07 04:10:28.000000000 +0900
|
||||
+++ gnome-commander-1.2.8.15/src/gnome-cmd-prepare-xfer-dialog.cc 2013-12-03 16:38:54.968433434 +0900
|
||||
@@ -192,6 +192,7 @@ static void on_ok (GtkButton *button, Gn
|
||||
(GtkDialogFlags) 0,
|
||||
GTK_MESSAGE_QUESTION,
|
||||
GTK_BUTTONS_OK_CANCEL,
|
||||
+ "%s",
|
||||
msg);
|
||||
gint choice = gtk_dialog_run (GTK_DIALOG (dialog));
|
||||
gtk_widget_destroy (dialog);
|
||||
--- gnome-commander-1.2.8.15/src/utils.cc.format 2011-12-07 04:10:29.000000000 +0900
|
||||
+++ gnome-commander-1.2.8.15/src/utils.cc 2013-12-03 16:40:20.887350297 +0900
|
||||
@@ -193,7 +193,7 @@ gint run_simple_dialog (GtkWidget *paren
|
||||
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);
|
||||
|
||||
@@ -590,7 +590,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)
|
||||
--- gnome-commander-1.2.8.15/src/utils.h.format 2011-12-07 04:10:29.000000000 +0900
|
||||
+++ gnome-commander-1.2.8.15/src/utils.h 2013-12-03 16:31:38.411012903 +0900
|
||||
@@ -256,10 +256,11 @@ inline void gnome_cmd_show_message (GtkW
|
||||
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);
|
||||
Loading…
Reference in new issue