gnumeric r16949 - in trunk: . plugins/dif plugins/excel src src/tools

[mortenw svn gnome org]

Author: mortenw
Date: Tue Nov  4 17:33:11 2008
New Revision: 16949
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16949&view=rev

Log:
2008-11-04  Morten Welinder  <terra gnome org>

	* */*.c: Fix problem with formats. Patch from Hib Eris, #559291.



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/plugins/dif/dif.c
   trunk/plugins/excel/boot.c
   trunk/plugins/excel/ms-excel-read.c
   trunk/src/gui-util.c
   trunk/src/print.c
   trunk/src/ranges.c
   trunk/src/sheet-object-image.c
   trunk/src/stf-export.c
   trunk/src/stf.c
   trunk/src/tools/analysis-tools.c
   trunk/src/wbc-gtk.c
   trunk/src/xml-io.c
   trunk/src/xml-sax-read.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Tue Nov  4 17:33:11 2008
@@ -9,6 +9,7 @@
 
 Hib Eris:
 	* Fix problems with toolbars when no handle bar present.  [#559249]
+	* Fix problems with formats.  [#559291]
 
 Jody:
 	* Display top-left when selecting a rel ref to a merged region.

Modified: trunk/plugins/dif/dif.c
==============================================================================
--- trunk/plugins/dif/dif.c	(original)
+++ trunk/plugins/dif/dif.c	Tue Nov  4 17:33:11 2008
@@ -235,14 +235,14 @@
 				msg = g_strdup_printf (
 				      _("Unknown data value \"%s\" at line %d. Ignoring."),
 				      ctxt->line, ctxt->line_no);
-				g_warning (msg);
+				g_warning ("%s", msg);
 				g_free (msg);
 			}
 		} else {
 			msg = g_strdup_printf (
 			      _("Unknown value type %d at line %d. Ignoring."),
 			      val_type, ctxt->line_no);
-			g_warning (msg);
+			g_warning ("%s", msg);
 			g_free (msg);
 			(void) dif_get_line (ctxt);
 		}

Modified: trunk/plugins/excel/boot.c
==============================================================================
--- trunk/plugins/excel/boot.c	(original)
+++ trunk/plugins/excel/boot.c	Tue Nov  4 17:33:11 2008
@@ -131,7 +131,7 @@
 	if (stream != NULL) {
 		GError *err = gsf_msole_metadata_read (stream, meta_data);
 		if (err != NULL) {
-			gnm_io_warning (context, err->message);
+			gnm_io_warning (context, "%s", err->message);
 			g_error_free (err);
 		}
 

Modified: trunk/plugins/excel/ms-excel-read.c
==============================================================================
--- trunk/plugins/excel/ms-excel-read.c	(original)
+++ trunk/plugins/excel/ms-excel-read.c	Tue Nov  4 17:33:11 2008
@@ -3245,7 +3245,7 @@
 			       texpr,
 			       &err, link_to_container, stub);
 	if (nexpr == NULL) {
-		gnm_io_warning (importer->context, err);
+		gnm_io_warning (importer->context, "%s", err);
 		g_free (err);
 		return NULL;
 	}

Modified: trunk/src/gui-util.c
==============================================================================
--- trunk/src/gui-util.c	(original)
+++ trunk/src/gui-util.c	Tue Nov  4 17:33:11 2008
@@ -931,7 +931,7 @@
 							   primary_message);
 			}
 		} else {
-			message = g_strdup_printf (secondary_message);
+			message = g_strdup_printf ("%s", secondary_message);
 		}
 		label = gtk_label_new (message);
 		g_free (message);

Modified: trunk/src/print.c
==============================================================================
--- trunk/src/print.c	(original)
+++ trunk/src/print.c	Tue Nov  4 17:33:11 2008
@@ -1513,7 +1513,7 @@
 
 	  tmp_file_fd = g_file_open_tmp ("pdfXXXXXX", &tmp_file_name, &err);
 	  if (err) {
-		  gsf_output_set_error (export_dst, 0, err->message);
+		  gsf_output_set_error (export_dst, 0, "%s", err->message);
 		  g_error_free (err);
 		  goto out;
 	  }
@@ -1570,7 +1570,7 @@
 		  if (!gsf_output_error (export_dst))
 			  gsf_output_set_error (export_dst,
 						g_file_error_from_errno (save_errno),
-						g_strerror (save_errno));
+						"%s", g_strerror (save_errno));
 	  }
   }
 

Modified: trunk/src/ranges.c
==============================================================================
--- trunk/src/ranges.c	(original)
+++ trunk/src/ranges.c	Tue Nov  4 17:33:11 2008
@@ -199,7 +199,7 @@
 		g_printerr (":%s%s",
 			col_name (src->end.col),
 			row_name (src->end.row));
-	g_printerr (suffix);
+	g_printerr ("%s", suffix);
 }
 
 #ifdef RANGE_DEBUG

Modified: trunk/src/sheet-object-image.c
==============================================================================
--- trunk/src/sheet-object-image.c	(original)
+++ trunk/src/sheet-object-image.c	Tue Nov  4 17:33:11 2008
@@ -294,7 +294,7 @@
 		}
 
 		if (err != NULL) {
-			g_warning (err-> message);
+			g_warning ("%s", err->message);
 			g_error_free (err);
 			err = NULL;
 		} else {

Modified: trunk/src/stf-export.c
==============================================================================
--- trunk/src/stf-export.c	(original)
+++ trunk/src/stf-export.c	Tue Nov  4 17:33:11 2008
@@ -667,7 +667,7 @@
 	errtxt = _("Invalid option for stf exporter");
 error:
 	if (err)
-		*err = g_error_new (go_error_invalid (), 0, errtxt);
+		*err = g_error_new (go_error_invalid (), 0, "%s", errtxt);
 
 	return TRUE;
 }

Modified: trunk/src/stf.c
==============================================================================
--- trunk/src/stf.c	(original)
+++ trunk/src/stf.c	Tue Nov  4 17:33:11 2008
@@ -391,7 +391,7 @@
 					 GTK_MESSAGE_WARNING,
 					 msg);
 			else
-				g_warning (msg);
+				g_warning ("%s", msg);
 #if 0
 				go_cmd_context_error_import
 					(GO_CMD_CONTEXT (context),

Modified: trunk/src/tools/analysis-tools.c
==============================================================================
--- trunk/src/tools/analysis-tools.c	(original)
+++ trunk/src/tools/analysis-tools.c	Tue Nov  4 17:33:11 2008
@@ -744,7 +744,7 @@
 
 	guint col, row;
 
-	dao_set_cell_printf (dao, 0, 0, title);
+	dao_set_cell_printf (dao, 0, 0, "%s", title);
 	dao_set_italic (dao, 0, 0, 0, 0);
 
 	fd = gnm_func_lookup (functionname, NULL);
@@ -5017,7 +5017,7 @@
 		for (i = given_length; i < desired_length; i++)
 			current->data = g_array_append_val (current->data, zero_val);
 
-		dao_set_cell_printf (dao, col, 0, current->label);
+		dao_set_cell_printf (dao, col, 0, "%s", current->label);
 		dao_set_cell_printf (dao, col, 1, _("Real"));
 		dao_set_cell_printf (dao, col + 1, 1, _("Imaginary"));
 

Modified: trunk/src/wbc-gtk.c
==============================================================================
--- trunk/src/wbc-gtk.c	(original)
+++ trunk/src/wbc-gtk.c	Tue Nov  4 17:33:11 2008
@@ -2026,7 +2026,7 @@
 
 	dialog = gtk_message_dialog_new (wbcg_toplevel (wbcg),
 		GTK_DIALOG_DESTROY_WITH_PARENT,
-		type, GTK_BUTTONS_NONE, msg);
+		type, GTK_BUTTONS_NONE, "%s", msg);
 	gtk_dialog_add_buttons (GTK_DIALOG (dialog),
 		btn0, GTK_RESPONSE_YES,
 		btn1, GTK_RESPONSE_NO,

Modified: trunk/src/xml-io.c
==============================================================================
--- trunk/src/xml-io.c	(original)
+++ trunk/src/xml-io.c	Tue Nov  4 17:33:11 2008
@@ -400,11 +400,11 @@
 				       texpr,
 				       &err, TRUE, NULL);
 			if (err != NULL) {
-				gnm_io_warning (ctxt->io_context, err);
+				gnm_io_warning (ctxt->io_context, "%s", err);
 				g_free (err);
 			}
 		} else
-			gnm_io_warning (ctxt->io_context, perr.err->message);
+			gnm_io_warning (ctxt->io_context, "%s", perr.err->message);
 		parse_error_free (&perr);
 
 		xmlFree (name_str);

Modified: trunk/src/xml-sax-read.c
==============================================================================
--- trunk/src/xml-sax-read.c	(original)
+++ trunk/src/xml-sax-read.c	Tue Nov  4 17:33:11 2008
@@ -2295,7 +2295,7 @@
 		if (texpr)
 			expr_name_set_expr (nexpr, texpr);
 		else
-			gnm_io_warning (state->context, perr.err->message);
+			gnm_io_warning (state->context, "%s", perr.err->message);
 
 		parse_error_free (&perr);
 		g_free (expr_str);