file-roller r2519 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Fri Oct 17 07:13:02 2008
New Revision: 2519
URL: http://svn.gnome.org/viewvc/file-roller?rev=2519&view=rev

Log:
2008-10-17  Paolo Bacchilega  <paobac svn gnome org>

	* src/fr-window.c: 
	* src/fr-archive.c: 
	* src/dlg-extract.c: 
	* src/actions.c: 

	Fixed bug #556619 â format not a string literal and no format 
	arguments.  Patch by Christian Persch.


Modified:
   trunk/ChangeLog
   trunk/src/actions.c
   trunk/src/dlg-extract.c
   trunk/src/fr-archive.c
   trunk/src/fr-window.c

Modified: trunk/src/actions.c
==============================================================================
--- trunk/src/actions.c	(original)
+++ trunk/src/actions.c	Fri Oct 17 07:13:02 2008
@@ -244,7 +244,7 @@
 							GTK_DIALOG_DESTROY_WITH_PARENT,
 							NULL,
 							_("Could not delete the old archive."),
-							err->message);
+							"%s", err->message);
 			gtk_dialog_run (GTK_DIALOG (dialog));
 			gtk_widget_destroy (GTK_WIDGET (dialog));
 			g_error_free (err);

Modified: trunk/src/dlg-extract.c
==============================================================================
--- trunk/src/dlg-extract.c	(original)
+++ trunk/src/dlg-extract.c	Fri Oct 17 07:13:02 2008
@@ -134,7 +134,7 @@
 						   GTK_DIALOG_DESTROY_WITH_PARENT,
 						   NULL,
 						   _("Extraction not performed"),
-						   message);
+						   "%s", message);
 			gtk_dialog_run (GTK_DIALOG (d));
 			gtk_widget_destroy (GTK_WIDGET (d));
 

Modified: trunk/src/fr-archive.c
==============================================================================
--- trunk/src/fr-archive.c	(original)
+++ trunk/src/fr-archive.c	Fri Oct 17 07:13:02 2008
@@ -323,9 +323,9 @@
 	archive->error.status = 0;
 	g_clear_error (&archive->error.gerror);
 	if (error_details != NULL)
-		archive->error.gerror = g_error_new (fr_error_quark (),
-						     0,
-						     error_details);
+		archive->error.gerror = g_error_new_literal (fr_error_quark (),
+							     0,
+							     error_details);
 	g_signal_emit (G_OBJECT (archive),
 		       fr_archive_signals[DONE],
 		       0,

Modified: trunk/src/fr-window.c
==============================================================================
--- trunk/src/fr-window.c	(original)
+++ trunk/src/fr-window.c	Fri Oct 17 07:13:02 2008
@@ -2190,7 +2190,7 @@
 					   GTK_DIALOG_MODAL,
 					   NULL,
 					   message,
-					   error->message);
+					   "%s", error->message);
 		gtk_dialog_run (GTK_DIALOG (d));
 		gtk_widget_destroy (d);
 
@@ -2930,7 +2930,7 @@
 						0,
 						output,
 						msg,
-						details);
+						"%s", details);
 		fr_window_show_error_dialog (window, dialog, dialog_parent);
 
 		return FALSE;
@@ -7290,7 +7290,7 @@
 						     GTK_DIALOG_DESTROY_WITH_PARENT,
 						     NULL,
 						     (renaming_dir ? _("Could not rename the folder") : _("Could not rename the file")),
-						     reason);
+						     "%s", reason);
 			gtk_dialog_run (GTK_DIALOG (dlg));
 			gtk_widget_destroy (dlg);