[gnumeric] Compilation: catch up with goffice.

[Morten Welinder <mortenw src gnome org>]

commit a209292a2091e366c1c137480cc8af86470ba004
Author: Morten Welinder <terra gnome org>
Date:   Wed Aug 19 19:43:42 2009 -0400

    Compilation: catch up with goffice.

 configure.in                                    |    2 +-
 plugins/applix/applix-read.c                    |    8 +-
 plugins/applix/applix-write.c                   |    4 +-
 plugins/dif/dif.c                               |    6 +-
 plugins/fn-date/functions.c                     |    4 +-
 plugins/fn-financial/functions.c                |   16 +++---
 plugins/html/html_read.c                        |    4 +-
 plugins/mps/mps.c                               |    2 +-
 plugins/mps/parser.c                            |   24 ++++----
 plugins/openoffice/openoffice-write.c           |    2 +-
 plugins/paradox/paradox.c                       |    6 +-
 plugins/perl-loader/boot.c                      |    4 +-
 plugins/perl-loader/perl-loader.c               |   14 ++--
 plugins/plan-perfect/pln.c                      |   12 ++--
 plugins/psiconv/psiconv-read.c                  |   12 ++--
 plugins/python-loader/boot.c                    |    4 +-
 plugins/python-loader/gnm-python.c              |   14 ++--
 plugins/python-loader/gnm-python.h              |    2 +-
 plugins/python-loader/py-console.c              |    4 +-
 plugins/python-loader/py-interpreter-selector.c |    2 +-
 plugins/python-loader/py-interpreter-selector.h |    2 +-
 plugins/python-loader/python-loader.c           |   78 +++++++++++-----------
 plugins/sc/sc.c                                 |   10 ++--
 plugins/xbase/boot.c                            |    4 +-
 plugins/xbase/xbase.c                           |    6 +-
 plugins/xbase/xbase.h                           |    2 +-
 src/command-context-stderr.c                    |    4 +-
 src/dialogs/dialog-plugin-manager.c             |   22 +++---
 src/gnm-datetime.c                              |    2 +-
 src/gnm-plugin.c                                |   68 ++++++++++----------
 src/gnm-plugin.h                                |    2 +-
 src/gui-util.c                                  |   34 +++++-----
 src/gui-util.h                                  |    6 +-
 src/io-context-gtk.c                            |    4 +-
 src/ssconvert.c                                 |    4 +-
 src/ssgrep.c                                    |    4 +-
 src/ssindex.c                                   |    4 +-
 src/sstest.c                                    |    4 +-
 src/test-harness.c                              |    2 +-
 src/wbc-gtk-actions.c                           |    2 +-
 src/wbc-gtk.c                                   |    4 +-
 src/xml-io.c                                    |    8 +-
 42 files changed, 211 insertions(+), 211 deletions(-)
---
diff --git a/configure.in b/configure.in
index 237d5bd..22de7a2 100644
--- a/configure.in
+++ b/configure.in
@@ -141,7 +141,7 @@ PKG_PROG_PKG_CONFIG(0.18)
 
 dnl *****************************
 libspreadsheet_reqs="
-	libgoffice-${GOFFICE_API_VER}	>= 0.7.9
+	libgoffice-${GOFFICE_API_VER}	>= 0.7.10
 	libgsf-1		>= 1.14.15
 	libxml-2.0		>= 2.4.12
 "
diff --git a/plugins/applix/applix-read.c b/plugins/applix/applix-read.c
index 5d8ba9f..13ee55e 100644
--- a/plugins/applix/applix-read.c
+++ b/plugins/applix/applix-read.c
@@ -62,7 +62,7 @@
 
 typedef struct {
 	GsfInputTextline *input;
-	ErrorInfo     *parse_error;
+	GOErrorInfo     *parse_error;
 	WorkbookView  *wb_view;
 	Workbook      *wb;
 	GHashTable    *exprs, *styles;
@@ -119,14 +119,14 @@ applix_parse_error (ApplixReadState *state, char const *format, ...)
 	char *err;
 
 	if (state->parse_error == NULL)
-		state->parse_error = error_info_new_str (
+		state->parse_error = go_error_info_new_str (
 			_("Parse error while reading Applix file."));
 
 	va_start (args, format);
 	err = g_strdup_vprintf (format, args);
 	va_end (args);
 
-	error_info_add_details (state->parse_error, error_info_new_str (err));
+	go_error_info_add_details (state->parse_error, go_error_info_new_str (err));
 	g_free (err);
 
 	return -1;
@@ -1702,7 +1702,7 @@ applix_read (IOContext *io_context, WorkbookView *wb_view, GsfInput *src)
 	g_ptr_array_free (state.font_names, TRUE);
 
 	if (state.parse_error != NULL)
-		gnumeric_io_error_info_set (io_context, state.parse_error);
+		gnumeric_io_go_error_info_set (io_context, state.parse_error);
 
 	gnm_conventions_free (state.convs);
 }
diff --git a/plugins/applix/applix-write.c b/plugins/applix/applix-write.c
index 13c98d6..9c0466d 100644
--- a/plugins/applix/applix-write.c
+++ b/plugins/applix/applix-write.c
@@ -49,7 +49,7 @@
 
 typedef struct {
 	GsfOutput     *sink;
-	ErrorInfo     *parse_error;
+	GOErrorInfo     *parse_error;
 	WorkbookView const *wb_view;
 	Workbook      *wb;
 } ApplixWriteState;
@@ -99,5 +99,5 @@ applix_write (IOContext *io_context, WorkbookView const *wb_view, GsfOutput *sin
 	d (1, fprintf (stderr, "------------Finish writing"););
 
 	if (state.parse_error != NULL)
-		gnumeric_io_error_info_set (io_context, state.parse_error);
+		gnumeric_io_go_error_info_set (io_context, state.parse_error);
 }
diff --git a/plugins/dif/dif.c b/plugins/dif/dif.c
index 204f85c..c221f48 100644
--- a/plugins/dif/dif.c
+++ b/plugins/dif/dif.c
@@ -265,11 +265,11 @@ dif_parse_sheet (DifInputContext *ctxt)
 	GnmLocale *locale = gnm_push_C_locale ();
 
 	if (!dif_parse_header (ctxt)) {
-		gnumeric_io_error_info_set (ctxt->io_context, error_info_new_printf (
+		gnumeric_io_go_error_info_set (ctxt->io_context, go_error_info_new_printf (
 		_("Unexpected end of file at line %d while reading header."),
 		ctxt->line_no));
 	} else if (!dif_parse_data(ctxt)) {
-		gnumeric_io_error_info_set (ctxt->io_context, error_info_new_printf (
+		gnumeric_io_go_error_info_set (ctxt->io_context, go_error_info_new_printf (
 		_("Unexpected end of file at line %d while reading data."),
 		ctxt->line_no));
 	}
@@ -290,7 +290,7 @@ dif_file_open (GOFileOpener const *fo, IOContext *io_context,
 		dif_parse_sheet (ctxt);
 		if (gnumeric_io_error_occurred (io_context))
 			gnumeric_io_error_push (io_context,
-				error_info_new_str (_("Error while reading DIF file.")));
+				go_error_info_new_str (_("Error while reading DIF file.")));
 		dif_input_context_destroy (ctxt);
 	} else if (!gnumeric_io_error_occurred (io_context))
 		gnumeric_io_error_unknown (io_context);
diff --git a/plugins/fn-date/functions.c b/plugins/fn-date/functions.c
index 002bdc0..7880606 100644
--- a/plugins/fn-date/functions.c
+++ b/plugins/fn-date/functions.c
@@ -117,7 +117,7 @@ gnumeric_date (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
 	gnm_date_add_days (&date, (int)day - 1);
 
 	if (!g_date_valid (&date) ||
-	    g_date_get_year (&date) < gnm_date_convention_base (conv) ||
+	    g_date_get_year (&date) < go_date_convention_base (conv) ||
 	    g_date_get_year (&date) >= 11900)
 		goto error;
 
@@ -678,7 +678,7 @@ gnumeric_days360 (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
 	if (!g_date_valid (&date1) || !g_date_valid (&date2))
 		return value_new_error_VALUE (ei->pos);
 
-	return value_new_int (days_between_basis (&date1, &date2, basis));
+	return value_new_int (go_datetime_days_between_basis (&date1, &date2, basis));
 }
 
 /***************************************************************************/
diff --git a/plugins/fn-financial/functions.c b/plugins/fn-financial/functions.c
index 87091d3..029fd25 100644
--- a/plugins/fn-financial/functions.c
+++ b/plugins/fn-financial/functions.c
@@ -2342,10 +2342,10 @@ date_ratio (GDate const *d1, const GDate *d2, const GDate *d3,
 		return gnm_nan;
 
 	if (g_date_compare (&next_coupon, d2) >= 0)
-		return days_between_basis (d1, d2, conv->basis) /
+		return go_datetime_days_between_basis (d1, d2, conv->basis) /
 			go_coupdays (&prev_coupon, &next_coupon, conv);
 
-	res = days_between_basis (d1, &next_coupon, conv->basis) /
+	res = go_datetime_days_between_basis (d1, &next_coupon, conv->basis) /
 		go_coupdays (&prev_coupon, &next_coupon, conv);
 	while (1) {
 		prev_coupon = next_coupon;
@@ -2353,7 +2353,7 @@ date_ratio (GDate const *d1, const GDate *d2, const GDate *d3,
 		if (!g_date_valid (&next_coupon))
 			return gnm_nan;
 		if (g_date_compare (&next_coupon, d2) >= 0) {
-			res += days_between_basis (&prev_coupon, d2, conv->basis) /
+			res += go_datetime_days_between_basis (&prev_coupon, d2, conv->basis) /
 				go_coupdays (&prev_coupon, &next_coupon, conv);
 			return res;
 		}
@@ -2368,9 +2368,9 @@ calc_oddfprice (const GDate *settlement, const GDate *maturity,
 		GnmCouponConvention const *conv)
 
 {
-	gnm_float a = days_between_basis (issue, settlement, conv->basis);
-	gnm_float ds = days_between_basis (settlement, first_coupon, conv->basis);
-	gnm_float df = days_between_basis (issue, first_coupon, conv->basis);
+	gnm_float a = go_datetime_days_between_basis (issue, settlement, conv->basis);
+	gnm_float ds = go_datetime_days_between_basis (settlement, first_coupon, conv->basis);
+	gnm_float df = go_datetime_days_between_basis (issue, first_coupon, conv->basis);
 	gnm_float e = go_coupdays (settlement, maturity, conv);
 	int n = (int)coupnum (settlement, maturity, conv);
 	gnm_float scale = 100.0 * rate / conv->freq;
@@ -2382,7 +2382,7 @@ calc_oddfprice (const GDate *settlement, const GDate *maturity,
 		switch (conv->basis) {
 		case BASIS_MSRB_30_360:
 		case BASIS_30E_360: {
-			int cdays = days_between_basis (first_coupon, maturity, conv->basis);
+			int cdays = go_datetime_days_between_basis (first_coupon, maturity, conv->basis);
 			n = 1 + (int)gnm_ceil (cdays / e);
 			break;
 		}
@@ -2394,7 +2394,7 @@ calc_oddfprice (const GDate *settlement, const GDate *maturity,
 				GDate prev_date = d;
 				gnm_date_add_months (&d, 12 / conv->freq);
 				if (g_date_compare (&d, maturity) >= 0) {
-					n += (int)gnm_ceil (days_between_basis (&prev_date, maturity, conv->basis) /
+					n += (int)gnm_ceil (go_datetime_days_between_basis (&prev_date, maturity, conv->basis) /
 							    go_coupdays (&prev_date, &d, conv))
 						+ 1;
 					break;
diff --git a/plugins/html/html_read.c b/plugins/html/html_read.c
index 93c829b..b067767 100644
--- a/plugins/html/html_read.c
+++ b/plugins/html/html_read.c
@@ -545,8 +545,8 @@ html_file_open (GOFileOpener const *fo, IOContext *io_context,
 			html_search_for_tables (ptr, doc, wb_view, &tc);
 		xmlFreeDoc (doc);
 	} else
-		gnumeric_io_error_info_set (io_context,
-			error_info_new_str (_("Unable to parse the html.")));
+		gnumeric_io_go_error_info_set (io_context,
+			go_error_info_new_str (_("Unable to parse the html.")));
 }
 
 /* Quick and dirty html probe. */
diff --git a/plugins/mps/mps.c b/plugins/mps/mps.c
index 5f7e317..38b28d4 100644
--- a/plugins/mps/mps.c
+++ b/plugins/mps/mps.c
@@ -638,7 +638,7 @@ mps_file_open (GOFileOpener const *fo, IOContext *io_context,
 	if (ctxt != NULL) {
 	        mps_parse_file (ctxt);
 		if (gnumeric_io_error_occurred (io_context)) {
-		        gnumeric_io_error_push (io_context, error_info_new_str
+		        gnumeric_io_error_push (io_context, go_error_info_new_str
 						(_("Error while reading MPS "
 						   "file.")));
 		} else
diff --git a/plugins/mps/parser.c b/plugins/mps/parser.c
index c631e64..531c988 100644
--- a/plugins/mps/parser.c
+++ b/plugins/mps/parser.c
@@ -538,34 +538,34 @@ void
 mps_parse_file (MpsInputContext *ctxt)
 {
         if (!mps_parse_name (ctxt)) {
-	        gnumeric_io_error_info_set
+	        gnumeric_io_go_error_info_set
 			(ctxt->io_context,
-			 error_info_new_printf (_("Problem name was not "
+			 go_error_info_new_printf (_("Problem name was not "
 						  "defined in the file.")));
 	} else if (!mps_parse_rows (ctxt)) {
-	        gnumeric_io_error_info_set
+	        gnumeric_io_go_error_info_set
 			(ctxt->io_context,
-			 error_info_new_printf (_("Invalid ROWS section in "
+			 go_error_info_new_printf (_("Invalid ROWS section in "
 						  "the file.")));
 	} else if (!mps_parse_columns (ctxt)) {
-	        gnumeric_io_error_info_set
+	        gnumeric_io_go_error_info_set
 			(ctxt->io_context,
-			 error_info_new_printf (_("Invalid COLUMNS section "
+			 go_error_info_new_printf (_("Invalid COLUMNS section "
 						  "in the file.")));
 	} else if (!mps_parse_rhs (ctxt)) {
-	        gnumeric_io_error_info_set
+	        gnumeric_io_go_error_info_set
 			(ctxt->io_context,
-			 error_info_new_printf (_("Invalid RHS section in the "
+			 go_error_info_new_printf (_("Invalid RHS section in the "
 						  "file.")));
 	} else if (!mps_parse_ranges (ctxt)) {
-	        gnumeric_io_error_info_set
+	        gnumeric_io_go_error_info_set
 			(ctxt->io_context,
-			 error_info_new_printf (_("Invalid RANGES section in "
+			 go_error_info_new_printf (_("Invalid RANGES section in "
 						  "the file.")));
 	} else if (!mps_parse_bounds (ctxt)) {
-	        gnumeric_io_error_info_set
+	        gnumeric_io_go_error_info_set
 			(ctxt->io_context,
-			 error_info_new_printf (_("Invalid BOUNDS section in "
+			 go_error_info_new_printf (_("Invalid BOUNDS section in "
 						  "the file.")));
 	}
 }
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index fed68e2..17b7dbe 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -2806,7 +2806,7 @@ odf_print_spreadsheet_content_prelude (GnmOOExport *state)
 	if (get_gsf_odf_version () > 101)
 		odf_add_bool (state->xml, TABLE "use-wildcards", FALSE);
 	gsf_xml_out_start_element (state->xml, TABLE "null-date");
-	if (gnm_date_convention_base (workbook_date_conv (state->wb)) == 1900)
+	if (go_date_convention_base (workbook_date_conv (state->wb)) == 1900)
 		/* As encouraged by the OpenFormula definition we "compensate" here. */
 		gsf_xml_out_add_cstr_unchecked (state->xml, TABLE "date-value", "1899-12-30");
 	else
diff --git a/plugins/paradox/paradox.c b/plugins/paradox/paradox.c
index f1a1bdf..c3b0b19 100644
--- a/plugins/paradox/paradox.c
+++ b/plugins/paradox/paradox.c
@@ -50,7 +50,7 @@ paradox_file_open (GOFileOpener const *fo, IOContext *io_context,
 	Sheet	  *sheet;
 	GnmCell	  *cell;
 	GnmValue	  *val = NULL;
-	ErrorInfo *open_error = NULL;
+	GOErrorInfo *open_error = NULL;
 	guint row, i, j, offset;
 
 #ifdef PX_MEMORY_DEBUGGING
@@ -63,7 +63,7 @@ paradox_file_open (GOFileOpener const *fo, IOContext *io_context,
 	pxdoc = PX_new2 (gn_errorhandler, gn_malloc, gn_realloc, gn_free);
 #endif
 	if (PX_open_gsf (pxdoc, input) < 0) {
-		gnumeric_io_error_info_set (io_context, error_info_new_str_with_details (
+		gnumeric_io_go_error_info_set (io_context, go_error_info_new_str_with_details (
 					    _("Error while opening Paradox file."),
 					    open_error));
 		return;
@@ -113,7 +113,7 @@ paradox_file_open (GOFileOpener const *fo, IOContext *io_context,
 	}
 
 	if ((data = (char *) pxdoc->malloc (pxdoc, pxh->px_recordsize, _("Could not allocate memory for record."))) == NULL) {
-		gnumeric_io_error_info_set (io_context, error_info_new_str_with_details (
+		gnumeric_io_go_error_info_set (io_context, go_error_info_new_str_with_details (
 					    _("Error while opening Paradox file."),
 					    open_error));
 		return;
diff --git a/plugins/perl-loader/boot.c b/plugins/perl-loader/boot.c
index c8e6f79..7b13565 100644
--- a/plugins/perl-loader/boot.c
+++ b/plugins/perl-loader/boot.c
@@ -13,10 +13,10 @@
 
 GNM_PLUGIN_MODULE_HEADER;
 
-GType perl_get_loader_type (ErrorInfo **ret_error);
+GType perl_get_loader_type (GOErrorInfo **ret_error);
 
 G_MODULE_EXPORT GType
-perl_get_loader_type (ErrorInfo **ret_error)
+perl_get_loader_type (GOErrorInfo **ret_error)
 {
 	GO_INIT_RET_ERROR_INFO (ret_error);
 	return gnm_perl_plugin_loader_get_type ();
diff --git a/plugins/perl-loader/perl-loader.c b/plugins/perl-loader/perl-loader.c
index b5a04b8..d84bb0b 100644
--- a/plugins/perl-loader/perl-loader.c
+++ b/plugins/perl-loader/perl-loader.c
@@ -179,7 +179,7 @@ gplp_func_desc_load (GOPluginService *service,
 }
 
 static void
-gplp_set_attributes (GOPluginLoader *loader, GHashTable *attrs, ErrorInfo **ret_error)
+gplp_set_attributes (GOPluginLoader *loader, GHashTable *attrs, GOErrorInfo **ret_error)
 {
 	GnmPerlPluginLoader *loader_perl = GNM_PERL_PLUGIN_LOADER (loader);
 
@@ -190,13 +190,13 @@ gplp_set_attributes (GOPluginLoader *loader, GHashTable *attrs, ErrorInfo **ret_
 	if (module_name) {
 		loader_perl->module_name = g_strdup (module_name);
 	} else {
-		*ret_error = error_info_new_str (
+		*ret_error = go_error_info_new_str (
 			     _("Module name not given."));
 	}
 }
 
 static void
-gplp_load_base (GOPluginLoader *loader, ErrorInfo **ret_error)
+gplp_load_base (GOPluginLoader *loader, GOErrorInfo **ret_error)
 {
 	char *argv[] = { (char*)"", NULL, NULL, NULL };
 	char const *arg;
@@ -217,7 +217,7 @@ gplp_load_base (GOPluginLoader *loader, ErrorInfo **ret_error)
 		PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
 #endif
 	} else {
-		*ret_error = error_info_new_printf (
+		*ret_error = go_error_info_new_printf (
 			     _("perl_func.pl doesn't exist."));
 	}
 
@@ -228,7 +228,7 @@ gplp_load_base (GOPluginLoader *loader, ErrorInfo **ret_error)
 static void
 gplp_load_service_function_group (GOPluginLoader *loader,
 				  GOPluginService *service,
-				  ErrorInfo **ret_error)
+				  GOErrorInfo **ret_error)
 {
 	PluginServiceFunctionGroupCallbacks *cbs;
 
@@ -241,7 +241,7 @@ gplp_load_service_function_group (GOPluginLoader *loader,
 }
 
 static gboolean
-gplp_service_load (GOPluginLoader *l, GOPluginService *s, ErrorInfo **err)
+gplp_service_load (GOPluginLoader *l, GOPluginService *s, GOErrorInfo **err)
 {
 	if (IS_GNM_PLUGIN_SERVICE_FUNCTION_GROUP (s))
 		gplp_load_service_function_group (l, s, err);
@@ -251,7 +251,7 @@ gplp_service_load (GOPluginLoader *l, GOPluginService *s, ErrorInfo **err)
 }
 
 static gboolean
-gplp_service_unload (GOPluginLoader *l, GOPluginService *s, ErrorInfo **err)
+gplp_service_unload (GOPluginLoader *l, GOPluginService *s, GOErrorInfo **err)
 {
 	if (IS_GNM_PLUGIN_SERVICE_FUNCTION_GROUP (s))
 		;
diff --git a/plugins/plan-perfect/pln.c b/plugins/plan-perfect/pln.c
index 512c5b2..1fb0850 100644
--- a/plugins/plan-perfect/pln.c
+++ b/plugins/plan-perfect/pln.c
@@ -483,7 +483,7 @@ pln_calc_font_width (guint16 cwidth, gboolean permit_default)
 	return (cwidth & 0xff) * FONT_WIDTH;
 }
 
-static ErrorInfo *
+static GOErrorInfo *
 pln_parse_sheet (GsfInput *input, PlanPerfectImport *state)
 {
 	int max_col = gnm_sheet_get_max_cols (state->sheet);
@@ -500,7 +500,7 @@ pln_parse_sheet (GsfInput *input, PlanPerfectImport *state)
 
 	data = gsf_input_read (input, 16, NULL);
 	if (data == NULL || GSF_LE_GET_GUINT16 (data + 12) != 0)
-		return error_info_new_str (_("PLN : Spreadsheet is password encrypted"));
+		return go_error_info_new_str (_("PLN : Spreadsheet is password encrypted"));
 
 	/* Process the record based sections
 	 * Each record consists of a two-byte record type code,
@@ -568,11 +568,11 @@ pln_parse_sheet (GsfInput *input, PlanPerfectImport *state)
 			return NULL;
 
 		if (pp.eval.row > max_row)
-			return error_info_new_printf (
+			return go_error_info_new_printf (
 				_("Ignoring data that claims to be in row %u which is > max row %u"),
 				pp.eval.row, max_row);
 		if (pp.eval.col > max_col)
-			return error_info_new_printf (
+			return go_error_info_new_printf (
 				_("Ignoring data that claims to be in column %u which is > max column %u"),
 				pp.eval.col, max_col);
 
@@ -659,7 +659,7 @@ pln_file_open (GOFileOpener const *fo, IOContext *io_context,
 	Workbook *wb;
 	char  *name;
 	Sheet *sheet;
-	ErrorInfo *error;
+	GOErrorInfo *error;
 	PlanPerfectImport state;
 
 	wb    = wb_view_get_workbook (wb_view);
@@ -677,6 +677,6 @@ pln_file_open (GOFileOpener const *fo, IOContext *io_context,
 	g_hash_table_destroy (state.styles);
 	if (error != NULL) {
 		workbook_sheet_delete (sheet);
-		gnumeric_io_error_info_set (io_context, error);
+		gnumeric_io_go_error_info_set (io_context, error);
 	}
 }
diff --git a/plugins/psiconv/psiconv-read.c b/plugins/psiconv/psiconv-read.c
index ad54581..83f895f 100644
--- a/plugins/psiconv/psiconv-read.c
+++ b/plugins/psiconv/psiconv-read.c
@@ -648,8 +648,8 @@ psiconv_read (IOContext *io_context, Workbook *wb, GsfInput *input)
 	psiconv_file   psi_file = NULL;
 
 	if ((buf = psiconv_stream_to_buffer (input, -1)) == NULL) {
-		gnumeric_io_error_info_set (io_context,
-		                            error_info_new_str(_("Error while reading psiconv file.")));
+		gnumeric_io_go_error_info_set (io_context,
+		                            go_error_info_new_str(_("Error while reading psiconv file.")));
 		goto out;
 	}
 
@@ -659,16 +659,16 @@ psiconv_read (IOContext *io_context, Workbook *wb, GsfInput *input)
 	psiconv_config_read(NULL,&config);
 	if (psiconv_parse(config, buf, &psi_file) != 0) {
 		psi_file = NULL;
-		gnumeric_io_error_info_set (io_context,
-		                            error_info_new_str(_("Error while parsing Psion file.")));
+		gnumeric_io_go_error_info_set (io_context,
+		                            go_error_info_new_str(_("Error while parsing Psion file.")));
 		goto out;
 	}
 
 	if (psi_file->type == psiconv_sheet_file)
 		add_sheetfile(wb,psi_file->file);
 	else
-		gnumeric_io_error_info_set (io_context,
-		                            error_info_new_str(_("This Psion file is not a Sheet file.")));
+		gnumeric_io_go_error_info_set (io_context,
+		                            go_error_info_new_str(_("This Psion file is not a Sheet file.")));
 
 
 out:
diff --git a/plugins/python-loader/boot.c b/plugins/python-loader/boot.c
index a64e723..616c4ae 100644
--- a/plugins/python-loader/boot.c
+++ b/plugins/python-loader/boot.c
@@ -16,9 +16,9 @@
 
 GNM_PLUGIN_MODULE_HEADER;
 
-GType python_get_loader_type (ErrorInfo **ret_error);
+GType python_get_loader_type (GOErrorInfo **ret_error);
 G_MODULE_EXPORT GType
-python_get_loader_type (ErrorInfo **ret_error)
+python_get_loader_type (GOErrorInfo **ret_error)
 {
 	GO_INIT_RET_ERROR_INFO (ret_error);
 	return TYPE_GNM_PYTHON_PLUGIN_LOADER;
diff --git a/plugins/python-loader/gnm-python.c b/plugins/python-loader/gnm-python.c
index 24a4d33..bc27cc8 100644
--- a/plugins/python-loader/gnm-python.c
+++ b/plugins/python-loader/gnm-python.c
@@ -116,7 +116,7 @@ gnm_python_class_init (GObjectClass *gobject_class)
  *      import gobject
  */
 static void
-gnm_init_pygobject (ErrorInfo **err)
+gnm_init_pygobject (GOErrorInfo **err)
 {
 	PyObject *pygtk, *mdict, *require, *ret, *gobject, *cobject;
 
@@ -125,14 +125,14 @@ gnm_init_pygobject (ErrorInfo **err)
 	pygtk = PyImport_ImportModule((char *) "pygtk");
 	if (pygtk == NULL) {
 		if (err != NULL)
-			*err = error_info_new_printf (_("Could not import %s."),
+			*err = go_error_info_new_printf (_("Could not import %s."),
 						      "pygtk");
 		return;
 	}
 	mdict = PyModule_GetDict (pygtk);
 	require = PyDict_GetItemString (mdict, (char *) "require");
 	if (!PyFunction_Check (require)) {
-		*err = error_info_new_printf (_("Could not find %s."),
+		*err = go_error_info_new_printf (_("Could not find %s."),
 					      "pygtk.require");
 		return;
 	} else {
@@ -140,21 +140,21 @@ gnm_init_pygobject (ErrorInfo **err)
 			(require, (char *) "O",
 			 PyString_FromString ((char *) "2.0"));
 		if (!ret) {
-			*err = error_info_new_printf (_("Could not initialize Python bindings for Gtk+, etc: %s"),
+			*err = go_error_info_new_printf (_("Could not initialize Python bindings for Gtk+, etc: %s"),
 						      py_exc_to_string ());
 			return;
 		}
 	}
 	gobject = PyImport_ImportModule((char *) "gobject");
 	if (gobject == NULL) {
-		*err = error_info_new_printf (_("Could not import %s."),
+		*err = go_error_info_new_printf (_("Could not import %s."),
 					      "gobject");
 		return;
 	}
         mdict = PyModule_GetDict(gobject);
         cobject = PyDict_GetItemString(mdict, (char *) "_PyGObject_API");
         if (!PyCObject_Check(cobject)) {
-		*err = error_info_new_printf (_("Could not find %s"),
+		*err = go_error_info_new_printf (_("Could not find %s"),
 					      "_PyGObject_API");
 		return;
         } else {
@@ -163,7 +163,7 @@ gnm_init_pygobject (ErrorInfo **err)
 }
 
 GnmPython *
-gnm_python_object_get (ErrorInfo **err)
+gnm_python_object_get (GOErrorInfo **err)
 {
 	GO_INIT_RET_ERROR_INFO (err);
 	if (!Py_IsInitialized ()) {
diff --git a/plugins/python-loader/gnm-python.h b/plugins/python-loader/gnm-python.h
index 63fd640..b27820b 100644
--- a/plugins/python-loader/gnm-python.h
+++ b/plugins/python-loader/gnm-python.h
@@ -12,7 +12,7 @@
 GType gnm_python_get_type (void);
 typedef struct _GnmPython GnmPython;
 
-GnmPython        *gnm_python_object_get (ErrorInfo **err);
+GnmPython        *gnm_python_object_get (GOErrorInfo **err);
 GnmPyInterpreter *gnm_python_new_interpreter (GnmPython *gpy, GOPlugin *plugin);
 void              gnm_python_destroy_interpreter (GnmPython *gpy, GnmPyInterpreter *interpreter);
 GnmPyInterpreter *gnm_python_get_current_interpreter (GnmPython *gpy);
diff --git a/plugins/python-loader/py-console.c b/plugins/python-loader/py-console.c
index 4f3c147..ce2a886 100644
--- a/plugins/python-loader/py-console.c
+++ b/plugins/python-loader/py-console.c
@@ -142,7 +142,7 @@ show_python_console (GnmAction const *action, WorkbookControl *wbc)
 	GtkWidget *vbox, *sc_win, *hbox, *sel, *cline, *w;
 	GtkTextIter enditer;
 	PangoFontDescription *font_desc;
-	ErrorInfo *err = NULL;
+	GOErrorInfo *err = NULL;
 
 	if (app != NULL) {
 		gtk_window_present (GTK_WINDOW (app->win));
@@ -152,7 +152,7 @@ show_python_console (GnmAction const *action, WorkbookControl *wbc)
 	sel = gnm_py_interpreter_selector_new (&err);
 	if (err != NULL) {
 		go_cmd_context_error_info (GO_CMD_CONTEXT (wbc), err);
-		error_info_free (err);
+		go_error_info_free (err);
 		return;
 	}
 	app = g_new (App, 1);
diff --git a/plugins/python-loader/py-interpreter-selector.c b/plugins/python-loader/py-interpreter-selector.c
index 690c376..571e9b1 100644
--- a/plugins/python-loader/py-interpreter-selector.c
+++ b/plugins/python-loader/py-interpreter-selector.c
@@ -217,7 +217,7 @@ gnm_py_interpreter_selector_class_init (GObjectClass *gobject_class)
 }
 
 GtkWidget *
-gnm_py_interpreter_selector_new (ErrorInfo **err)
+gnm_py_interpreter_selector_new (GOErrorInfo **err)
 {
 	GSList *interpreters;
 	GtkTreePath *path;
diff --git a/plugins/python-loader/py-interpreter-selector.h b/plugins/python-loader/py-interpreter-selector.h
index e9eacc5..7567e31 100644
--- a/plugins/python-loader/py-interpreter-selector.h
+++ b/plugins/python-loader/py-interpreter-selector.h
@@ -14,7 +14,7 @@
 GType gnm_py_interpreter_selector_get_type (void);
 typedef struct _GnmPyInterpreterSelector GnmPyInterpreterSelector;
 
-GtkWidget         *gnm_py_interpreter_selector_new (ErrorInfo **err);
+GtkWidget         *gnm_py_interpreter_selector_new (GOErrorInfo **err);
 GnmPyInterpreter  *gnm_py_interpreter_selector_get_current (GnmPyInterpreterSelector *sel);
 
 #endif /* PY_INTERPRETER_SELECTOR */
diff --git a/plugins/python-loader/python-loader.c b/plugins/python-loader/python-loader.c
index 6e272bf..acd68f6 100644
--- a/plugins/python-loader/python-loader.c
+++ b/plugins/python-loader/python-loader.c
@@ -57,7 +57,7 @@ typedef GObjectClass GnmPythonPluginLoaderClass;
 	gnm_py_interpreter_switch_to (PLUGIN_GET_LOADER (plugin)->py_interpreter_info)
 
 static void
-gplp_set_attributes (GOPluginLoader *loader, GHashTable *attrs, ErrorInfo **ret_error)
+gplp_set_attributes (GOPluginLoader *loader, GHashTable *attrs, GOErrorInfo **ret_error)
 {
 	GnmPythonPluginLoader *loader_python = GNM_PYTHON_PLUGIN_LOADER (loader);
 	gchar *module_name = NULL;
@@ -67,13 +67,13 @@ gplp_set_attributes (GOPluginLoader *loader, GHashTable *attrs, ErrorInfo **ret_
 	if (module_name != NULL) {
 		loader_python->module_name = g_strdup (module_name);
 	} else {
-		*ret_error = error_info_new_str (
+		*ret_error = go_error_info_new_str (
 		             _("Python module name not given."));
 	}
 }
 
 static FILE *
-gnumeric_fopen_error_info (const char *file_name, const char *mode, ErrorInfo **ret_error)
+gnumeric_fopen_error_info (const char *file_name, const char *mode, GOErrorInfo **ret_error)
 {
 	FILE *f;
 
@@ -85,21 +85,21 @@ gnumeric_fopen_error_info (const char *file_name, const char *mode, ErrorInfo **
 	f = g_fopen (file_name, mode);
 	if (f == NULL) {
 		if (strchr (mode, 'w') != NULL && strchr (mode, 'r') == NULL) {
-			*ret_error = error_info_new_printf (
+			*ret_error = go_error_info_new_printf (
 			             _("Error while opening file \"%s\" for writing."),
 			             file_name);
 		} else {
-			*ret_error = error_info_new_printf (
+			*ret_error = go_error_info_new_printf (
 			             _("Error while opening file \"%s\" for reading."),
 			             file_name);
 		}
-		error_info_add_details (*ret_error, error_info_new_from_errno ());
+		go_error_info_add_details (*ret_error, go_error_info_new_from_errno ());
 	}
 
 	return f;
 }
 static void
-gplp_load_base (GOPluginLoader *loader, ErrorInfo **ret_error)
+gplp_load_base (GOPluginLoader *loader, GOErrorInfo **ret_error)
 {
 	static gchar const *python_file_extensions[] = {"py", "pyc", "pyo", NULL};
 
@@ -110,7 +110,7 @@ gplp_load_base (GOPluginLoader *loader, ErrorInfo **ret_error)
 	gchar *full_module_file_name = NULL;
 	FILE *f;
 	GOPlugin *plugin = go_plugin_loader_get_plugin (loader);
-	ErrorInfo *open_error = NULL;
+	GOErrorInfo *open_error = NULL;
 	PyObject *modules, *main_module, *main_module_dict;
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
@@ -121,7 +121,7 @@ gplp_load_base (GOPluginLoader *loader, ErrorInfo **ret_error)
 		return;		/* gnm_python_object_get sets ret_error */
 	py_interpreter_info = gnm_python_new_interpreter (py_object, plugin);
 	if (py_interpreter_info == NULL) {
-		*ret_error = error_info_new_str (_("Cannot create new Python interpreter."));
+		*ret_error = go_error_info_new_str (_("Cannot create new Python interpreter."));
 		gnm_python_clear_error_if_needed (py_object);
 		g_object_unref (py_object);
 		return;
@@ -141,7 +141,7 @@ gplp_load_base (GOPluginLoader *loader, ErrorInfo **ret_error)
 			g_free (path);
 	}
 	if (full_module_file_name == NULL) {
-		*ret_error = error_info_new_printf (
+		*ret_error = go_error_info_new_printf (
 		             _("Module \"%s\" doesn't exist."),
 		             loader_python->module_name);
 		gnm_python_destroy_interpreter (py_object, py_interpreter_info);
@@ -159,7 +159,7 @@ gplp_load_base (GOPluginLoader *loader, ErrorInfo **ret_error)
 
 	if (PyRun_SimpleFile (f, loader_python->module_name) != 0) {
 		(void) fclose (f);
-		*ret_error = error_info_new_printf (
+		*ret_error = go_error_info_new_printf (
 		             _("Execution of module \"%s\" failed."),
 		             loader_python->module_name);
 		gnm_python_destroy_interpreter (py_object, py_interpreter_info);
@@ -181,7 +181,7 @@ gplp_load_base (GOPluginLoader *loader, ErrorInfo **ret_error)
 }
 
 static void
-gplp_unload_base (GOPluginLoader *loader, ErrorInfo **ret_error)
+gplp_unload_base (GOPluginLoader *loader, GOErrorInfo **ret_error)
 {
 	GnmPythonPluginLoader *loader_python = GNM_PYTHON_PLUGIN_LOADER (loader);
 	GOPlugin *plugin = go_plugin_loader_get_plugin (loader);
@@ -296,7 +296,7 @@ gplp_func_file_open (GOFileOpener const *fo,
 static void
 gplp_load_service_file_opener (GOPluginLoader *loader,
 			       GOPluginService *service,
-			       ErrorInfo **ret_error)
+			       GOErrorInfo **ret_error)
 {
 	GnmPythonPluginLoader *loader_python = GNM_PYTHON_PLUGIN_LOADER (loader);
 	gchar *func_name_file_probe, *func_name_file_open;
@@ -334,11 +334,11 @@ gplp_load_service_file_opener (GOPluginLoader *loader,
 			(G_OBJECT (service), "loader_data", loader_data,
 			 (GDestroyNotify) gplp_loader_data_opener_free);
 	} else {
-		*ret_error = error_info_new_printf (
+		*ret_error = go_error_info_new_printf (
 		             _("Python file \"%s\" has invalid format."),
 		             loader_python->module_name);
-		error_info_add_details (*ret_error,
-		                        error_info_new_printf (
+		go_error_info_add_details (*ret_error,
+		                        go_error_info_new_printf (
 		                        _("File doesn't contain \"%s\" function."),
 		                        func_name_file_open));
 	}
@@ -398,7 +398,7 @@ gplp_func_file_save (GOFileSaver const *fs, GOPluginService *service,
 static void
 gplp_load_service_file_saver (GOPluginLoader *loader,
 			      GOPluginService *service,
-			      ErrorInfo **ret_error)
+			      GOErrorInfo **ret_error)
 {
 	GnmPythonPluginLoader *loader_python = GNM_PYTHON_PLUGIN_LOADER (loader);
 	gchar *func_name_file_save;
@@ -427,12 +427,12 @@ gplp_load_service_file_saver (GOPluginLoader *loader,
 			(G_OBJECT (service), "loader_data", saver_data,
 			 (GDestroyNotify) gplp_loader_data_saver_free);
 	} else {
-		*ret_error = error_info_new_printf (
+		*ret_error = go_error_info_new_printf (
 		             _("Python file \"%s\" has invalid format."),
 		             loader_python->module_name);
 		if (python_func_file_save == NULL) {
-			error_info_add_details (*ret_error,
-			                        error_info_new_printf (
+			go_error_info_add_details (*ret_error,
+			                        go_error_info_new_printf (
 			                        _("File doesn't contain \"%s\" function."),
 			                        func_name_file_save));
 		}
@@ -629,7 +629,7 @@ gplp_func_desc_load (GOPluginService *service,
 static void
 gplp_load_service_function_group (GOPluginLoader *loader,
 				  GOPluginService *service,
-				  ErrorInfo **ret_error)
+				  GOErrorInfo **ret_error)
 {
 	GnmPythonPluginLoader *loader_python = GNM_PYTHON_PLUGIN_LOADER (loader);
 	gchar *fn_info_dict_name;
@@ -658,17 +658,17 @@ gplp_load_service_function_group (GOPluginLoader *loader,
 			(G_OBJECT (service), "loader_data", loader_data,
 			 (GDestroyNotify) gplp_loader_data_fngroup_free);
 	} else {
-		*ret_error = error_info_new_printf (
+		*ret_error = go_error_info_new_printf (
 		             _("Python file \"%s\" has invalid format."),
 		             loader_python->module_name);
 		if (python_fn_info_dict == NULL) {
-			error_info_add_details (*ret_error,
-			                        error_info_new_printf (
+			go_error_info_add_details (*ret_error,
+			                        go_error_info_new_printf (
 			                        _("File doesn't contain \"%s\" dictionary."),
 			                        fn_info_dict_name));
 		} else if (!PyDict_Check (python_fn_info_dict)) {
-			error_info_add_details (*ret_error,
-			                        error_info_new_printf (
+			go_error_info_add_details (*ret_error,
+			                        go_error_info_new_printf (
 			                        _("Object \"%s\" is not a dictionary."),
 			                        fn_info_dict_name));
 		}
@@ -679,7 +679,7 @@ gplp_load_service_function_group (GOPluginLoader *loader,
 static void
 gplp_unload_service_function_group (GOPluginLoader *loader,
 				    GOPluginService *service,
-				    ErrorInfo **ret_error)
+				    GOErrorInfo **ret_error)
 {
 	ServiceLoaderDataFunctionGroup *loader_data;
 
@@ -707,7 +707,7 @@ static void
 gplp_func_exec_action (GOPluginService *service,
 		       GnmAction const *action,
 		       WorkbookControl *wbc,
-		       ErrorInfo **ret_error)
+		       GOErrorInfo **ret_error)
 {
 	ServiceLoaderDataUI *loader_data;
 	PyObject *fn, *ret;
@@ -719,18 +719,18 @@ gplp_func_exec_action (GOPluginService *service,
 	SWITCH_TO_PLUGIN (plugin_service_get_plugin (service));
 	fn = PyDict_GetItemString (loader_data->ui_actions, action->id);
 	if (fn == NULL) {
-		*ret_error = error_info_new_printf (_("Unknown action: %s"),
+		*ret_error = go_error_info_new_printf (_("Unknown action: %s"),
 						    action->id);
 		return;
 	} else if (!PyFunction_Check (fn)) {
-		*ret_error = error_info_new_printf (
+		*ret_error = go_error_info_new_printf (
 			_("Not a valid function for action: %s"), action->id);
 		return;
 	}
 	ret = PyObject_CallFunction (fn, (char *) "N",
 				     py_new_Gui_object (WBC_GTK (wbc)));
 	if (ret == NULL) {
-		*ret_error = error_info_new_str (py_exc_to_string ());
+		*ret_error = go_error_info_new_str (py_exc_to_string ());
 		PyErr_Clear ();
 	} else {
 		Py_DECREF (ret);
@@ -740,7 +740,7 @@ gplp_func_exec_action (GOPluginService *service,
 static void
 gplp_load_service_ui (GOPluginLoader *loader,
 		      GOPluginService *service,
-		      ErrorInfo **ret_error)
+		      GOErrorInfo **ret_error)
 {
 
 	GnmPythonPluginLoader *loader_python = GNM_PYTHON_PLUGIN_LOADER (loader);
@@ -770,17 +770,17 @@ gplp_load_service_ui (GOPluginLoader *loader,
 			(G_OBJECT (service), "loader_data", loader_data,
 			 (GDestroyNotify) gplp_loader_data_ui_free);
 	} else {
-		*ret_error = error_info_new_printf (
+		*ret_error = go_error_info_new_printf (
 		             _("Python file \"%s\" has invalid format."),
 		             loader_python->module_name);
 		if (ui_actions == NULL) {
-			error_info_add_details (*ret_error,
-			                        error_info_new_printf (
+			go_error_info_add_details (*ret_error,
+			                        go_error_info_new_printf (
 			                        _("File doesn't contain \"%s\" dictionary."),
 			                        ui_action_names));
 		} else if (!PyDict_Check (ui_actions)) {
-			error_info_add_details (*ret_error,
-			                        error_info_new_printf (
+			go_error_info_add_details (*ret_error,
+			                        go_error_info_new_printf (
 			                        _("Object \"%s\" is not a dictionary."),
 			                        ui_action_names));
 		}
@@ -789,7 +789,7 @@ gplp_load_service_ui (GOPluginLoader *loader,
 }
 
 static gboolean
-gplp_service_load (GOPluginLoader *l, GOPluginService *s, ErrorInfo **err)
+gplp_service_load (GOPluginLoader *l, GOPluginService *s, GOErrorInfo **err)
 {
 	if (IS_GNM_PLUGIN_SERVICE_FUNCTION_GROUP (s))
 		gplp_load_service_function_group (l, s, err);
@@ -801,7 +801,7 @@ gplp_service_load (GOPluginLoader *l, GOPluginService *s, ErrorInfo **err)
 }
 
 static gboolean
-gplp_service_unload (GOPluginLoader *l, GOPluginService *s, ErrorInfo **err)
+gplp_service_unload (GOPluginLoader *l, GOPluginService *s, GOErrorInfo **err)
 {
 	if (IS_GNM_PLUGIN_SERVICE_FUNCTION_GROUP (s))
 		;
diff --git a/plugins/sc/sc.c b/plugins/sc/sc.c
index b544f9b..4bdf5e1 100644
--- a/plugins/sc/sc.c
+++ b/plugins/sc/sc.c
@@ -510,11 +510,11 @@ sc_parse_line (ScParseState *state, char *buf)
 }
 
 
-static ErrorInfo *
+static GOErrorInfo *
 sc_parse_sheet (ScParseState *state)
 {
 	unsigned char *data;
-	ErrorInfo *res = NULL;
+	GOErrorInfo *res = NULL;
 
 	while ((data = gsf_input_textline_ascii_gets (state->textline)) != NULL) {
 		char *utf8data;
@@ -525,7 +525,7 @@ sc_parse_sheet (ScParseState *state)
 
 		if (g_ascii_isalpha (*data) && !sc_parse_line (state, utf8data)) {
 			if (!res)
-				res = error_info_new_str
+				res = go_error_info_new_str
 					(_("Error parsing line"));
 		}
 
@@ -600,7 +600,7 @@ sc_file_open (GOFileOpener const *fo, IOContext *io_context,
 {
 	Workbook  *wb;
 	char      *name;
-	ErrorInfo *error;
+	GOErrorInfo *error;
 	ScParseState state;
 
 	wb = wb_view_get_workbook (wb_view);
@@ -617,7 +617,7 @@ sc_file_open (GOFileOpener const *fo, IOContext *io_context,
 	error = sc_parse_sheet (&state);
 	if (error != NULL) {
 		workbook_sheet_delete (state.sheet);
-		gnumeric_io_error_info_set (io_context, error);
+		gnumeric_io_go_error_info_set (io_context, error);
 	}
 	g_object_unref (G_OBJECT (state.textline));
 	g_iconv_close (state.converter);
diff --git a/plugins/xbase/boot.c b/plugins/xbase/boot.c
index 30dded9..28ca45b 100644
--- a/plugins/xbase/boot.c
+++ b/plugins/xbase/boot.c
@@ -151,12 +151,12 @@ xbase_file_open (GOFileOpener const *fo, IOContext *io_context,
 	XBfile	  *file;
 	XBrecord  *record;
 	Sheet	  *sheet = NULL;
-	ErrorInfo *open_error;
+	GOErrorInfo *open_error;
 	int rows = GNM_MAX_ROWS;
 	int pass;
 
 	if ((file = xbase_open (input, &open_error)) == NULL) {
-		gnumeric_io_error_info_set (io_context, error_info_new_str_with_details (
+		gnumeric_io_go_error_info_set (io_context, go_error_info_new_str_with_details (
 		                            _("Error while opening xbase file."),
 		                            open_error));
 		return;
diff --git a/plugins/xbase/xbase.c b/plugins/xbase/xbase.c
index 291daa7..f27a920 100644
--- a/plugins/xbase/xbase.c
+++ b/plugins/xbase/xbase.c
@@ -107,7 +107,7 @@ record_deleted (XBrecord *record)
 }
 
 static void
-xbase_read_header (XBfile *x, ErrorInfo **ret_error)
+xbase_read_header (XBfile *x, GOErrorInfo **ret_error)
 {
 	static struct {
 		guint8 const id;
@@ -146,7 +146,7 @@ xbase_read_header (XBfile *x, ErrorInfo **ret_error)
 	guint8 hdr[32];
 
 	if (gsf_input_read (x->input, 32, hdr) == NULL) {
-		*ret_error = error_info_new_str (_("Failed to read DBF header."));
+		*ret_error = go_error_info_new_str (_("Failed to read DBF header."));
 		return;
 	}
 
@@ -296,7 +296,7 @@ xbase_field_new (XBfile *file)
 }
 
 XBfile *
-xbase_open (GsfInput *input, ErrorInfo **ret_error)
+xbase_open (GsfInput *input, GOErrorInfo **ret_error)
 {
 	XBfile *ans;
 	guint allocated = GNM_DEFAULT_COLS;
diff --git a/plugins/xbase/xbase.h b/plugins/xbase/xbase.h
index fe8e185..b2f61d4 100644
--- a/plugins/xbase/xbase.h
+++ b/plugins/xbase/xbase.h
@@ -35,7 +35,7 @@ void      record_free (XBrecord *record);
 gchar	*record_get_field (XBrecord const *record, guint num);
 gboolean  record_deleted (XBrecord *record);
 
-XBfile *xbase_open (GsfInput *input, ErrorInfo **ret_error);
+XBfile *xbase_open (GsfInput *input, GOErrorInfo **ret_error);
 void    xbase_close (XBfile *file);
 
 #endif
diff --git a/src/command-context-stderr.c b/src/command-context-stderr.c
index 1e94a9e..aedf45a 100644
--- a/src/command-context-stderr.c
+++ b/src/command-context-stderr.c
@@ -57,11 +57,11 @@ ccs_error_error (GOCmdContext *cc, GError *error)
 	ccs->status = -1;
 }
 static void
-ccs_error_info (GOCmdContext *cc, ErrorInfo *error)
+ccs_error_info (GOCmdContext *cc, GOErrorInfo *error)
 {
 	CmdContextStderr *ccs = COMMAND_CONTEXT_STDERR (cc);
 
-	error_info_print (error);
+	go_error_info_print (error);
 	ccs->status = -1;
 }
 
diff --git a/src/dialogs/dialog-plugin-manager.c b/src/dialogs/dialog-plugin-manager.c
index d105739..36ecf96 100644
--- a/src/dialogs/dialog-plugin-manager.c
+++ b/src/dialogs/dialog-plugin-manager.c
@@ -163,7 +163,7 @@ set_plugin_model_row (PluginManagerGUI *pm_gui, GtkTreeIter *iter, GOPlugin *plu
 static void
 cb_pm_button_rescan_directories_clicked (PluginManagerGUI *pm_gui)
 {
-	ErrorInfo *error;
+	GOErrorInfo *error;
 	GSList *new_plugins, *l;
 	GtkTreeModel *model = GTK_TREE_MODEL (pm_gui->model_plugins);
 	GtkTreeIter iter, new_iter;
@@ -172,7 +172,7 @@ cb_pm_button_rescan_directories_clicked (PluginManagerGUI *pm_gui)
 	go_plugins_rescan (&error, &new_plugins);
 	if (error != NULL) {
 		go_cmd_context_error_info (pm_gui->cc, error);
-		error_info_free (error);
+		go_error_info_free (error);
 	}
 	GO_SLIST_SORT (new_plugins, plugin_compare_name);
 	for (has_iter = gtk_tree_model_get_iter_first (model, &iter), l = new_plugins;
@@ -481,16 +481,16 @@ static void
 cb_pm_button_activate_all_clicked (G_GNUC_UNUSED GtkButton *button,
 				   PluginManagerGUI *pm_gui)
 {
-	ErrorInfo *activation_error, *error;
+	GOErrorInfo *activation_error, *error;
 
 	go_plugin_db_activate_plugin_list (
 		go_plugins_get_available_plugins (), &activation_error);
 	if (activation_error != NULL) {
-		error = error_info_new_str_with_details (
+		error = go_error_info_new_str_with_details (
 			_("Errors while activating plugins"), activation_error);
-		gnumeric_error_info_dialog_show (
+		gnumeric_go_error_info_dialog_show (
 			GTK_WINDOW (pm_gui->dialog_pm), error);
-		error_info_free (error);
+		go_error_info_free (error);
 	}
 }
 
@@ -562,7 +562,7 @@ cb_active_toggled (G_GNUC_UNUSED GtkCellRendererToggle *celltoggle,
 	GtkTreeModel *model;
 	GtkTreeIter iter;
 	GOPlugin *plugin;
-	ErrorInfo *error;
+	GOErrorInfo *error;
 	gboolean has_iter;
 
 	model = gtk_tree_view_get_model (pm_gui->list_plugins);
@@ -615,18 +615,18 @@ cb_active_toggled (G_GNUC_UNUSED GtkCellRendererToggle *celltoggle,
 		}
 	}
 	if (error != NULL) {
-		ErrorInfo *new_error;
+		GOErrorInfo *new_error;
 
 		if (go_plugin_is_active (plugin)) {
-			new_error = error_info_new_printf (
+			new_error = go_error_info_new_printf (
 				_("Error while deactivating plugin \"%s\"."),
 				go_plugin_get_name (plugin));
 		} else {
-			new_error = error_info_new_printf (
+			new_error = go_error_info_new_printf (
 				_("Error while activating plugin \"%s\"."),
 				go_plugin_get_name (plugin));
 		}
-		error_info_add_details (new_error, error);
+		go_error_info_add_details (new_error, error);
 		go_cmd_context_error_info (pm_gui->cc, new_error);
 	}
 }
diff --git a/src/gnm-datetime.c b/src/gnm-datetime.c
index 10999da..a341eb6 100644
--- a/src/gnm-datetime.c
+++ b/src/gnm-datetime.c
@@ -158,7 +158,7 @@ yearfrac (GDate const *from, GDate const *to, basis_t basis)
 	if (!g_date_valid (from) || !g_date_valid (to))
 		return gnm_nan;
 
-	days = days_between_basis (from, to, basis);
+	days = go_datetime_days_between_basis (from, to, basis);
 
 	if (days < 0) {
 		const GDate *tmp;
diff --git a/src/gnm-plugin.c b/src/gnm-plugin.c
index 295b65a..3a67f44 100644
--- a/src/gnm-plugin.c
+++ b/src/gnm-plugin.c
@@ -55,7 +55,7 @@ plugin_service_function_group_finalize (GObject *obj)
 }
 
 static void
-plugin_service_function_group_read_xml (GOPluginService *service, xmlNode *tree, ErrorInfo **ret_error)
+plugin_service_function_group_read_xml (GOPluginService *service, xmlNode *tree, GOErrorInfo **ret_error)
 {
 	xmlNode *category_node, *translated_category_node, *functions_node;
 	gchar *category_name, *translated_category_name;
@@ -117,15 +117,15 @@ plugin_service_function_group_read_xml (GOPluginService *service, xmlNode *tree,
 		GSList *error_list = NULL;
 
 		if (category_name == NULL) {
-			GO_SLIST_PREPEND (error_list, error_info_new_str (
+			GO_SLIST_PREPEND (error_list, go_error_info_new_str (
 				_("Missing function category name.")));
 		}
 		if (function_name_list == NULL) {
-			GO_SLIST_PREPEND (error_list, error_info_new_str (
+			GO_SLIST_PREPEND (error_list, go_error_info_new_str (
 				_("Function group is empty.")));
 		}
 		GO_SLIST_REVERSE (error_list);
-		*ret_error = error_info_new_from_error_list (error_list);
+		*ret_error = go_error_info_new_from_error_list (error_list);
 
 		g_free (category_name);
 		g_free (translated_category_name);
@@ -141,20 +141,20 @@ plugin_service_function_group_func_desc_load (GnmFunc const *fn_def,
 {
 	GOPluginService	*service = gnm_func_get_user_data (fn_def);
 	PluginServiceFunctionGroup *sfg = GNM_PLUGIN_SERVICE_FUNCTION_GROUP (service);
-	ErrorInfo *error = NULL;
+	GOErrorInfo *error = NULL;
 
 	g_return_val_if_fail (fn_def != NULL, FALSE);
 
 	plugin_service_load (service, &error);
 	if (error != NULL) {
-		error_info_print (error);
-		error_info_free (error);
+		go_error_info_print (error);
+		go_error_info_free (error);
 		return FALSE;
 	}
 	if (NULL == sfg->cbs.func_desc_load) {
-                error = error_info_new_printf (_("No func_desc_load method.\n"));
-		error_info_print (error);
-		error_info_free (error);
+                error = go_error_info_new_printf (_("No func_desc_load method.\n"));
+		go_error_info_print (error);
+		go_error_info_free (error);
 		return FALSE;
 	}
 	return sfg->cbs.func_desc_load (service,
@@ -177,7 +177,7 @@ plugin_service_function_group_func_ref_notify  (GnmFunc *fn_def, int refcount)
 }
 
 static void
-plugin_service_function_group_activate (GOPluginService *service, ErrorInfo **ret_error)
+plugin_service_function_group_activate (GOPluginService *service, GOErrorInfo **ret_error)
 {
 	PluginServiceFunctionGroup *sfg =
 		GNM_PLUGIN_SERVICE_FUNCTION_GROUP (service);
@@ -198,7 +198,7 @@ plugin_service_function_group_activate (GOPluginService *service, ErrorInfo **re
 }
 
 static void
-plugin_service_function_group_deactivate (GOPluginService *service, ErrorInfo **ret_error)
+plugin_service_function_group_deactivate (GOPluginService *service, GOErrorInfo **ret_error)
 {
 	PluginServiceFunctionGroup *sfg = GNM_PLUGIN_SERVICE_FUNCTION_GROUP (service);
 
@@ -299,28 +299,28 @@ plugin_service_ui_finalize (GObject *obj)
 static void
 cb_ui_service_activate (GnmAction const *action, WorkbookControl *wbc, GOPluginService *service)
 {
-	ErrorInfo *load_error = NULL;
+	GOErrorInfo *load_error = NULL;
 
 	plugin_service_load (service, &load_error);
 	if (load_error == NULL) {
 		PluginServiceUI *service_ui = GNM_PLUGIN_SERVICE_UI (service);
-		ErrorInfo *ignored_error = NULL;
+		GOErrorInfo *ignored_error = NULL;
 
 		g_return_if_fail (service_ui->cbs.plugin_func_exec_action != NULL);
 		service_ui->cbs.plugin_func_exec_action (
 			service, action, wbc, &ignored_error);
 		if (ignored_error != NULL) {
-			error_info_print (ignored_error);
-			error_info_free (ignored_error);
+			go_error_info_print (ignored_error);
+			go_error_info_free (ignored_error);
 		}
 	} else {
-		error_info_print (load_error);
-		error_info_free (load_error);
+		go_error_info_print (load_error);
+		go_error_info_free (load_error);
 	}
 }
 
 static void
-plugin_service_ui_read_xml (GOPluginService *service, xmlNode *tree, ErrorInfo **ret_error)
+plugin_service_ui_read_xml (GOPluginService *service, xmlNode *tree, GOErrorInfo **ret_error)
 {
 	PluginServiceUI *service_ui = GNM_PLUGIN_SERVICE_UI (service);
 	xmlChar *file_name;
@@ -330,7 +330,7 @@ plugin_service_ui_read_xml (GOPluginService *service, xmlNode *tree, ErrorInfo *
 	GO_INIT_RET_ERROR_INFO (ret_error);
 	file_name = xml_node_get_cstr (tree, "file");
 	if (file_name == NULL) {
-		*ret_error = error_info_new_str (
+		*ret_error = go_error_info_new_str (
 		             _("Missing file name."));
 		return;
 	}
@@ -366,7 +366,7 @@ plugin_service_ui_read_xml (GOPluginService *service, xmlNode *tree, ErrorInfo *
 }
 
 static void
-plugin_service_ui_activate (GOPluginService *service, ErrorInfo **ret_error)
+plugin_service_ui_activate (GOPluginService *service, GOErrorInfo **ret_error)
 {
 	PluginServiceUI *service_ui = GNM_PLUGIN_SERVICE_UI (service);
 	GError *err = NULL;
@@ -379,7 +379,7 @@ plugin_service_ui_activate (GOPluginService *service, ErrorInfo **ret_error)
 		go_plugin_get_dir_name (service->plugin),
 		service_ui->file_name, NULL);
 	if (!g_file_get_contents (full_file_name, &xml_ui, NULL, &err)) {
-		*ret_error = error_info_new_printf
+		*ret_error = go_error_info_new_printf
 			(_("Cannot read UI description from XML file %s: %s"),
 			 full_file_name,
 			 err ? err->message : "?");
@@ -401,7 +401,7 @@ plugin_service_ui_activate (GOPluginService *service, ErrorInfo **ret_error)
 }
 
 static void
-plugin_service_ui_deactivate (GOPluginService *service, ErrorInfo **ret_error)
+plugin_service_ui_deactivate (GOPluginService *service, GOErrorInfo **ret_error)
 {
 	PluginServiceUI *service_ui = GNM_PLUGIN_SERVICE_UI (service);
 
@@ -489,7 +489,7 @@ gnm_plugin_loader_module_func_desc_load (GOPluginService *service,
 static void
 gnm_plugin_loader_module_load_service_function_group (GOPluginLoader  *loader,
 						      GOPluginService *service,
-						      ErrorInfo **ret_error)
+						      GOErrorInfo **ret_error)
 {
 	GnmPluginLoaderModule *loader_module = GNM_PLUGIN_LOADER_MODULE (loader);
 	gchar *fn_info_array_name;
@@ -520,11 +520,11 @@ gnm_plugin_loader_module_load_service_function_group (GOPluginLoader  *loader,
 		g_object_set_data_full (
 			G_OBJECT (service), "loader_data", loader_data, function_group_loader_data_free);
 	} else {
-		*ret_error = error_info_new_printf (
+		*ret_error = go_error_info_new_printf (
 		             _("Module file \"%s\" has invalid format."),
 		             loader_module->module_file_name);
-		error_info_add_details (*ret_error,
-					error_info_new_printf (
+		go_error_info_add_details (*ret_error,
+					go_error_info_new_printf (
 					_("File doesn't contain \"%s\" array."),
 					fn_info_array_name));
 	}
@@ -553,7 +553,7 @@ static void
 gnm_plugin_loader_module_func_exec_action (GOPluginService *service,
 					   GnmAction const *action,
 					   WorkbookControl *wbc,
-					   ErrorInfo **ret_error)
+					   GOErrorInfo **ret_error)
 {
 	ServiceLoaderDataUI *loader_data;
 	gpointer action_index_ptr;
@@ -565,7 +565,7 @@ gnm_plugin_loader_module_func_exec_action (GOPluginService *service,
 	loader_data = g_object_get_data (G_OBJECT (service), "loader_data");
 	if (!g_hash_table_lookup_extended (loader_data->ui_actions_hash, action->id,
 	                                   NULL, &action_index_ptr)) {
-		*ret_error = error_info_new_printf (_("Unknown action: %s"), action->id);
+		*ret_error = go_error_info_new_printf (_("Unknown action: %s"), action->id);
 		return;
 	}
 	action_index = GPOINTER_TO_INT (action_index_ptr);
@@ -576,7 +576,7 @@ gnm_plugin_loader_module_func_exec_action (GOPluginService *service,
 static void
 gnm_plugin_loader_module_load_service_ui (GOPluginLoader *loader,
 					  GOPluginService *service,
-					  ErrorInfo **ret_error)
+					  GOErrorInfo **ret_error)
 {
 	GnmPluginLoaderModule *loader_module = GNM_PLUGIN_LOADER_MODULE (loader);
 	char *ui_actions_array_name;
@@ -592,10 +592,10 @@ gnm_plugin_loader_module_load_service_ui (GOPluginLoader *loader,
 		plugin_service_get_id (service), "_ui_actions", NULL);
 	g_module_symbol (loader_module->handle, ui_actions_array_name, (gpointer) &module_ui_actions_array);
 	if (module_ui_actions_array == NULL) {
-		*ret_error = error_info_new_printf (
+		*ret_error = go_error_info_new_printf (
 			_("Module file \"%s\" has invalid format."),
 			loader_module->module_file_name);
-		error_info_add_details (*ret_error, error_info_new_printf (
+		go_error_info_add_details (*ret_error, go_error_info_new_printf (
 			_("File doesn't contain \"%s\" array."), ui_actions_array_name));
 		g_free (ui_actions_array_name);
 		return;
@@ -617,7 +617,7 @@ gnm_plugin_loader_module_load_service_ui (GOPluginLoader *loader,
 }
 
 static gboolean
-gplm_service_load (GOPluginLoader *l, GOPluginService *s, ErrorInfo **err)
+gplm_service_load (GOPluginLoader *l, GOPluginService *s, GOErrorInfo **err)
 {
 	if (IS_GNM_PLUGIN_SERVICE_FUNCTION_GROUP (s))
 		gnm_plugin_loader_module_load_service_function_group (l, s, err);
@@ -629,7 +629,7 @@ gplm_service_load (GOPluginLoader *l, GOPluginService *s, ErrorInfo **err)
 }
 
 static gboolean
-gplm_service_unload (GOPluginLoader *l, GOPluginService *s, ErrorInfo **err)
+gplm_service_unload (GOPluginLoader *l, GOPluginService *s, GOErrorInfo **err)
 {
 	if (IS_GNM_PLUGIN_SERVICE_FUNCTION_GROUP (s)) {
 		PluginServiceFunctionGroupCallbacks *cbs = plugin_service_get_cbs (s);
diff --git a/src/gnm-plugin.h b/src/gnm-plugin.h
index 6c928f8..92de539 100644
--- a/src/gnm-plugin.h
+++ b/src/gnm-plugin.h
@@ -35,7 +35,7 @@ typedef struct _PluginServiceUI PluginServiceUI;
 typedef struct {
 	void (*plugin_func_exec_action) (
 		GOPluginService *service, GnmAction const *action,
-		WorkbookControl *wbc, ErrorInfo **ret_error);
+		WorkbookControl *wbc, GOErrorInfo **ret_error);
 } PluginServiceUICallbacks;
 
 /* This type is intended for use with "ui" service.
diff --git a/src/gui-util.c b/src/gui-util.c
index 43e7b18..cafb53d 100644
--- a/src/gui-util.c
+++ b/src/gui-util.c
@@ -38,9 +38,9 @@
 #define ERROR_INFO_TAG_NAME "errorinfotag%i"
 
 static void
-insert_error_info (GtkTextBuffer* text, ErrorInfo *error, gint level)
+insert_error_info (GtkTextBuffer* text, GOErrorInfo *error, gint level)
 {
-	gchar *message = (gchar *) error_info_peek_message (error);
+	gchar *message = (gchar *) go_error_info_peek_message (error);
 	GSList *details_list, *l;
 	GtkTextIter start, last;
 	gchar *tag_name = g_strdup_printf (ERROR_INFO_TAG_NAME,
@@ -55,21 +55,21 @@ insert_error_info (GtkTextBuffer* text, ErrorInfo *error, gint level)
 						  tag_name, NULL);
 	g_free (tag_name);
 	g_free (message);
-	details_list = error_info_peek_details (error);
+	details_list = go_error_info_peek_details (error);
 	for (l = details_list; l != NULL; l = l->next) {
-		ErrorInfo *detail_error = l->data;
+		GOErrorInfo *detail_error = l->data;
 		insert_error_info (text, detail_error, level + 1);
 	}
 	return;
 }
 
 /**
- * gnumeric_error_info_dialog_new
+ * gnumeric_go_error_info_dialog_new
  *
  * SHOULD BE IN GOFFICE
  */
 GtkWidget *
-gnumeric_error_info_dialog_new (ErrorInfo *error)
+gnumeric_go_error_info_dialog_new (GOErrorInfo *error)
 {
 	GtkWidget *dialog;
 	GtkWidget *scrolled_window;
@@ -83,12 +83,12 @@ gnumeric_error_info_dialog_new (ErrorInfo *error)
 
 	g_return_val_if_fail (error != NULL, NULL);
 
-	message = (gchar *) error_info_peek_message (error);
+	message = (gchar *) go_error_info_peek_message (error);
 	if (message == NULL)
 		bf_lim++;
 
 	mtype = GTK_MESSAGE_ERROR;
-	if (error_info_peek_severity (error) < GO_ERROR)
+	if (go_error_info_peek_severity (error) < GO_ERROR)
 		mtype = GTK_MESSAGE_WARNING;
 	dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
 					 mtype, GTK_BUTTONS_CLOSE, " ");
@@ -134,13 +134,13 @@ gnumeric_error_info_dialog_new (ErrorInfo *error)
 }
 
 /**
- * gnumeric_error_info_dialog_show
+ * gnumeric_go_error_info_dialog_show
  *
  */
 void
-gnumeric_error_info_dialog_show (GtkWindow *parent, ErrorInfo *error)
+gnumeric_go_error_info_dialog_show (GtkWindow *parent, GOErrorInfo *error)
 {
-	GtkWidget *dialog = gnumeric_error_info_dialog_new (error);
+	GtkWidget *dialog = gnumeric_go_error_info_dialog_new (error);
 	go_gtk_dialog_run (GTK_DIALOG (dialog), parent);
 }
 
@@ -1378,20 +1378,20 @@ gnm_check_for_plugins_missing (char const **ids, GtkWindow *parent)
 	for (; *ids != NULL; ids++) {
 		GOPlugin *pi = go_plugins_get_plugin_by_id (*ids);
 		if (pi == NULL) {
-			ErrorInfo *error;
-			error = error_info_new_printf 
+			GOErrorInfo *error;
+			error = go_error_info_new_printf 
 				(_("The plugin with id %s is required "
 				   "but cannot be found."), *ids);
-			gnumeric_error_info_dialog_show (parent,
+			gnumeric_go_error_info_dialog_show (parent,
 							 error);
 			return TRUE;
 		} else if (!go_plugin_is_active (pi)) {
-			ErrorInfo *error;
-			error = error_info_new_printf 
+			GOErrorInfo *error;
+			error = go_error_info_new_printf 
 				(_("The %s plugin is required "
 				   "but is not loaded."), 
 				 go_plugin_get_name (pi));
-			gnumeric_error_info_dialog_show (parent,
+			gnumeric_go_error_info_dialog_show (parent,
 							 error);
 			return TRUE;			
 		}
diff --git a/src/gui-util.h b/src/gui-util.h
index df13020..45e4863 100644
--- a/src/gui-util.h
+++ b/src/gui-util.h
@@ -16,9 +16,9 @@ G_BEGIN_DECLS
 #define GNM_ACTION_DEF(name)			\
 	void name (GtkAction *a, WBCGtk *wbcg)
 
-GtkWidget* gnumeric_error_info_dialog_new (ErrorInfo *error);
-void       gnumeric_error_info_dialog_show (GtkWindow *parent,
-                                            ErrorInfo *error);
+GtkWidget* gnumeric_go_error_info_dialog_new (GOErrorInfo *error);
+void       gnumeric_go_error_info_dialog_show (GtkWindow *parent,
+                                            GOErrorInfo *error);
 void       gnumeric_restore_window_geometry (GtkWindow *dialog,
 					     const char *key);
 void       gnumeric_keyed_dialog (WBCGtk *wbcg,
diff --git a/src/io-context-gtk.c b/src/io-context-gtk.c
index 2bbd3c2..b62d112 100644
--- a/src/io-context-gtk.c
+++ b/src/io-context-gtk.c
@@ -258,11 +258,11 @@ icg_progress_message_set (GOCmdContext *cc, gchar const *msg)
 }
 
 static void
-icg_error_error_info (GOCmdContext *cc, ErrorInfo *error)
+icg_error_error_info (GOCmdContext *cc, GOErrorInfo *error)
 {
 	IOContextGtk *icg = IO_CONTEXT_GTK (cc);
 	if (icg->show_warnings) {
-		GtkWidget *dialog = gnumeric_error_info_dialog_new (error);
+		GtkWidget *dialog = gnumeric_go_error_info_dialog_new (error);
 		gtk_widget_show_all (GTK_WIDGET (dialog));
 		gtk_dialog_run (GTK_DIALOG (dialog));
 		gtk_widget_destroy (dialog);
diff --git a/src/ssconvert.c b/src/ssconvert.c
index 40e2a51..713bf25 100644
--- a/src/ssconvert.c
+++ b/src/ssconvert.c
@@ -548,7 +548,7 @@ convert (char const *inarg, char const *outarg, char const *mergeargs[],
 int
 main (int argc, char const **argv)
 {
-	ErrorInfo	*plugin_errs;
+	GOErrorInfo	*plugin_errs;
 	int		 res = 0;
 	GOCmdContext	*cc;
 	GOptionContext *ocontext;
@@ -584,7 +584,7 @@ main (int argc, char const **argv)
 		go_plugins_get_available_plugins (), &plugin_errs);
 	if (plugin_errs) {
 		/* FIXME: What do we want to do here? */
-		error_info_free (plugin_errs);
+		go_error_info_free (plugin_errs);
 	}
 
 	if (ssconvert_list_exporters)
diff --git a/src/ssgrep.c b/src/ssgrep.c
index 5027339..efe5e41 100644
--- a/src/ssgrep.c
+++ b/src/ssgrep.c
@@ -413,7 +413,7 @@ int
 main (int argc, char const **argv)
 {
 	GHashTable	*ssgrep_targets;
-	ErrorInfo	*plugin_errs;
+	GOErrorInfo	*plugin_errs;
 	IOContext	*ioc;
 	GOCmdContext	*cc;
 	GOptionContext	*ocontext;
@@ -516,7 +516,7 @@ main (int argc, char const **argv)
 		go_plugins_get_available_plugins (), &plugin_errs);
 	if (plugin_errs) {
 		/* FIXME: What do we want to do here? */
-		error_info_free (plugin_errs);
+		go_error_info_free (plugin_errs);
 	}
 
 	ioc = gnumeric_io_context_new (cc);
diff --git a/src/ssindex.c b/src/ssindex.c
index 51a2559..a3924f7 100644
--- a/src/ssindex.c
+++ b/src/ssindex.c
@@ -234,7 +234,7 @@ ssindex (char const *file, IOContext *ioc)
 int
 main (int argc, char const **argv)
 {
-	ErrorInfo	*plugin_errs;
+	GOErrorInfo	*plugin_errs;
 	int		 res = 0;
 	GOCmdContext	*cc;
 	GOptionContext *ocontext;
@@ -275,7 +275,7 @@ main (int argc, char const **argv)
 		go_plugins_get_available_plugins (), &plugin_errs);
 	if (plugin_errs) {
 		/* FIXME: What do we want to do here? */
-		error_info_free (plugin_errs);
+		go_error_info_free (plugin_errs);
 	}
 
 	if (ssindex_run_indexer) {
diff --git a/src/sstest.c b/src/sstest.c
index 7ff0cef..1aa9047 100644
--- a/src/sstest.c
+++ b/src/sstest.c
@@ -198,7 +198,7 @@ test_insdel_rowcol_names (void)
 int
 main (int argc, char const **argv)
 {
-	ErrorInfo	*plugin_errs;
+	GOErrorInfo	*plugin_errs;
 	GOCmdContext	*cc;
 	GOptionContext	*ocontext;
 	GError		*error = NULL;
@@ -234,7 +234,7 @@ main (int argc, char const **argv)
 		go_plugins_get_available_plugins (), &plugin_errs);
 	if (plugin_errs) {
 		/* FIXME: What do we want to do here? */
-		error_info_free (plugin_errs);
+		go_error_info_free (plugin_errs);
 	}
 
 	testname = argv[1];
diff --git a/src/test-harness.c b/src/test-harness.c
index 09727b7..a2b92a9 100644
--- a/src/test-harness.c
+++ b/src/test-harness.c
@@ -39,7 +39,7 @@ test_options[] = {
 int
 main (int argc, char const *argv [])
 {
-	ErrorInfo	*plugin_errs;
+	GOErrorInfo	*plugin_errs;
 	int		 res = 0;
 	GOCmdContext	*cc;
 	GError		*error = NULL;
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index a8f024a..358988a 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -1030,7 +1030,7 @@ static GNM_ACTION_DEF (cb_help_docs)
 	g_free (argv[1]);
 #endif
 	if (NULL != err) {
-		ErrorInfo *ei = error_info_new_printf 
+		GOErrorInfo *ei = go_error_info_new_printf 
 			(_("Unable to start the help browser (%s).\n"
 			   "The system error message is: \n\n%s"), 
 			 argv[0], err->message);
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index b7007d5..431a978 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -4786,9 +4786,9 @@ wbcg_error_error (GOCmdContext *cc, GError *err)
 	g_free (text);
 }
 static void
-wbcg_error_error_info (GOCmdContext *cc, ErrorInfo *error)
+wbcg_error_error_info (GOCmdContext *cc, GOErrorInfo *error)
 {
-	gnumeric_error_info_dialog_show (
+	gnumeric_go_error_info_dialog_show (
 		wbcg_toplevel (WBC_GTK (cc)), error);
 }
 static void
diff --git a/src/xml-io.c b/src/xml-io.c
index 8d99dad..a6e6ec8 100644
--- a/src/xml-io.c
+++ b/src/xml-io.c
@@ -2580,7 +2580,7 @@ xml_dom_read_warning (gpointer state, char const *fmt, ...)
 	va_start (args, fmt);
 	if (gnumeric_io_warning_occurred (io_context))
 		gnumeric_io_error_push (io_context,
-			error_info_new_vprintf (GO_ERROR, fmt, args));
+			go_error_info_new_vprintf (GO_ERROR, fmt, args));
 	else
 		gnm_io_warning_varargs (io_context, fmt, args);
 	va_end (args);
@@ -2589,16 +2589,16 @@ xml_dom_read_warning (gpointer state, char const *fmt, ...)
 static void
 xml_dom_read_error (gpointer state, char const *fmt, ...)
 {
-	ErrorInfo *ei;
+	GOErrorInfo *ei;
 	va_list args;
 	va_start (args, fmt);
-	ei = error_info_new_vprintf (GO_ERROR, fmt, args);
+	ei = go_error_info_new_vprintf (GO_ERROR, fmt, args);
 	va_end (args);
 
 	if (gnumeric_io_error_occurred (io_context))
 		gnumeric_io_error_push (io_context, ei);
 	else
-		gnumeric_io_error_info_set (io_context, ei);
+		gnumeric_io_go_error_info_set (io_context, ei);
 }
 
 /**************************************************************************/