GNOME.org
 

[gnumeric] Compilation: catch up to goffice.

commit 8ae507670c70df33cf8b401f6e715208bd9db440
Author: Morten Welinder <terra gnome org>
Date:   Wed Aug 19 21:03:21 2009 -0400

    Compilation: catch up to goffice.

 plugins/applix/boot.c                 |    4 ++--
 plugins/dif/dif.c                     |    4 ++--
 plugins/excel/boot.c                  |   16 ++++++++--------
 plugins/excel/excel-xml-read.c        |    6 +++---
 plugins/excel/ms-excel-read.c         |    8 ++++----
 plugins/excel/ms-excel-write.c        |    6 +++---
 plugins/excel/xlsx-read.c             |    4 ++--
 plugins/html/html.h                   |    2 +-
 plugins/html/html_read.c              |    2 +-
 plugins/lotus-123/boot.c              |    4 ++--
 plugins/mps/mps.c                     |    4 ++--
 plugins/openoffice/openoffice-read.c  |   12 ++++++------
 plugins/paradox/paradox.c             |    4 ++--
 plugins/plan-perfect/pln.c            |    4 ++--
 plugins/psiconv/boot.c                |    4 ++--
 plugins/python-loader/python-loader.c |    2 +-
 plugins/qpro/qpro-read.c              |    4 ++--
 plugins/sc/sc.c                       |    4 ++--
 plugins/sylk/sylk.c                   |    4 ++--
 src/io-context-gtk.c                  |    4 ++--
 src/io-context-gtk.h                  |    4 ++--
 src/stf.c                             |    6 +++---
 src/workbook-view.c                   |   10 +++++-----
 src/xml-io.c                          |   30 +++++++++++++++---------------
 src/xml-sax-read.c                    |    8 ++++----
 25 files changed, 80 insertions(+), 80 deletions(-)
---
diff --git a/plugins/applix/boot.c b/plugins/applix/boot.c
index 62d0f35..73c3e78 100644
--- a/plugins/applix/boot.c
+++ b/plugins/applix/boot.c
@@ -36,14 +36,14 @@
 GNM_PLUGIN_MODULE_HEADER;
 
 gboolean applix_file_probe (GOFileOpener const *fo, GsfInput *input,
-                            FileProbeLevel pl);
+                            GOFileProbeLevel pl);
 void     applix_file_open (GOFileOpener const *fo, GOIOContext *io_context,
                            WorkbookView *wb_view, GsfInput *input);
 void     applix_file_save (GOFileSaver const *fs, GOIOContext *io_context,
 			   WorkbookView const *wb_view, GsfOutput *output);
 
 gboolean
-applix_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
+applix_file_probe (GOFileOpener const *fo, GsfInput *input, GOFileProbeLevel pl)
 {
 	static guint8 const signature[] = "*BEGIN SPREADSHEETS VERSION";
 	guint8 const *header;
diff --git a/plugins/dif/dif.c b/plugins/dif/dif.c
index dc359e3..cc880d2 100644
--- a/plugins/dif/dif.c
+++ b/plugins/dif/dif.c
@@ -67,7 +67,7 @@ dif_input_context_new (GOIOContext *io_context, Workbook *wb, GsfInput *input)
 	ctxt->sheet          = workbook_sheet_add (wb, -1, GNM_DEFAULT_COLS, GNM_DEFAULT_ROWS);
 	ctxt->converter      = g_iconv_open ("UTF-8", "ISO-8859-1");
 
-	io_progress_message (io_context, _("Reading file..."));
+	go_io_progress_message (io_context, _("Reading file..."));
 
 	return ctxt;
 }
@@ -75,7 +75,7 @@ dif_input_context_new (GOIOContext *io_context, Workbook *wb, GsfInput *input)
 static void
 dif_input_context_destroy (DifInputContext *ctxt)
 {
-	io_progress_unset (ctxt->io_context);
+	go_io_progress_unset (ctxt->io_context);
 	g_object_unref (G_OBJECT (ctxt->input)); ctxt->input = NULL;
 	gsf_iconv_close (ctxt->converter);
 	g_free (ctxt->line);
diff --git a/plugins/excel/boot.c b/plugins/excel/boot.c
index 7cb832f..be00ac3 100644
--- a/plugins/excel/boot.c
+++ b/plugins/excel/boot.c
@@ -65,7 +65,7 @@ gint ms_excel_chart_debug = 0;
 gint ms_excel_write_debug = 0;
 gint ms_excel_object_debug = 0;
 
-gboolean excel_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl);
+gboolean excel_file_probe (GOFileOpener const *fo, GsfInput *input, GOFileProbeLevel pl);
 void excel_file_open (GOFileOpener const *fo, GOIOContext *context, WorkbookView *wbv, GsfInput *input);
 void excel_biff7_file_save (GOFileSaver const *fs, GOIOContext *context, WorkbookView const *wbv, GsfOutput *output);
 void excel_biff8_file_save (GOFileSaver const *fs, GOIOContext *context, WorkbookView const *wbv, GsfOutput *output);
@@ -94,7 +94,7 @@ find_content_stream (GsfInfile *ole, gboolean *is_97)
 }
 
 gboolean
-excel_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
+excel_file_probe (GOFileOpener const *fo, GsfInput *input, GOFileProbeLevel pl)
 {
 	GsfInfile *ole;
 	GsfInput  *stream;
@@ -251,10 +251,10 @@ excel_save (GOIOContext *context, WorkbookView const *wbv, GsfOutput *output,
 	GsfStructuredBlob *blob;
 	GsfDocMetaData *meta_data;
 
-	io_progress_message (context, _("Preparing to save..."));
-	io_progress_range_push (context, 0.0, 0.1);
+	go_io_progress_message (context, _("Preparing to save..."));
+	go_io_progress_range_push (context, 0.0, 0.1);
 	ewb = excel_write_state_new (context, wbv, biff7, biff8);
-	io_progress_range_pop (context);
+	go_io_progress_range_pop (context);
 	if (ewb == NULL)
 		return;
 
@@ -263,14 +263,14 @@ excel_save (GOIOContext *context, WorkbookView const *wbv, GsfOutput *output,
 	ewb->export_macros = (biff8 &&
 		NULL != g_object_get_data (G_OBJECT (wb), "MS_EXCEL_MACROS"));
 
-	io_progress_message (context, _("Saving file..."));
-	io_progress_range_push (context, 0.1, 1.0);
+	go_io_progress_message (context, _("Saving file..."));
+	go_io_progress_range_push (context, 0.1, 1.0);
 	if (biff7)
 		excel_write_v7 (ewb, outfile);
 	if (biff8)
 		excel_write_v8 (ewb, outfile);
 	excel_write_state_free (ewb);
-	io_progress_range_pop (context);
+	go_io_progress_range_pop (context);
 
 	meta_data = go_doc_get_meta_data (GO_DOC (wb));
 	if (meta_data != NULL) {
diff --git a/plugins/excel/excel-xml-read.c b/plugins/excel/excel-xml-read.c
index eb662d2..4a9478c 100644
--- a/plugins/excel/excel-xml-read.c
+++ b/plugins/excel/excel-xml-read.c
@@ -1015,7 +1015,7 @@ excel_xml_file_open (GOFileOpener const *fo, GOIOContext *context,
 		     WorkbookView *wbv, GsfInput *input);
 
 G_MODULE_EXPORT gboolean
-excel_xml_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl);
+excel_xml_file_probe (GOFileOpener const *fo, GsfInput *input, GOFileProbeLevel pl);
 
 static gboolean
 xl_xml_probe_start_element (const xmlChar *name,
@@ -1034,9 +1034,9 @@ xl_xml_probe_start_element (const xmlChar *name,
 }
 
 gboolean
-excel_xml_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
+excel_xml_file_probe (GOFileOpener const *fo, GsfInput *input, GOFileProbeLevel pl)
 {
-	if (pl == FILE_PROBE_FILE_NAME) {
+	if (pl == GO_FILE_PROBE_FILE_NAME) {
 		char const *ext;
 		char const *name = gsf_input_name (input);
 		return  NULL != name &&
diff --git a/plugins/excel/ms-excel-read.c b/plugins/excel/ms-excel-read.c
index 5b19d73..b6b4fa3 100644
--- a/plugins/excel/ms-excel-read.c
+++ b/plugins/excel/ms-excel-read.c
@@ -6152,7 +6152,7 @@ excel_read_sheet (BiffQuery *q, GnmXLImporter *importer,
 	}
 
 	for (; ms_biff_query_next (q) ;
-	     value_io_progress_update (importer->context, q->streamPos)) {
+	     go_io_value_progress_update (importer->context, q->streamPos)) {
 
 		d (5, fprintf (stderr,"Opcode: 0x%x\n", q->opcode););
 
@@ -6657,8 +6657,8 @@ excel_read_workbook (GOIOContext *context, WorkbookView *wb_view, GsfInput *inpu
 	gboolean stop_loading = FALSE;
 	gboolean prev_was_eof = FALSE;
 
-	io_progress_message (context, _("Reading file..."));
-	value_io_progress_set (context, gsf_input_size (input), N_BYTES_BETWEEN_PROGRESS_UPDATES);
+	go_io_progress_message (context, _("Reading file..."));
+	go_io_value_progress_set (context, gsf_input_size (input), N_BYTES_BETWEEN_PROGRESS_UPDATES);
 	q = ms_biff_query_new (input);
 
 	importer = gnm_xl_importer_new (context, wb_view);
@@ -6840,7 +6840,7 @@ excel_read_workbook (GOIOContext *context, WorkbookView *wb_view, GsfInput *inpu
 	ms_biff_query_destroy (q);
 	if (ver)
 		ms_biff_bof_data_destroy (ver);
-	io_progress_unset (context);
+	go_io_progress_unset (context);
 
 	d (1, fprintf (stderr,"finished read\n"););
 
diff --git a/plugins/excel/ms-excel-write.c b/plugins/excel/ms-excel-write.c
index 5c5ff55..eb647b9 100644
--- a/plugins/excel/ms-excel-write.c
+++ b/plugins/excel/ms-excel-write.c
@@ -4766,7 +4766,7 @@ excel_sheet_write_block (ExcelWriteSheet *esheet, guint32 begin, int nrows,
 					run_size = 0;
 				}
 				excel_write_cell (ewb, esheet, cell, xf);
-				count_io_progress_update (esheet->ewb->io_context, 1);
+				go_io_count_progress_update (esheet->ewb->io_context, 1);
 			}
 		}
 		if (run_size > 0)
@@ -5702,11 +5702,11 @@ excel_write_workbook (ExcelWriteState *ewb)
 	n = 0;
 	for (i = workbook_sheet_count (ewb->base.wb) ; i-- > 0 ;)
 		n += sheet_cells_count (workbook_sheet_by_index (ewb->base.wb, i));
-	count_io_progress_set (ewb->io_context,
+	go_io_count_progress_set (ewb->io_context,
 		n, N_CELLS_BETWEEN_UPDATES);
 	for (i = 0; i < ewb->esheets->len; i++)
 		excel_write_sheet (ewb, g_ptr_array_index (ewb->esheets, i));
-	io_progress_unset (ewb->io_context);
+	go_io_progress_unset (ewb->io_context);
 
 	/* Finalise Workbook stuff */
 	for (i = 0; i < ewb->esheets->len; i++) {
diff --git a/plugins/excel/xlsx-read.c b/plugins/excel/xlsx-read.c
index 341c8ab..501d6c6 100644
--- a/plugins/excel/xlsx-read.c
+++ b/plugins/excel/xlsx-read.c
@@ -5069,10 +5069,10 @@ GSF_XML_IN_NODE_FULL (START, THEME, XL_NS_DRAW, "theme", GSF_XML_NO_CONTENT, FAL
 /****************************************************************************/
 
 G_MODULE_EXPORT gboolean
-xlsx_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl);
+xlsx_file_probe (GOFileOpener const *fo, GsfInput *input, GOFileProbeLevel pl);
 
 gboolean
-xlsx_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
+xlsx_file_probe (GOFileOpener const *fo, GsfInput *input, GOFileProbeLevel pl)
 {
 	GsfInfile *zip;
 	GsfInput  *stream;
diff --git a/plugins/html/html.h b/plugins/html/html.h
index ab10ff8..1e2c85e 100644
--- a/plugins/html/html.h
+++ b/plugins/html/html.h
@@ -40,7 +40,7 @@ void html_file_open (GOFileOpener const *fo, GOIOContext *io_context,
 		     WorkbookView *wb_view, GsfInput *input);
 
 gboolean html_file_probe (GOFileOpener const *fo, GsfInput *input, 
-			  FileProbeLevel pl);
+			  GOFileProbeLevel pl);
 
 
 #define G_PLUGIN_FOR_HTML "GPFH/0.5"
diff --git a/plugins/html/html_read.c b/plugins/html/html_read.c
index e131a08..5127a42 100644
--- a/plugins/html/html_read.c
+++ b/plugins/html/html_read.c
@@ -551,7 +551,7 @@ html_file_open (GOFileOpener const *fo, GOIOContext *io_context,
 
 /* Quick and dirty html probe. */
 gboolean
-html_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
+html_file_probe (GOFileOpener const *fo, GsfInput *input, GOFileProbeLevel pl)
 {
 	gsf_off_t size = 200;
 	guint8 const* buf = gsf_input_read (input, size, NULL);
diff --git a/plugins/lotus-123/boot.c b/plugins/lotus-123/boot.c
index 9ef4646..6f1a04c 100644
--- a/plugins/lotus-123/boot.c
+++ b/plugins/lotus-123/boot.c
@@ -24,13 +24,13 @@
 GNM_PLUGIN_MODULE_HEADER;
 
 gboolean lotus_file_probe (GOFileOpener const *fo, GsfInput *input,
-                           FileProbeLevel pl);
+                           GOFileProbeLevel pl);
 void     lotus_file_open (GOFileOpener const *fo, GOIOContext *io_context,
                           WorkbookView *wb_view, GsfInput *input);
 
 
 gboolean
-lotus_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
+lotus_file_probe (GOFileOpener const *fo, GsfInput *input, GOFileProbeLevel pl)
 {
 	char const *h = NULL;
 	int len;
diff --git a/plugins/mps/mps.c b/plugins/mps/mps.c
index 73bbc69..4b7c179 100644
--- a/plugins/mps/mps.c
+++ b/plugins/mps/mps.c
@@ -537,7 +537,7 @@ mps_input_context_new (GOIOContext *io_context, Workbook *wb, GsfInput *input)
 
 	g_slist_free (ctxt->rows);
 
-	io_progress_message (io_context, _("Reading file..."));
+	go_io_progress_message (io_context, _("Reading file..."));
 
 	return ctxt;
 }
@@ -567,7 +567,7 @@ mps_input_context_destroy (MpsInputContext *ctxt)
 {
         GSList *current;
 
-	io_progress_unset (ctxt->io_context);
+	go_io_progress_unset (ctxt->io_context);
 
 	/* Free ROWS */
 	for (current = ctxt->rows; current != NULL; current = current->next) {
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index d9c1849..af801b1 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -273,7 +273,7 @@ maybe_update_progress (GsfXMLIn *xin)
 	gsf_off_t pos = gsf_input_tell (input);
 
 	if (pos >= state->last_progress_update + 10000) {
-		value_io_progress_update (state->context, pos);
+		go_io_value_progress_update (state->context, pos);
 		state->last_progress_update = pos;
 	}
 }
@@ -5163,8 +5163,8 @@ openoffice_file_open (GOFileOpener const *fo, GOIOContext *io_context,
 	state.page_breaks.h = state.page_breaks.v = NULL;
 	state.last_progress_update = 0;
 
-	io_progress_message (state.context, _("Reading file..."));
-	value_io_progress_set (state.context, gsf_input_size (contents), 0);
+	go_io_progress_message (state.context, _("Reading file..."));
+	go_io_value_progress_set (state.context, gsf_input_size (contents), 0);
 
 	if (state.ver == OOO_VER_OPENDOC) {
 		GsfInput *meta_file = gsf_infile_child_by_name (zip, "meta.xml");
@@ -5233,7 +5233,7 @@ openoffice_file_open (GOFileOpener const *fo, GOIOContext *io_context,
 		go_io_error_string (io_context, _("XML document not well formed!"));
 	gsf_xml_in_doc_free (doc);
 
-	io_progress_unset (state.context);
+	go_io_progress_unset (state.context);
 
 	if (state.default_style.cells)
 		gnm_style_unref (state.default_style.cells);
@@ -5261,10 +5261,10 @@ openoffice_file_open (GOFileOpener const *fo, GOIOContext *io_context,
 }
 
 gboolean
-openoffice_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl);
+openoffice_file_probe (GOFileOpener const *fo, GsfInput *input, GOFileProbeLevel pl);
 
 gboolean
-openoffice_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
+openoffice_file_probe (GOFileOpener const *fo, GsfInput *input, GOFileProbeLevel pl)
 {
 	GsfInfile *zip;
 	OOVer ver;
diff --git a/plugins/paradox/paradox.c b/plugins/paradox/paradox.c
index 5094d69..5fd2608 100644
--- a/plugins/paradox/paradox.c
+++ b/plugins/paradox/paradox.c
@@ -263,11 +263,11 @@ paradox_file_open (GOFileOpener const *fo, GOIOContext *io_context,
 
 gboolean
 paradox_file_probe (GOFileOpener const *fo, GsfInput *input,
-                    FileProbeLevel pl);
+                    GOFileProbeLevel pl);
 
 G_MODULE_EXPORT gboolean
 paradox_file_probe (GOFileOpener const *fo, GsfInput *input,
-                    FileProbeLevel pl)
+                    GOFileProbeLevel pl)
 {
 	pxdoc_t		*pxdoc;
 	pxhead_t	*pxh;
diff --git a/plugins/plan-perfect/pln.c b/plugins/plan-perfect/pln.c
index 9f8d433..01633ad 100644
--- a/plugins/plan-perfect/pln.c
+++ b/plugins/plan-perfect/pln.c
@@ -31,7 +31,7 @@
 GNM_PLUGIN_MODULE_HEADER;
 
 gboolean pln_file_probe (GOFileOpener const *fo, GsfInput *input,
-			 FileProbeLevel pl);
+			 GOFileProbeLevel pl);
 void     pln_file_open (GOFileOpener const *fo, GOIOContext *io_context,
 			WorkbookView *wb_view, GsfInput *input);
 
@@ -171,7 +171,7 @@ pln_get_func_table2 (unsigned i)
 
 gboolean
 pln_file_probe (GOFileOpener const *fo, GsfInput *input,
-		FileProbeLevel pl)
+		GOFileProbeLevel pl)
 {
 	/*
 	 * a plan-perfect header
diff --git a/plugins/psiconv/boot.c b/plugins/psiconv/boot.c
index c687a6a..7b34897 100644
--- a/plugins/psiconv/boot.c
+++ b/plugins/psiconv/boot.c
@@ -37,13 +37,13 @@
 GNM_PLUGIN_MODULE_HEADER;
 
 gboolean psiconv_file_probe (GOFileOpener const *fo, GsfInput *input,
-                            FileProbeLevel pl);
+                            GOFileProbeLevel pl);
 void     psiconv_file_open (GOFileOpener const *fo, GOIOContext *io_context,
 			    WorkbookView *wb_view, GsfInput *input);
 
 
 gboolean
-psiconv_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
+psiconv_file_probe (GOFileOpener const *fo, GsfInput *input, GOFileProbeLevel pl)
 {
 	return psiconv_read_header (input);
 }
diff --git a/plugins/python-loader/python-loader.c b/plugins/python-loader/python-loader.c
index de40735..5a4fa3f 100644
--- a/plugins/python-loader/python-loader.c
+++ b/plugins/python-loader/python-loader.c
@@ -212,7 +212,7 @@ gplp_loader_data_opener_free (ServiceLoaderDataFileOpener *loader_data)
 
 static gboolean
 gplp_func_file_probe (GOFileOpener const *fo, GOPluginService *service,
-		      GsfInput *input, FileProbeLevel pl)
+		      GsfInput *input, GOFileProbeLevel pl)
 {
 	ServiceLoaderDataFileOpener *loader_data;
 	PyObject *probe_result = NULL;
diff --git a/plugins/qpro/qpro-read.c b/plugins/qpro/qpro-read.c
index 840fc43..cfa536a 100644
--- a/plugins/qpro/qpro-read.c
+++ b/plugins/qpro/qpro-read.c
@@ -55,7 +55,7 @@
 GNM_PLUGIN_MODULE_HEADER;
 
 gboolean qpro_file_probe (GOFileOpener const *fo, GsfInput *input,
-			  FileProbeLevel pl);
+			  GOFileProbeLevel pl);
 void     qpro_file_open (GOFileOpener const *fo, GOIOContext *context,
 			 WorkbookView *new_wb_view, GsfInput *input);
 
@@ -78,7 +78,7 @@ qpro_check_signature (GsfInput *input)
 }
 
 gboolean
-qpro_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
+qpro_file_probe (GOFileOpener const *fo, GsfInput *input, GOFileProbeLevel pl)
 {
 	GsfInfile *ole;
 	GsfInput  *stream;
diff --git a/plugins/sc/sc.c b/plugins/sc/sc.c
index 689e507..2d867f7 100644
--- a/plugins/sc/sc.c
+++ b/plugins/sc/sc.c
@@ -35,7 +35,7 @@
 GNM_PLUGIN_MODULE_HEADER;
 
 gboolean sc_file_probe (GOFileOpener const *fo, GsfInput *input,
-			FileProbeLevel pl);
+			GOFileProbeLevel pl);
 void sc_file_open (GOFileOpener const *fo, GOIOContext *io_context,
                    WorkbookView *wb_view, GsfInput *input);
 
@@ -630,7 +630,7 @@ static guint8 const signature[] =
 
 gboolean
 sc_file_probe (GOFileOpener const *fo, GsfInput *input,
-	       FileProbeLevel pl)
+	       GOFileProbeLevel pl)
 {
 	char const *header = NULL;
 
diff --git a/plugins/sylk/sylk.c b/plugins/sylk/sylk.c
index 5b8b344..7576bd9 100644
--- a/plugins/sylk/sylk.c
+++ b/plugins/sylk/sylk.c
@@ -42,7 +42,7 @@
 
 GNM_PLUGIN_MODULE_HEADER;
 
-gboolean sylk_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl);
+gboolean sylk_file_probe (GOFileOpener const *fo, GsfInput *input, GOFileProbeLevel pl);
 void     sylk_file_open (GOFileOpener const *fo, GOIOContext *io_context,
                          WorkbookView *wb_view, GsfInput *input);
 
@@ -848,7 +848,7 @@ sylk_file_open (GOFileOpener const *fo,
 }
 
 gboolean
-sylk_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
+sylk_file_probe (GOFileOpener const *fo, GsfInput *input, GOFileProbeLevel pl)
 {
 	char const *header = NULL;
 	if (!gsf_input_seek (input, 0, G_SEEK_SET))
diff --git a/src/io-context-gtk.c b/src/io-context-gtk.c
index e479803..9bb6a84 100644
--- a/src/io-context-gtk.c
+++ b/src/io-context-gtk.c
@@ -32,7 +32,7 @@
 #define GO_IS_IO_CONTEXT_GTK_CLASS(klass) \
     (G_TYPE_CHECK_CLASS_TYPE ((klass), GO_TYPE_IO_CONTEXT_GTK))
 
-struct _IOContextGtk {
+struct _GOIOContextGtk {
 	GOIOContext parent;
 	GtkWindow *window;
 	GtkWindow *parent_window;
@@ -52,7 +52,7 @@ struct _IOContextGtk {
 	gboolean show_warnings;
 };
 
-struct _IOContextGtkClass {
+struct _GOIOContextGtkClass {
 	GOIOContextClass parent_class;
 };
 
diff --git a/src/io-context-gtk.h b/src/io-context-gtk.h
index 6cbd69c..f80e141 100644
--- a/src/io-context-gtk.h
+++ b/src/io-context-gtk.h
@@ -9,8 +9,8 @@
 
 G_BEGIN_DECLS
 
-typedef struct _IOContextGtk IOContextGtk;
-typedef struct _IOContextGtkClass IOContextGtkClass;
+typedef struct _GOIOContextGtk IOContextGtk;
+typedef struct _GOIOContextGtkClass IOContextGtkClass;
 
 #define GO_TYPE_IO_CONTEXT_GTK    (io_context_gtk_get_type ())
 #define IO_CONTEXT_GTK(obj) \
diff --git a/src/stf.c b/src/stf.c
index b4d6ab5..9f7ec8f 100644
--- a/src/stf.c
+++ b/src/stf.c
@@ -472,13 +472,13 @@ stf_write_csv (GOFileSaver const *fs, GOIOContext *context,
 }
 
 static gboolean
-csv_tsv_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
+csv_tsv_probe (GOFileOpener const *fo, GsfInput *input, GOFileProbeLevel pl)
 {
 	/* Rough and ready heuristic.  If the first N bytes have no
 	 * unprintable characters this may be text */
 	const gsf_off_t N = 512;
 
-	if (pl == FILE_PROBE_CONTENT) {
+	if (pl == GO_FILE_PROBE_CONTENT) {
 		guint8 const *header;
 		gsf_off_t i;
 		char const *enc = NULL;
@@ -494,7 +494,7 @@ csv_tsv_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
 		/* If someone ships us an empty file, accept it only if
 		   it has a proper name.  */
 		if (i == 0)
-			return csv_tsv_probe (fo, input, FILE_PROBE_FILE_NAME);
+			return csv_tsv_probe (fo, input, GO_FILE_PROBE_FILE_NAME);
 
 		if (i > N) i = N;
 		if (NULL == (header = gsf_input_read (input, i, NULL)))
diff --git a/src/workbook-view.c b/src/workbook-view.c
index fdcc0ff..aa7c791 100644
--- a/src/workbook-view.c
+++ b/src/workbook-view.c
@@ -1131,19 +1131,19 @@ wb_view_new_from_input  (GsfInput *input,
 
 	/* Search for an applicable opener */
 	if (optional_fmt == NULL) {
-		FileProbeLevel pl;
+		GOFileProbeLevel pl;
 		GList *l;
 		int input_refs = G_OBJECT (input)->ref_count;
 
-		for (pl = FILE_PROBE_FILE_NAME; pl < FILE_PROBE_LAST && optional_fmt == NULL; pl++) {
+		for (pl = GO_FILE_PROBE_FILE_NAME; pl < GO_FILE_PROBE_LAST && optional_fmt == NULL; pl++) {
 			for (l = go_get_file_openers (); l != NULL; l = l->next) {
 				GOFileOpener const *tmp_fo = GO_FILE_OPENER (l->data);
 				int new_input_refs;
 				/* A name match needs to be a content match too */
 				if (go_file_opener_probe (tmp_fo, input, pl) &&
-				    (pl == FILE_PROBE_CONTENT ||
-				     !go_file_opener_can_probe	(tmp_fo, FILE_PROBE_CONTENT) ||
-				     go_file_opener_probe (tmp_fo, input, FILE_PROBE_CONTENT)))
+				    (pl == GO_FILE_PROBE_CONTENT ||
+				     !go_file_opener_can_probe	(tmp_fo, GO_FILE_PROBE_CONTENT) ||
+				     go_file_opener_probe (tmp_fo, input, GO_FILE_PROBE_CONTENT)))
 					optional_fmt = tmp_fo;
 
 				new_input_refs = G_OBJECT (input)->ref_count;
diff --git a/src/xml-io.c b/src/xml-io.c
index c6d2dcc..c754ac5 100644
--- a/src/xml-io.c
+++ b/src/xml-io.c
@@ -1794,7 +1794,7 @@ xml_read_styles (XmlParseContext *ctxt, xmlNodePtr tree)
 	for (regions = child->xmlChildrenNode; regions != NULL; regions = regions->next) {
 		if (!xmlIsBlankNode (regions))
 			xml_read_style_region (ctxt, regions);
-		count_io_progress_update (ctxt->io_context, 1);
+		go_io_count_progress_update (ctxt->io_context, 1);
 	}
 }
 
@@ -2006,7 +2006,7 @@ xml_sheet_read (XmlParseContext *ctxt, xmlNodePtr tree)
 		for (cell = child->xmlChildrenNode; cell != NULL; cell = cell->next) {
 			if (!xmlIsBlankNode (cell))
 				xml_read_cell (ctxt, cell);
-			count_io_progress_update (ctxt->io_context, 1);
+			go_io_count_progress_update (ctxt->io_context, 1);
 		}
 	}
 
@@ -2397,9 +2397,9 @@ xml_workbook_read (GOIOContext *context,
 	if (child == NULL)
 		return FALSE;
 
-	io_progress_message (context, _("Processing file..."));
-	io_progress_range_push (context, 0.5, 1.0);
-	count_io_progress_set (context, xml_read_workbook_n_elements (child),
+	go_io_progress_message (context, _("Processing file..."));
+	go_io_progress_range_push (context, 0.5, 1.0);
+	go_io_count_progress_set (context, xml_read_workbook_n_elements (child),
 			       N_ELEMENTS_BETWEEN_UPDATES);
 	ctxt->io_context = context;
 
@@ -2425,8 +2425,8 @@ xml_workbook_read (GOIOContext *context,
 		if (!xmlIsBlankNode (c))
 			sheet = xml_sheet_read (ctxt, c);
 
-	io_progress_unset (context);
-	io_progress_range_pop (context);
+	go_io_progress_unset (context);
+	go_io_progress_range_pop (context);
 
 	child = e_xml_get_child_by_name (tree, CC2XML ("Attributes"));
 	if (child && ctxt->version >= GNM_XML_V5)
@@ -2617,9 +2617,9 @@ gnm_xml_probe_element (const xmlChar *name,
 		NULL != URI && NULL != strstr (URI, "gnumeric");
 }
 static gboolean
-xml_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
+xml_probe (GOFileOpener const *fo, GsfInput *input, GOFileProbeLevel pl)
 {
-	if (pl == FILE_PROBE_FILE_NAME) {
+	if (pl == GO_FILE_PROBE_FILE_NAME) {
 		char const *name = gsf_input_name (input);
 		int len;
 
@@ -2666,15 +2666,15 @@ gnumeric_xml_read_workbook (GOFileOpener const *fo,
 	if (gsf_input_seek (input, 0, G_SEEK_SET))
 		return;
 
-	io_progress_message (context, _("Reading file..."));
-	io_progress_range_push (context, 0.0, 0.5);
+	go_io_progress_message (context, _("Reading file..."));
+	go_io_progress_range_push (context, 0.0, 0.5);
 
 	g_object_ref (input);
 	input = maybe_gunzip (input);
 	input = maybe_convert (input, FALSE);
 	gsf_input_seek (input, 0, G_SEEK_SET);
 
-	value_io_progress_set (context, gsf_input_size (input), 0);
+	go_io_value_progress_set (context, gsf_input_size (input), 0);
 
 	buf = gsf_input_read (input, 4, NULL);
 	size = gsf_input_remaining (input);
@@ -2696,7 +2696,7 @@ gnumeric_xml_read_workbook (GOFileOpener const *fo,
 			if (buf == NULL)
 				break;
 			xmlParseChunk (pctxt, (char *)buf, len, 0);
-			value_io_progress_update (context, gsf_input_tell (input));
+			go_io_value_progress_update (context, gsf_input_tell (input));
 		}
 		xmlParseChunk (pctxt, (char *)buf, 0, 1);
 		res = pctxt->myDoc;
@@ -2705,8 +2705,8 @@ gnumeric_xml_read_workbook (GOFileOpener const *fo,
 	}
 
 	g_object_unref (input);
-	io_progress_unset (context);
-	io_progress_range_pop (context);
+	go_io_progress_unset (context);
+	go_io_progress_range_pop (context);
 
 	/* Do a bit of checking, get the namespaces, and check the top elem. */
 	gmr = xml_check_version (res, &version);
diff --git a/src/xml-sax-read.c b/src/xml-sax-read.c
index 04ece6f..0a0b840 100644
--- a/src/xml-sax-read.c
+++ b/src/xml-sax-read.c
@@ -352,7 +352,7 @@ maybe_update_progress (GsfXMLIn *xin)
 	gsf_off_t pos = gsf_input_tell (input);
 
 	if (pos >= state->last_progress_update + 10000) {
-		value_io_progress_update (state->context, pos);
+		go_io_value_progress_update (state->context, pos);
 		state->last_progress_update = pos;
 	}
 }
@@ -2723,8 +2723,8 @@ gnm_xml_file_open (GOFileOpener const *fo, GOIOContext *io_context,
 	go_doc_init_read (GO_DOC (state.wb), input);
 	gsf_input_seek (input, 0, G_SEEK_SET);
 
-	io_progress_message (state.context, _("Reading file..."));
-	value_io_progress_set (state.context, gsf_input_size (input), 0);
+	go_io_progress_message (state.context, _("Reading file..."));
+	go_io_value_progress_set (state.context, gsf_input_size (input), 0);
 
 	locale = gnm_push_C_locale ();
 	ok = gsf_xml_in_doc_parse (doc, input, &state);
@@ -2732,7 +2732,7 @@ gnm_xml_file_open (GOFileOpener const *fo, GOIOContext *io_context,
 	gnm_pop_C_locale (locale);
 	go_doc_end_read (GO_DOC (state.wb));
 
-	io_progress_unset (state.context);
+	go_io_progress_unset (state.context);
 
 	if (ok) {
 		workbook_queue_all_recalc (state.wb);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]