goffice r2305 - in trunk: . goffice/gtk

[mortenw svn gnome org]

Author: mortenw
Date: Sun Jan 11 20:15:07 2009
New Revision: 2305
URL: http://svn.gnome.org/viewvc/goffice?rev=2305&view=rev

Log:
2009-01-11  Morten Welinder  <terra gnome org>

	* goffice/gtk/goffice-gtk.c (go_gtk_url_is_writeable): Undo
	incorrect fix for "goffice-gtk.c:925: warning: format not a string
	literal and no format arguments".  For now, let gcc issue the
	false warning.



Modified:
   trunk/ChangeLog
   trunk/goffice/gtk/goffice-gtk.c

Modified: trunk/goffice/gtk/goffice-gtk.c
==============================================================================
--- trunk/goffice/gtk/goffice-gtk.c	(original)
+++ trunk/goffice/gtk/goffice-gtk.c	Sun Jan 11 20:15:07 2009
@@ -918,11 +918,13 @@
 			_("A file called <i>%s</i> already exists in %s.\n\n"
 			  "Do you want to save over it?"),
 			basename, dirname);
+		/* gcc complains over this, but the format seems right and
+		   is not supposed to be constant.  Using "%s" is wrong.  */
 		GtkWidget *dialog = gtk_message_dialog_new_with_markup (parent,
 			 GTK_DIALOG_DESTROY_WITH_PARENT,
 			 GTK_MESSAGE_WARNING,
 			 GTK_BUTTONS_OK_CANCEL,
-			 "%s", msg);
+			 msg);
 		gtk_dialog_set_default_response (GTK_DIALOG (dialog),
 			overwrite_by_default ? GTK_RESPONSE_OK : GTK_RESPONSE_CANCEL);
 		result = GTK_RESPONSE_OK ==