[gnumeric] Compilation: catch up to goffice.
- From: Morten Welinder <mortenw src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnumeric] Compilation: catch up to goffice.
- Date: Thu, 20 Aug 2009 01:04:00 +0000 (UTC)
commit 37a91d7586ec3894fb22ccece3e42b3f1cd5ba60
Author: Morten Welinder <terra gnome org>
Date: Wed Aug 19 20:09:17 2009 -0400
Compilation: catch up to goffice.
component/gnumeric.c | 6 ++--
plugins/applix/applix-read.c | 4 +-
plugins/applix/applix-write.c | 4 +-
plugins/applix/applix.h | 4 +-
plugins/applix/boot.c | 8 +++---
plugins/corba/corba-application.c | 2 +-
plugins/dif/dif.c | 32 +++++++++++++++---------------
plugins/excel/boot.c | 22 ++++++++++----------
plugins/excel/excel-xml-read.c | 12 +++++-----
plugins/excel/excel.h | 4 +-
plugins/excel/ms-excel-read.c | 18 ++++++++--------
plugins/excel/ms-excel-read.h | 2 +-
plugins/excel/ms-excel-write.c | 8 +++---
plugins/excel/ms-excel-write.h | 4 +-
plugins/excel/ms-formula-write.c | 2 +-
plugins/excel/xlsx-read.c | 12 +++++-----
plugins/excel/xlsx-write.c | 6 ++--
plugins/html/html.c | 12 +++++-----
plugins/html/html.h | 12 +++++-----
plugins/html/html_read.c | 4 +-
plugins/html/latex.c | 4 +-
plugins/html/latex.h | 4 +-
plugins/html/roff.c | 2 +-
plugins/html/roff.h | 2 +-
plugins/lotus-123/boot.c | 6 ++--
plugins/lotus-123/lotus.h | 2 +-
plugins/mps/mps.c | 12 +++++-----
plugins/mps/mps.h | 4 +-
plugins/mps/parser.c | 12 +++++-----
plugins/oleo/boot.c | 4 +-
plugins/oleo/oleo.c | 2 +-
plugins/oleo/oleo.h | 2 +-
plugins/openoffice/openoffice-read.c | 12 +++++-----
plugins/openoffice/openoffice-write.c | 12 +++++-----
plugins/paradox/paradox.c | 18 ++++++++--------
plugins/plan-perfect/pln.c | 6 ++--
plugins/psiconv/boot.c | 4 +-
plugins/psiconv/psiconv-plugin.h | 2 +-
plugins/psiconv/psiconv-read.c | 8 +++---
plugins/python-loader/python-loader.c | 8 +++---
plugins/qpro/qpro-read.c | 12 +++++-----
plugins/sc/sc.c | 6 ++--
plugins/sylk/sylk-write.c | 6 ++--
plugins/sylk/sylk.c | 8 +++---
plugins/xbase/boot.c | 6 ++--
src/gui-clipboard.c | 14 ++++++------
src/gui-file.c | 20 +++++++++---------
src/io-context-gtk.c | 20 +++++++++---------
src/io-context-gtk.h | 8 +++---
src/main-application.c | 20 +++++++++---------
src/print-info.c | 2 +-
src/sheet-control-gui.c | 20 +++++++++---------
src/ssconvert.c | 16 +++++++-------
src/ssgrep.c | 10 ++++----
src/ssindex.c | 10 ++++----
src/stf-export.c | 4 +-
src/stf.c | 6 ++--
src/test-pango.c | 4 +-
src/wbc-gtk-actions.c | 18 ++++++++--------
src/workbook-view.c | 34 ++++++++++++++++----------------
src/workbook-view.h | 8 +++---
src/xml-io.c | 24 +++++++++++-----------
src/xml-io.h | 2 +-
src/xml-sax-read.c | 24 +++++++++++-----------
src/xml-sax-write.c | 2 +-
src/xml-sax.h | 4 +-
66 files changed, 306 insertions(+), 306 deletions(-)
---
diff --git a/component/gnumeric.c b/component/gnumeric.c
index 4408431..b088023 100644
--- a/component/gnumeric.c
+++ b/component/gnumeric.c
@@ -88,7 +88,7 @@ go_gnm_component_get_data (GOComponent *component, gpointer *data, int *length,
GOGnmComponent *gognm = GO_GNM_COMPONENT (component);
if (gognm->edited) {
GOCmdContext *cc = go_component_get_command_context ();
- IOContext *io_context = gnumeric_io_context_new (cc);
+ GOIOContext *io_context = go_io_context_new (cc);
GsfOutput *output = gsf_output_memory_new ();
WorkbookView *wbv = wb_control_view (WORKBOOK_CONTROL (gognm->edited));
Workbook *wb = wb_view_get_workbook (wbv);
@@ -112,7 +112,7 @@ go_gnm_component_set_data (GOComponent *component)
SheetView *sv;
GnmRange const *range;
GOCmdContext *cc = go_component_get_command_context ();
- IOContext *io_context = gnumeric_io_context_new (cc);
+ GOIOContext *io_context = go_io_context_new (cc);
GsfInput *input = gsf_input_memory_new (component->data, component->length, FALSE);
g_object_set (G_OBJECT (io_context), "exec-main-loop", FALSE, NULL);
@@ -190,7 +190,7 @@ go_gnm_component_edit (GOComponent *component)
wv = workbook_view_new (workbook_new_with_sheets (1));
} else {
GOCmdContext *cc = go_component_get_command_context ();
- IOContext *io_context = gnumeric_io_context_new (cc);
+ GOIOContext *io_context = go_io_context_new (cc);
GsfInput *input = gsf_input_memory_new (component->data, component->length, FALSE);
g_object_set (G_OBJECT (io_context), "exec-main-loop", FALSE, NULL);
diff --git a/plugins/applix/applix-read.c b/plugins/applix/applix-read.c
index 13ee55e..56a9c0e 100644
--- a/plugins/applix/applix-read.c
+++ b/plugins/applix/applix-read.c
@@ -1632,7 +1632,7 @@ applix_conventions_new (void)
}
void
-applix_read (IOContext *io_context, WorkbookView *wb_view, GsfInput *src)
+applix_read (GOIOContext *io_context, WorkbookView *wb_view, GsfInput *src)
{
int i;
int res;
@@ -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_go_error_info_set (io_context, state.parse_error);
+ go_io_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 9c0466d..013835b 100644
--- a/plugins/applix/applix-write.c
+++ b/plugins/applix/applix-write.c
@@ -83,7 +83,7 @@ applix_write_colormap (ApplixWriteState *state)
}
void
-applix_write (IOContext *io_context, WorkbookView const *wb_view, GsfOutput *sink)
+applix_write (GOIOContext *io_context, WorkbookView const *wb_view, GsfOutput *sink)
{
ApplixWriteState state;
@@ -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_go_error_info_set (io_context, state.parse_error);
+ go_io_error_info_set (io_context, state.parse_error);
}
diff --git a/plugins/applix/applix.h b/plugins/applix/applix.h
index 65ae641..fea8d82 100644
--- a/plugins/applix/applix.h
+++ b/plugins/applix/applix.h
@@ -5,8 +5,8 @@
#include <gsf/gsf.h>
#include <stdio.h>
-void applix_read (IOContext *io_context, WorkbookView *wbv, GsfInput *src);
-void applix_write (IOContext *io_context, WorkbookView const *wbv,
+void applix_read (GOIOContext *io_context, WorkbookView *wbv, GsfInput *src);
+void applix_write (GOIOContext *io_context, WorkbookView const *wbv,
GsfOutput *sink);
#endif /* PLUGIN_APPLIX_H */
diff --git a/plugins/applix/boot.c b/plugins/applix/boot.c
index 9e8692b..62d0f35 100644
--- a/plugins/applix/boot.c
+++ b/plugins/applix/boot.c
@@ -37,9 +37,9 @@ GNM_PLUGIN_MODULE_HEADER;
gboolean applix_file_probe (GOFileOpener const *fo, GsfInput *input,
FileProbeLevel pl);
-void applix_file_open (GOFileOpener const *fo, IOContext *io_context,
+void applix_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input);
-void applix_file_save (GOFileSaver const *fs, IOContext *io_context,
+void applix_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output);
gboolean
@@ -54,14 +54,14 @@ applix_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
}
void
-applix_file_open (GOFileOpener const *fo, IOContext *io_context,
+applix_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input)
{
applix_read (io_context, wb_view, input);
}
void
-applix_file_save (GOFileSaver const *fs, IOContext *io_context,
+applix_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output)
{
applix_write (io_context, wb_view, output);
diff --git a/plugins/corba/corba-application.c b/plugins/corba/corba-application.c
index 01823db..bd3ac9d 100644
--- a/plugins/corba/corba-application.c
+++ b/plugins/corba/corba-application.c
@@ -67,7 +67,7 @@ capp_workbook_open (PortableServer_Servant ignore,
wbv = NULL;
} else {
GOCmdContext *cc = cmd_context_stderr_new ();
- IOContext *io_context = gnumeric_io_context_new (cc);
+ GOIOContext *io_context = go_io_context_new (cc);
wbv = wb_view_new_from_uri (file_name, NULL, io_context, NULL);
g_object_unref (G_OBJECT (io_context));
g_object_unref (G_OBJECT (cc));
diff --git a/plugins/dif/dif.c b/plugins/dif/dif.c
index c221f48..d22ad48 100644
--- a/plugins/dif/dif.c
+++ b/plugins/dif/dif.c
@@ -33,13 +33,13 @@ GNM_PLUGIN_MODULE_HEADER;
#define N_INPUT_LINES_BETWEEN_UPDATES 50
-void dif_file_open (GOFileOpener const *fo, IOContext *io_context,
+void dif_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wbv, GsfInput *input);
-void dif_file_save (GOFileSaver const *fs, IOContext *io_context,
+void dif_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wbv, GsfOutput *out);
typedef struct {
- IOContext *io_context;
+ GOIOContext *io_context;
GsfInputTextline *input;
gint line_no;
@@ -53,7 +53,7 @@ typedef struct {
static DifInputContext *
-dif_input_context_new (IOContext *io_context, Workbook *wb, GsfInput *input)
+dif_input_context_new (GOIOContext *io_context, Workbook *wb, GsfInput *input)
{
DifInputContext *ctxt = NULL;
@@ -170,7 +170,7 @@ dif_parse_data (DifInputContext *ctxt)
if (val_type == 0) {
gchar const *comma = strchr (ctxt->line, ',');
if (comma == NULL)
- gnm_io_warning (ctxt->io_context,
+ go_io_warning (ctxt->io_context,
_("Syntax error at line %d. Ignoring."),
ctxt->line_no);
else if (col > gnm_sheet_get_max_cols (ctxt->sheet)) {
@@ -192,7 +192,7 @@ dif_parse_data (DifInputContext *ctxt)
} else if (0 == strcmp (ctxt->line, "FALSE")) { /* FALSE bool F res must be O */
v = value_new_bool (TRUE);
} else if (0 == strcmp (ctxt->line, "ERROR")) { /* ERROR err res must be O */
- gnm_io_warning (ctxt->io_context,
+ go_io_warning (ctxt->io_context,
_("Unknown value type '%s' at line %d. Ignoring."),
ctxt->line, ctxt->line_no);
}
@@ -265,11 +265,11 @@ dif_parse_sheet (DifInputContext *ctxt)
GnmLocale *locale = gnm_push_C_locale ();
if (!dif_parse_header (ctxt)) {
- gnumeric_io_go_error_info_set (ctxt->io_context, go_error_info_new_printf (
+ go_io_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_go_error_info_set (ctxt->io_context, go_error_info_new_printf (
+ go_io_error_info_set (ctxt->io_context, go_error_info_new_printf (
_("Unexpected end of file at line %d while reading data."),
ctxt->line_no));
}
@@ -278,7 +278,7 @@ dif_parse_sheet (DifInputContext *ctxt)
}
void
-dif_file_open (GOFileOpener const *fo, IOContext *io_context,
+dif_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wbv, GsfInput *input)
{
Workbook *wb = wb_view_get_workbook (wbv);
@@ -288,19 +288,19 @@ dif_file_open (GOFileOpener const *fo, IOContext *io_context,
go_file_saver_for_id ("Gnumeric_dif:dif"));
if (ctxt != NULL) {
dif_parse_sheet (ctxt);
- if (gnumeric_io_error_occurred (io_context))
- gnumeric_io_error_push (io_context,
+ if (go_io_error_occurred (io_context))
+ go_io_error_push (io_context,
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);
+ } else if (!go_io_error_occurred (io_context))
+ go_io_error_unknown (io_context);
}
/*
* Write _current_ sheet of the workbook to a DIF format file
*/
void
-dif_file_save (GOFileSaver const *fs, IOContext *io_context,
+dif_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wbv, GsfOutput *out)
{
GnmLocale *locale;
@@ -311,7 +311,7 @@ dif_file_save (GOFileSaver const *fs, IOContext *io_context,
sheet = wb_view_cur_sheet (wbv);
if (sheet == NULL) {
- gnumeric_io_error_string (io_context, _("Cannot get default sheet."));
+ go_io_error_string (io_context, _("Cannot get default sheet."));
return;
}
@@ -363,5 +363,5 @@ dif_file_save (GOFileSaver const *fs, IOContext *io_context,
gnm_pop_C_locale (locale);
if (!ok)
- gnumeric_io_error_string (io_context, _("Error while saving DIF file."));
+ go_io_error_string (io_context, _("Error while saving DIF file."));
}
diff --git a/plugins/excel/boot.c b/plugins/excel/boot.c
index 8ddac24..da06310 100644
--- a/plugins/excel/boot.c
+++ b/plugins/excel/boot.c
@@ -66,10 +66,10 @@ gint ms_excel_write_debug = 0;
gint ms_excel_object_debug = 0;
gboolean excel_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl);
-void excel_file_open (GOFileOpener const *fo, IOContext *context, WorkbookView *wbv, GsfInput *input);
-void excel_biff7_file_save (GOFileSaver const *fs, IOContext *context, WorkbookView const *wbv, GsfOutput *output);
-void excel_biff8_file_save (GOFileSaver const *fs, IOContext *context, WorkbookView const *wbv, GsfOutput *output);
-void excel_dsf_file_save (GOFileSaver const *fs, IOContext *context, WorkbookView const *wbv, GsfOutput *output);
+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);
+void excel_dsf_file_save (GOFileSaver const *fs, GOIOContext *context, WorkbookView const *wbv, GsfOutput *output);
static GsfInput *
find_content_stream (GsfInfile *ole, gboolean *is_97)
@@ -122,14 +122,14 @@ excel_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
static void
excel_read_metadata (GsfDocMetaData *meta_data, GsfInfile *ole, char const *name,
- IOContext *context)
+ GOIOContext *context)
{
GsfInput *stream = gsf_infile_child_by_name (ole, name);
if (stream != NULL) {
GError *err = gsf_msole_metadata_read (stream, meta_data);
if (err != NULL) {
- gnm_io_warning (context, "%s", err->message);
+ go_io_warning (context, "%s", err->message);
g_error_free (err);
}
@@ -147,7 +147,7 @@ cb_dump_vba (char const *name, guint8 const *src_code)
/* Service entry point */
void
-excel_file_open (GOFileOpener const *fo, IOContext *context,
+excel_file_open (GOFileOpener const *fo, GOIOContext *context,
WorkbookView *wbv, GsfInput *input)
{
GsfInput *stream = NULL;
@@ -241,7 +241,7 @@ excel_file_open (GOFileOpener const *fo, IOContext *context,
}
static void
-excel_save (IOContext *context, WorkbookView const *wbv, GsfOutput *output,
+excel_save (GOIOContext *context, WorkbookView const *wbv, GsfOutput *output,
gboolean biff7, gboolean biff8)
{
Workbook *wb;
@@ -300,20 +300,20 @@ excel_save (IOContext *context, WorkbookView const *wbv, GsfOutput *output,
}
void
-excel_dsf_file_save (GOFileSaver const *fs, IOContext *context,
+excel_dsf_file_save (GOFileSaver const *fs, GOIOContext *context,
WorkbookView const *wbv, GsfOutput *output)
{
excel_save (context, wbv, output, TRUE, TRUE);
}
void
-excel_biff8_file_save (GOFileSaver const *fs, IOContext *context,
+excel_biff8_file_save (GOFileSaver const *fs, GOIOContext *context,
WorkbookView const *wbv, GsfOutput *output)
{
excel_save (context, wbv, output, FALSE, TRUE);
}
void
-excel_biff7_file_save (GOFileSaver const *fs, IOContext *context,
+excel_biff7_file_save (GOFileSaver const *fs, GOIOContext *context,
WorkbookView const *wbv, GsfOutput *output)
{
excel_save (context, wbv, output, TRUE, FALSE);
diff --git a/plugins/excel/excel-xml-read.c b/plugins/excel/excel-xml-read.c
index cf133fe..eb662d2 100644
--- a/plugins/excel/excel-xml-read.c
+++ b/plugins/excel/excel-xml-read.c
@@ -60,7 +60,7 @@
typedef struct {
GnumericXMLVersion version;
- IOContext *context; /* The IOcontext managing things */
+ GOIOContext *context; /* The IOcontext managing things */
WorkbookView *wb_view; /* View for the new workbook */
Workbook *wb; /* The new workbook */
Sheet *sheet; /* The current sheet */
@@ -112,7 +112,7 @@ xl_xml_warning (GsfXMLIn *xin, char const *fmt, ...)
msg = tmp;
}
- gnm_io_warning (state->context, "%s", msg);
+ go_io_warning (state->context, "%s", msg);
g_warning ("%s", msg);
g_free (msg);
@@ -127,7 +127,7 @@ unknown_attr (GsfXMLIn *xin,
g_return_if_fail (attrs != NULL);
if (state->version == GNM_XML_LATEST)
- gnm_io_warning (state->context,
+ go_io_warning (state->context,
_("Unexpected attribute %s::%s == '%s'."),
name, attrs[0], attrs[1]);
}
@@ -1011,7 +1011,7 @@ GSF_XML_IN_NODE_FULL (START, WORKBOOK, XL_NS_SS, "Workbook", GSF_XML_NO_CONTENT,
};
G_MODULE_EXPORT void
-excel_xml_file_open (GOFileOpener const *fo, IOContext *context,
+excel_xml_file_open (GOFileOpener const *fo, GOIOContext *context,
WorkbookView *wbv, GsfInput *input);
G_MODULE_EXPORT gboolean
@@ -1048,7 +1048,7 @@ excel_xml_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl
}
void
-excel_xml_file_open (GOFileOpener const *fo, IOContext *io_context,
+excel_xml_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input)
{
GsfXMLInDoc *doc;
@@ -1066,7 +1066,7 @@ excel_xml_file_open (GOFileOpener const *fo, IOContext *io_context,
doc = gsf_xml_in_doc_new (excel_xml_dtd, content_ns);
if (!gsf_xml_in_doc_parse (doc, input, &state))
- gnumeric_io_error_string (io_context, _("XML document not well formed!"));
+ go_io_error_string (io_context, _("XML document not well formed!"));
gsf_xml_in_doc_free (doc);
g_hash_table_destroy (state.style_hash);
diff --git a/plugins/excel/excel.h b/plugins/excel/excel.h
index 0f078f6..56f8ce6 100644
--- a/plugins/excel/excel.h
+++ b/plugins/excel/excel.h
@@ -15,12 +15,12 @@
#include "gnumeric.h"
#include "ms-biff.h"
-void excel_read_workbook (IOContext *context, WorkbookView *new_wb, GsfInput *input,
+void excel_read_workbook (GOIOContext *context, WorkbookView *new_wb, GsfInput *input,
gboolean *is_double_stream_file);
typedef struct _XLSExporter ExcelWriteState;
void excel_write_state_free (ExcelWriteState *ewb);
-ExcelWriteState *excel_write_state_new (IOContext *context, WorkbookView const *wbv,
+ExcelWriteState *excel_write_state_new (GOIOContext *context, WorkbookView const *wbv,
gboolean biff7, gboolean biff8);
void excel_write_v7 (ExcelWriteState *ewb, GsfOutfile *output);
diff --git a/plugins/excel/ms-excel-read.c b/plugins/excel/ms-excel-read.c
index 76e18cd..5b19d73 100644
--- a/plugins/excel/ms-excel-read.c
+++ b/plugins/excel/ms-excel-read.c
@@ -2998,7 +2998,7 @@ ms_wb_get_font_markup (MSContainer const *c, unsigned indx)
}
static GnmXLImporter *
-gnm_xl_importer_new (IOContext *context, WorkbookView *wb_view)
+gnm_xl_importer_new (GOIOContext *context, WorkbookView *wb_view)
{
static MSContainerClass const vtbl = {
NULL, NULL,
@@ -3260,7 +3260,7 @@ excel_parse_name (GnmXLImporter *importer, Sheet *sheet, char *name,
TRUE, NULL);
if (texpr == NULL) {
- gnm_io_warning (importer->context, _("Failure parsing name '%s'"), name);
+ go_io_warning (importer->context, _("Failure parsing name '%s'"), name);
texpr = gnm_expr_top_new_constant (value_new_error_REF (NULL));
} else d (2, {
char *tmp;
@@ -3295,7 +3295,7 @@ excel_parse_name (GnmXLImporter *importer, Sheet *sheet, char *name,
texpr,
&err, link_to_container, stub);
if (nexpr == NULL) {
- gnm_io_warning (importer->context, "%s", err);
+ go_io_warning (importer->context, "%s", err);
g_free (err);
return NULL;
}
@@ -3378,16 +3378,16 @@ excel_read_EXTERNNAME (BiffQuery *q, MSContainer *container)
expr_len = el;
expr_data = q->data + 9 + namelen;
} else
- gnm_io_warning (container->importer->context,
+ go_io_warning (container->importer->context,
_("Incorrect expression for name '%s': content will be lost.\n"),
name);
}
} else if ((flags & 0x10) == 0) /* DDE */
- gnm_io_warning (container->importer->context,
+ go_io_warning (container->importer->context,
_("DDE links are not supported yet.\nName '%s' will be lost.\n"),
name ? name : "NULL");
else /* OLE */
- gnm_io_warning (container->importer->context,
+ go_io_warning (container->importer->context,
_("OLE links are not supported yet.\nName '%s' will be lost.\n"),
name ? name : "NULL");
@@ -5802,7 +5802,7 @@ excel_read_EXTERNSHEET_v7 (BiffQuery const *q, MSContainer *container)
default:
/* Fix when we get placeholders to external workbooks */
d (1, gsf_mem_dump (q->data, q->length););
- gnm_io_warning_unsupported_feature (container->importer->context,
+ go_io_warning_unsupported_feature (container->importer->context,
_("external references"));
}
@@ -6536,7 +6536,7 @@ static void
excel_read_BOF (BiffQuery *q,
GnmXLImporter *importer,
WorkbookView *wb_view,
- IOContext *context,
+ GOIOContext *context,
MsBiffBofData **version, unsigned *current_sheet)
{
/* The first BOF seems to be OK, the rest lie ? */
@@ -6646,7 +6646,7 @@ excel_read_CODEPAGE (BiffQuery *q, GnmXLImporter *importer)
}
void
-excel_read_workbook (IOContext *context, WorkbookView *wb_view, GsfInput *input,
+excel_read_workbook (GOIOContext *context, WorkbookView *wb_view, GsfInput *input,
gboolean *is_double_stream_file)
{
GnmXLImporter *importer;
diff --git a/plugins/excel/ms-excel-read.h b/plugins/excel/ms-excel-read.h
index 041b068..d87050d 100644
--- a/plugins/excel/ms-excel-read.h
+++ b/plugins/excel/ms-excel-read.h
@@ -100,7 +100,7 @@ typedef struct {
struct _GnmXLImporter {
MSContainer container;
- IOContext *context;
+ GOIOContext *context;
WorkbookView *wbv;
Workbook *wb;
MsBiffVersion ver;
diff --git a/plugins/excel/ms-excel-write.c b/plugins/excel/ms-excel-write.c
index db859c0..5c5ff55 100644
--- a/plugins/excel/ms-excel-write.c
+++ b/plugins/excel/ms-excel-write.c
@@ -203,7 +203,7 @@ map_color_to_palette (XLExportBase const *xle,
void
excel_sheet_extent (Sheet const *sheet, GnmRange *extent, GnmStyle **col_styles,
- int maxcols, int maxrows, IOContext *io_context)
+ int maxcols, int maxrows, GOIOContext *io_context)
{
int i;
@@ -211,7 +211,7 @@ excel_sheet_extent (Sheet const *sheet, GnmRange *extent, GnmStyle **col_styles,
*extent = sheet_get_extent (sheet, FALSE);
if (extent->end.col >= maxcols) {
- gnm_io_warning (io_context,
+ go_io_warning (io_context,
ngettext("Some content will be lost when saving. "
"This format only supports %u column, and "
"this workbook has %d",
@@ -223,7 +223,7 @@ excel_sheet_extent (Sheet const *sheet, GnmRange *extent, GnmStyle **col_styles,
extent->end.col = maxcols - 1;
}
if (extent->end.row >= maxrows) {
- gnm_io_warning (io_context,
+ go_io_warning (io_context,
ngettext("Some content will be lost when saving. "
"This format only supports %u row, and "
"this workbook has %d",
@@ -5862,7 +5862,7 @@ free_excel_func (ExcelFunc *efunc)
}
ExcelWriteState *
-excel_write_state_new (IOContext *context, WorkbookView const *wb_view,
+excel_write_state_new (GOIOContext *context, WorkbookView const *wb_view,
gboolean biff7, gboolean biff8)
{
ExcelWriteState *ewb = g_new (ExcelWriteState, 1);
diff --git a/plugins/excel/ms-excel-write.h b/plugins/excel/ms-excel-write.h
index fd8d7d1..dd645b1 100644
--- a/plugins/excel/ms-excel-write.h
+++ b/plugins/excel/ms-excel-write.h
@@ -80,7 +80,7 @@ typedef struct {
struct _XLSExporter {
XLExportBase base;
- IOContext *io_context;
+ GOIOContext *io_context;
BiffPut *bp;
GPtrArray *esheets;
@@ -170,7 +170,7 @@ GHashTable *excel_collect_hlinks (GnmStyleList *ptr,
GHashTable *excel_collect_pivot_caches (Workbook const *wb);
void excel_sheet_extent (Sheet const *sheet, GnmRange *extent, GnmStyle **col_styles,
- int maxcols, int maxrows, IOContext *io_context);
+ int maxcols, int maxrows, GOIOContext *io_context);
int excel_font_from_go_font (XLExportBase *ewb, GOFont const *font);
diff --git a/plugins/excel/ms-formula-write.c b/plugins/excel/ms-formula-write.c
index df17e0c..d70b175 100644
--- a/plugins/excel/ms-formula-write.c
+++ b/plugins/excel/ms-formula-write.c
@@ -525,7 +525,7 @@ write_funcall (PolishData *pd, GnmExpr const *expr,
for (arg = 0; arg < expr->func.argc; arg++)
if (ef->efunc != NULL && arg >= ef->efunc->max_args) {
- gnm_io_warning (pd->ewb->io_context,
+ go_io_warning (pd->ewb->io_context,
_("Too many arguments for function '%s', MS Excel can only handle %d not %d"),
ef->efunc->name, ef->efunc->max_args, expr->func.argc);
break;
diff --git a/plugins/excel/xlsx-read.c b/plugins/excel/xlsx-read.c
index 876da66..c152868 100644
--- a/plugins/excel/xlsx-read.c
+++ b/plugins/excel/xlsx-read.c
@@ -106,7 +106,7 @@ typedef struct {
typedef struct {
GsfInfile *zip;
- IOContext *context; /* The IOcontext managing things */
+ GOIOContext *context; /* The IOcontext managing things */
WorkbookView *wb_view; /* View for the new workbook */
Workbook *wb; /* The new workbook */
@@ -241,7 +241,7 @@ xlsx_parse_stream (XLSXReadState *state, GsfInput *in, GsfXMLInNode const *dtd)
success = gsf_xml_in_doc_parse (doc, in, state);
if (!success)
- gnm_io_warning (state->context,
+ go_io_warning (state->context,
_("'%s' is corrupt!"),
gsf_input_name (in));
@@ -266,7 +266,7 @@ xlsx_parse_rel_by_id (GsfXMLIn *xin, char const *part_id,
err = gsf_open_pkg_parse_rel_by_id (xin, part_id, dtd, ns);
if (NULL != err) {
XLSXReadState *state = (XLSXReadState *)xin->user_state;
- gnm_io_warning (state->context, "%s", err->message);
+ go_io_warning (state->context, "%s", err->message);
g_error_free (err);
}
@@ -305,7 +305,7 @@ xlsx_warning (GsfXMLIn *xin, char const *fmt, ...)
msg = tmp;
}
- gnm_io_warning (state->context, "%s", msg);
+ go_io_warning (state->context, "%s", msg);
g_printerr ("%s\n", msg);
g_free (msg);
@@ -5103,11 +5103,11 @@ xlsx_style_array_free (GPtrArray *styles)
}
G_MODULE_EXPORT void
-xlsx_file_open (GOFileOpener const *fo, IOContext *context,
+xlsx_file_open (GOFileOpener const *fo, GOIOContext *context,
WorkbookView *wb_view, GsfInput *input);
void
-xlsx_file_open (GOFileOpener const *fo, IOContext *context,
+xlsx_file_open (GOFileOpener const *fo, GOIOContext *context,
WorkbookView *wb_view, GsfInput *input)
{
XLSXReadState state;
diff --git a/plugins/excel/xlsx-write.c b/plugins/excel/xlsx-write.c
index 6569676..126ce43 100644
--- a/plugins/excel/xlsx-write.c
+++ b/plugins/excel/xlsx-write.c
@@ -79,7 +79,7 @@ typedef struct {
GHashTable *shared_string_hash;
GPtrArray *shared_string_array;
GnmConventions *convs;
- IOContext *io_context;
+ GOIOContext *io_context;
GsfOutfile *xl_dir;
struct {
@@ -1489,10 +1489,10 @@ xlsx_write_workbook (XLSXWriteState *state, GsfOutfile *root_part)
}
G_MODULE_EXPORT void
-xlsx_file_save (GOFileSaver const *fs, IOContext *io_context,
+xlsx_file_save (GOFileSaver const *fs, GOIOContext *io_context,
gconstpointer wb_view, GsfOutput *output);
void
-xlsx_file_save (GOFileSaver const *fs, IOContext *io_context,
+xlsx_file_save (GOFileSaver const *fs, GOIOContext *io_context,
gconstpointer wb_view, GsfOutput *output)
{
XLSXWriteState state;
diff --git a/plugins/html/html.c b/plugins/html/html.c
index 1252ebc..98a69ff 100644
--- a/plugins/html/html.c
+++ b/plugins/html/html.c
@@ -595,7 +595,7 @@ write_sheet (GsfOutput *output, Sheet *sheet,
* write the html file (version of html according to version argument)
*/
static void
-html_file_save (GOFileSaver const *fs, IOContext *io_context,
+html_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output, html_version_t version)
{
GSList *sheets, *ptr;
@@ -690,35 +690,35 @@ html_file_save (GOFileSaver const *fs, IOContext *io_context,
}
void
-html40_file_save (GOFileSaver const *fs, IOContext *io_context,
+html40_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output)
{
html_file_save (fs, io_context, wb_view, output, HTML40);
}
void
-html32_file_save (GOFileSaver const *fs, IOContext *io_context,
+html32_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output)
{
html_file_save (fs, io_context, wb_view, output, HTML32);
}
void
-html40frag_file_save (GOFileSaver const *fs, IOContext *io_context,
+html40frag_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output)
{
html_file_save (fs, io_context, wb_view, output, HTML40F);
}
void
-xhtml_file_save (GOFileSaver const *fs, IOContext *io_context,
+xhtml_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output)
{
html_file_save (fs, io_context, wb_view, output, XHTML);
}
void
-xhtml_range_file_save (GOFileSaver const *fs, IOContext *io_context,
+xhtml_range_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output)
{
/* Identical, but fs->save_scope is different */
diff --git a/plugins/html/html.h b/plugins/html/html.h
index e128c49..ab10ff8 100644
--- a/plugins/html/html.h
+++ b/plugins/html/html.h
@@ -25,18 +25,18 @@
#include "gnumeric.h"
#include <goffice/goffice.h>
-void html32_file_save (GOFileSaver const *fs, IOContext *io_context,
+void html32_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output);
-void html40_file_save (GOFileSaver const *fs, IOContext *io_context,
+void html40_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output);
-void html40frag_file_save (GOFileSaver const *fs, IOContext *io_context,
+void html40frag_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output);
-void xhtml_file_save (GOFileSaver const *fs, IOContext *io_context,
+void xhtml_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output);
-void xhtml_range_file_save (GOFileSaver const *fs, IOContext *io_context,
+void xhtml_range_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output);
-void html_file_open (GOFileOpener const *fo, IOContext *io_context,
+void html_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input);
gboolean html_file_probe (GOFileOpener const *fo, GsfInput *input,
diff --git a/plugins/html/html_read.c b/plugins/html/html_read.c
index b067767..e131a08 100644
--- a/plugins/html/html_read.c
+++ b/plugins/html/html_read.c
@@ -463,7 +463,7 @@ html_search_for_tables (htmlNodePtr cur, htmlDocPtr doc,
}
void
-html_file_open (GOFileOpener const *fo, IOContext *io_context,
+html_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input)
{
guint8 const *buf;
@@ -545,7 +545,7 @@ html_file_open (GOFileOpener const *fo, IOContext *io_context,
html_search_for_tables (ptr, doc, wb_view, &tc);
xmlFreeDoc (doc);
} else
- gnumeric_io_go_error_info_set (io_context,
+ go_io_error_info_set (io_context,
go_error_info_new_str (_("Unable to parse the html.")));
}
diff --git a/plugins/html/latex.c b/plugins/html/latex.c
index 4ea9554..314fd64 100644
--- a/plugins/html/latex.c
+++ b/plugins/html/latex.c
@@ -1175,7 +1175,7 @@ latex2e_print_hhline (GsfOutput *output, GnmStyleBorderType *clines, int n, GnmS
* to render the format and contents of the cell.
*/
void
-latex_file_save (GOFileSaver const *fs, IOContext *io_context,
+latex_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output)
{
GnmCell *cell;
@@ -1445,7 +1445,7 @@ latex2e_table_write_file_header(GsfOutput *output)
* We try to avoid all formatting.
*/
void
-latex_table_file_save (GOFileSaver const *fs, IOContext *io_context,
+latex_table_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output)
{
GnmCell *cell;
diff --git a/plugins/html/latex.h b/plugins/html/latex.h
index 387f675..8186e3a 100644
--- a/plugins/html/latex.h
+++ b/plugins/html/latex.h
@@ -25,10 +25,10 @@
#include <gnumeric.h>
#include <goffice/goffice.h>
-void latex_file_save (GOFileSaver const *fs, IOContext *io_context,
+void latex_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output);
-void latex_table_file_save (GOFileSaver const *fs, IOContext *io_context,
+void latex_table_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output);
#endif
diff --git a/plugins/html/roff.c b/plugins/html/roff.c
index 03f1590..65c93ec 100644
--- a/plugins/html/roff.c
+++ b/plugins/html/roff.c
@@ -83,7 +83,7 @@ roff_fprintf (GsfOutput *output, GnmCell *cell)
* FIXME: Should roff quote sheet name (and everything else)
*/
void
-roff_file_save (GOFileSaver const *fs, IOContext *io_context,
+roff_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output)
{
GSList *sheets, *ptr;
diff --git a/plugins/html/roff.h b/plugins/html/roff.h
index cdad81a..0f304b8 100644
--- a/plugins/html/roff.h
+++ b/plugins/html/roff.h
@@ -24,7 +24,7 @@
#include "gnumeric.h"
-void roff_file_save (GOFileSaver const *fs, IOContext *io_context,
+void roff_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output);
#endif
diff --git a/plugins/lotus-123/boot.c b/plugins/lotus-123/boot.c
index b48d7fb..9ef4646 100644
--- a/plugins/lotus-123/boot.c
+++ b/plugins/lotus-123/boot.c
@@ -25,7 +25,7 @@ GNM_PLUGIN_MODULE_HEADER;
gboolean lotus_file_probe (GOFileOpener const *fo, GsfInput *input,
FileProbeLevel pl);
-void lotus_file_open (GOFileOpener const *fo, IOContext *io_context,
+void lotus_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input);
@@ -66,7 +66,7 @@ lotus_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
}
void
-lotus_file_open (GOFileOpener const *fo, IOContext *io_context,
+lotus_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input)
{
LotusState state;
@@ -79,7 +79,7 @@ lotus_file_open (GOFileOpener const *fo, IOContext *io_context,
state.sheet_area_error = FALSE;
if (!lotus_read (&state))
- gnumeric_io_error_string (io_context,
+ go_io_error_string (io_context,
_("Error while reading lotus workbook."));
}
diff --git a/plugins/lotus-123/lotus.h b/plugins/lotus-123/lotus.h
index eb13e77..8e31341 100644
--- a/plugins/lotus-123/lotus.h
+++ b/plugins/lotus-123/lotus.h
@@ -16,7 +16,7 @@ typedef enum {
typedef struct {
GsfInput *input;
- IOContext *io_context;
+ GOIOContext *io_context;
WorkbookView *wbv;
Workbook *wb;
Sheet *sheet;
diff --git a/plugins/mps/mps.c b/plugins/mps/mps.c
index 38b28d4..73bbc69 100644
--- a/plugins/mps/mps.c
+++ b/plugins/mps/mps.c
@@ -510,7 +510,7 @@ mps_create_sheet (MpsInputContext *ctxt, WorkbookView *wbv)
/* Make the initializations. */
static MpsInputContext *
-mps_input_context_new (IOContext *io_context, Workbook *wb, GsfInput *input)
+mps_input_context_new (GOIOContext *io_context, Workbook *wb, GsfInput *input)
{
MpsInputContext *ctxt = NULL;
@@ -628,7 +628,7 @@ mps_input_context_destroy (MpsInputContext *ctxt)
*/
void
-mps_file_open (GOFileOpener const *fo, IOContext *io_context,
+mps_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wbv, GsfInput *input)
{
MpsInputContext *ctxt;
@@ -637,13 +637,13 @@ mps_file_open (GOFileOpener const *fo, IOContext *io_context,
input);
if (ctxt != NULL) {
mps_parse_file (ctxt);
- if (gnumeric_io_error_occurred (io_context)) {
- gnumeric_io_error_push (io_context, go_error_info_new_str
+ if (go_io_error_occurred (io_context)) {
+ go_io_error_push (io_context, go_error_info_new_str
(_("Error while reading MPS "
"file.")));
} else
mps_create_sheet (ctxt, wbv);
mps_input_context_destroy (ctxt);
- } else if (!gnumeric_io_error_occurred (io_context))
- gnumeric_io_error_unknown (io_context);
+ } else if (!go_io_error_occurred (io_context))
+ go_io_error_unknown (io_context);
}
diff --git a/plugins/mps/mps.h b/plugins/mps/mps.h
index 945bb67..1a1f847 100644
--- a/plugins/mps/mps.h
+++ b/plugins/mps/mps.h
@@ -114,7 +114,7 @@ typedef struct {
* Input context.
*/
typedef struct {
- IOContext *io_context;
+ GOIOContext *io_context;
GsfInputTextline *input;
gint line_no;
@@ -159,7 +159,7 @@ static const int CONSTRAINT_ROW = 10;
*/
/* Reads the MPS file in and creates a spreadsheet model of it. */
-void mps_file_open (GOFileOpener const *fo, IOContext *io_context,
+void mps_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wbv, GsfInput *input);
void mps_parse_file (MpsInputContext *ctxt);
diff --git a/plugins/mps/parser.c b/plugins/mps/parser.c
index 531c988..ab9a590 100644
--- a/plugins/mps/parser.c
+++ b/plugins/mps/parser.c
@@ -538,32 +538,32 @@ void
mps_parse_file (MpsInputContext *ctxt)
{
if (!mps_parse_name (ctxt)) {
- gnumeric_io_go_error_info_set
+ go_io_error_info_set
(ctxt->io_context,
go_error_info_new_printf (_("Problem name was not "
"defined in the file.")));
} else if (!mps_parse_rows (ctxt)) {
- gnumeric_io_go_error_info_set
+ go_io_error_info_set
(ctxt->io_context,
go_error_info_new_printf (_("Invalid ROWS section in "
"the file.")));
} else if (!mps_parse_columns (ctxt)) {
- gnumeric_io_go_error_info_set
+ go_io_error_info_set
(ctxt->io_context,
go_error_info_new_printf (_("Invalid COLUMNS section "
"in the file.")));
} else if (!mps_parse_rhs (ctxt)) {
- gnumeric_io_go_error_info_set
+ go_io_error_info_set
(ctxt->io_context,
go_error_info_new_printf (_("Invalid RHS section in the "
"file.")));
} else if (!mps_parse_ranges (ctxt)) {
- gnumeric_io_go_error_info_set
+ go_io_error_info_set
(ctxt->io_context,
go_error_info_new_printf (_("Invalid RANGES section in "
"the file.")));
} else if (!mps_parse_bounds (ctxt)) {
- gnumeric_io_go_error_info_set
+ go_io_error_info_set
(ctxt->io_context,
go_error_info_new_printf (_("Invalid BOUNDS section in "
"the file.")));
diff --git a/plugins/oleo/boot.c b/plugins/oleo/boot.c
index 6533e21..6a8e414 100644
--- a/plugins/oleo/boot.c
+++ b/plugins/oleo/boot.c
@@ -16,11 +16,11 @@
GNM_PLUGIN_MODULE_HEADER;
-void oleo_file_open (GOFileOpener const *fo, IOContext *io_context,
+void oleo_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input);
void
-oleo_file_open (GOFileOpener const *fo, IOContext *io_context,
+oleo_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input)
{
Workbook *wb = wb_view_get_workbook (wb_view);
diff --git a/plugins/oleo/oleo.c b/plugins/oleo/oleo.c
index a68c28a..4272a0d 100644
--- a/plugins/oleo/oleo.c
+++ b/plugins/oleo/oleo.c
@@ -250,7 +250,7 @@ oleo_conventions_new (void)
}
void
-oleo_read (IOContext *io_context, Workbook *wb, GsfInput *input)
+oleo_read (GOIOContext *io_context, Workbook *wb, GsfInput *input)
{
int sheetidx = 0;
GnmStyle *style = NULL;
diff --git a/plugins/oleo/oleo.h b/plugins/oleo/oleo.h
index 87877a8..1054e20 100644
--- a/plugins/oleo/oleo.h
+++ b/plugins/oleo/oleo.h
@@ -4,6 +4,6 @@
#include <gnumeric.h>
#include <gsf/gsf.h>
-void oleo_read (IOContext *io_context, Workbook *wb, GsfInput *input);
+void oleo_read (GOIOContext *io_context, Workbook *wb, GsfInput *input);
#endif
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 0b7a8ef..d9c1849 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -205,7 +205,7 @@ typedef enum {
} odf_elapsed_set_t;
typedef struct {
- IOContext *context; /* The IOcontext managing things */
+ GOIOContext *context; /* The IOcontext managing things */
WorkbookView *wb_view; /* View for the new workbook */
OOVer ver; /* Its an OOo v1.0 or v2.0? */
GsfInfile *zip; /* Reference to the open file, to load graphs and images*/
@@ -308,7 +308,7 @@ oo_warning (GsfXMLIn *xin, char const *fmt, ...)
msg = tmp;
}
- gnm_io_warning (state->context, "%s", msg);
+ go_io_warning (state->context, "%s", msg);
g_free (msg);
return FALSE; /* convenience */
@@ -5066,10 +5066,10 @@ determine_oo_version (GsfInfile *zip, OOVer def)
void
-openoffice_file_open (GOFileOpener const *fo, IOContext *io_context,
+openoffice_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input);
G_MODULE_EXPORT void
-openoffice_file_open (GOFileOpener const *fo, IOContext *io_context,
+openoffice_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input)
{
GsfXMLInDoc *doc;
@@ -5172,7 +5172,7 @@ openoffice_file_open (GOFileOpener const *fo, IOContext *io_context,
meta_data = gsf_doc_meta_data_new ();
err = gsf_opendoc_metadata_read (meta_file, meta_data);
if (NULL != err) {
- gnm_io_warning (io_context,
+ go_io_warning (io_context,
_("Invalid metadata '%s'"), err->message);
g_error_free (err);
} else
@@ -5230,7 +5230,7 @@ openoffice_file_open (GOFileOpener const *fo, IOContext *io_context,
}
}
} else
- gnumeric_io_error_string (io_context, _("XML document not well formed!"));
+ go_io_error_string (io_context, _("XML document not well formed!"));
gsf_xml_in_doc_free (doc);
io_progress_unset (state.context);
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 17b7dbe..cb8d16f 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -97,7 +97,7 @@
typedef struct {
GsfXMLOut *xml;
GsfOutfile *outfile;
- IOContext *ioc;
+ GOIOContext *ioc;
WorkbookView const *wbv;
Workbook const *wb;
Sheet const *sheet;
@@ -3784,7 +3784,7 @@ odf_write_graphs (SheetObject *graph, char const *name, GnmOOExport *state)
/**********************************************************************************/
static void
-openoffice_file_save_real (GOFileSaver const *fs, IOContext *ioc,
+openoffice_file_save_real (GOFileSaver const *fs, GOIOContext *ioc,
WorkbookView const *wbv, GsfOutput *output, gboolean with_extension)
{
static struct {
@@ -3887,22 +3887,22 @@ openoffice_file_save_real (GOFileSaver const *fs, IOContext *ioc,
void
-openoffice_file_save (GOFileSaver const *fs, IOContext *ioc,
+openoffice_file_save (GOFileSaver const *fs, GOIOContext *ioc,
WorkbookView const *wbv, GsfOutput *output);
G_MODULE_EXPORT void
-openoffice_file_save (GOFileSaver const *fs, IOContext *ioc,
+openoffice_file_save (GOFileSaver const *fs, GOIOContext *ioc,
WorkbookView const *wbv, GsfOutput *output)
{
openoffice_file_save_real (fs, ioc, wbv, output, FALSE);
}
void
-odf_file_save (GOFileSaver const *fs, IOContext *ioc,
+odf_file_save (GOFileSaver const *fs, GOIOContext *ioc,
WorkbookView const *wbv, GsfOutput *output);
G_MODULE_EXPORT void
-odf_file_save (GOFileSaver const *fs, IOContext *ioc,
+odf_file_save (GOFileSaver const *fs, GOIOContext *ioc,
WorkbookView const *wbv, GsfOutput *output)
{
openoffice_file_save_real (fs, ioc, wbv, output, TRUE);
diff --git a/plugins/paradox/paradox.c b/plugins/paradox/paradox.c
index c3b0b19..5094d69 100644
--- a/plugins/paradox/paradox.c
+++ b/plugins/paradox/paradox.c
@@ -35,10 +35,10 @@ static void *gn_realloc (pxdoc_t *p, void *mem, size_t len, const char *caller)
static void gn_free (pxdoc_t *p, void *ptr) { g_free ((gpointer) ptr); ptr = NULL; }
#endif
-void paradox_file_open (GOFileOpener const *fo, IOContext *io_context,
+void paradox_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input);
G_MODULE_EXPORT void
-paradox_file_open (GOFileOpener const *fo, IOContext *io_context,
+paradox_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input)
{
Workbook *wb;
@@ -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_go_error_info_set (io_context, go_error_info_new_str_with_details (
+ go_io_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_go_error_info_set (io_context, go_error_info_new_str_with_details (
+ go_io_error_info_set (io_context, go_error_info_new_str_with_details (
_("Error while opening Paradox file."),
open_error));
return;
@@ -291,10 +291,10 @@ paradox_file_probe (GOFileOpener const *fo, GsfInput *input,
/*****************************************************************************/
-void paradox_file_save (GOFileSaver const *fs, IOContext *io_context,
+void paradox_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output);
G_MODULE_EXPORT void
-paradox_file_save (GOFileSaver const *fs, IOContext *io_context,
+paradox_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output)
{
Sheet *sheet;
@@ -308,7 +308,7 @@ paradox_file_save (GOFileSaver const *fs, IOContext *io_context,
sheet = wb_view_cur_sheet (wb_view);
if (sheet == NULL) {
- gnumeric_io_error_string (io_context, _("Cannot get default sheet."));
+ go_io_error_string (io_context, _("Cannot get default sheet."));
return;
}
@@ -324,7 +324,7 @@ paradox_file_save (GOFileSaver const *fs, IOContext *io_context,
* PX_create_fp(). The memory is freed by PX_delete() including
* the memory for the field name. */
if ((pxf = (pxfield_t *) pxdoc->malloc (pxdoc, (r.end.col+1)*sizeof (pxfield_t), _("Allocate memory for field definitions."))) == NULL){
- gnumeric_io_error_string (io_context, _("Cannot allocate memory for field definitions."));
+ go_io_error_string (io_context, _("Cannot allocate memory for field definitions."));
PX_delete (pxdoc);
return;
}
@@ -332,7 +332,7 @@ paradox_file_save (GOFileSaver const *fs, IOContext *io_context,
for (col = r.start.col; col <= r.end.col; col++) {
GnmCell *cell = sheet_cell_get (sheet, col, 0);
if (gnm_cell_is_empty (cell)) {
- gnumeric_io_error_string (io_context, _("First line of sheet must contain database specification."));
+ go_io_error_string (io_context, _("First line of sheet must contain database specification."));
PX_delete (pxdoc);
return;
} else {
diff --git a/plugins/plan-perfect/pln.c b/plugins/plan-perfect/pln.c
index 1fb0850..9f8d433 100644
--- a/plugins/plan-perfect/pln.c
+++ b/plugins/plan-perfect/pln.c
@@ -32,7 +32,7 @@ GNM_PLUGIN_MODULE_HEADER;
gboolean pln_file_probe (GOFileOpener const *fo, GsfInput *input,
FileProbeLevel pl);
-void pln_file_open (GOFileOpener const *fo, IOContext *io_context,
+void pln_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input);
static char const *formula1[] = {
@@ -653,7 +653,7 @@ pln_parse_sheet (GsfInput *input, PlanPerfectImport *state)
}
void
-pln_file_open (GOFileOpener const *fo, IOContext *io_context,
+pln_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input)
{
Workbook *wb;
@@ -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_go_error_info_set (io_context, error);
+ go_io_error_info_set (io_context, error);
}
}
diff --git a/plugins/psiconv/boot.c b/plugins/psiconv/boot.c
index ba7bbe3..c687a6a 100644
--- a/plugins/psiconv/boot.c
+++ b/plugins/psiconv/boot.c
@@ -38,7 +38,7 @@ GNM_PLUGIN_MODULE_HEADER;
gboolean psiconv_file_probe (GOFileOpener const *fo, GsfInput *input,
FileProbeLevel pl);
-void psiconv_file_open (GOFileOpener const *fo, IOContext *io_context,
+void psiconv_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input);
@@ -49,7 +49,7 @@ psiconv_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
}
void
-psiconv_file_open (GOFileOpener const *fo, IOContext *io_context,
+psiconv_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input)
{
psiconv_read (io_context, wb_view_get_workbook(wb_view), input);
diff --git a/plugins/psiconv/psiconv-plugin.h b/plugins/psiconv/psiconv-plugin.h
index 4c55dc5..b7b2ec4 100644
--- a/plugins/psiconv/psiconv-plugin.h
+++ b/plugins/psiconv/psiconv-plugin.h
@@ -7,6 +7,6 @@
#include <gsf/gsf-input.h>
gboolean psiconv_read_header (GsfInput *input);
-void psiconv_read (IOContext *io_context, Workbook *wb, GsfInput *input);
+void psiconv_read (GOIOContext *io_context, Workbook *wb, GsfInput *input);
#endif /* PLUGIN_PSICONV_PLUGIN_H */
diff --git a/plugins/psiconv/psiconv-read.c b/plugins/psiconv/psiconv-read.c
index 83f895f..b912adb 100644
--- a/plugins/psiconv/psiconv-read.c
+++ b/plugins/psiconv/psiconv-read.c
@@ -641,14 +641,14 @@ psiconv_stream_to_buffer (GsfInput *input, int maxlen)
}
void
-psiconv_read (IOContext *io_context, Workbook *wb, GsfInput *input)
+psiconv_read (GOIOContext *io_context, Workbook *wb, GsfInput *input)
{
psiconv_buffer buf ;
psiconv_config config = NULL;
psiconv_file psi_file = NULL;
if ((buf = psiconv_stream_to_buffer (input, -1)) == NULL) {
- gnumeric_io_go_error_info_set (io_context,
+ go_io_error_info_set (io_context,
go_error_info_new_str(_("Error while reading psiconv file.")));
goto out;
}
@@ -659,7 +659,7 @@ 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_go_error_info_set (io_context,
+ go_io_error_info_set (io_context,
go_error_info_new_str(_("Error while parsing Psion file.")));
goto out;
}
@@ -667,7 +667,7 @@ psiconv_read (IOContext *io_context, Workbook *wb, GsfInput *input)
if (psi_file->type == psiconv_sheet_file)
add_sheetfile(wb,psi_file->file);
else
- gnumeric_io_go_error_info_set (io_context,
+ go_io_error_info_set (io_context,
go_error_info_new_str(_("This Psion file is not a Sheet file.")));
diff --git a/plugins/python-loader/python-loader.c b/plugins/python-loader/python-loader.c
index acd68f6..4229010 100644
--- a/plugins/python-loader/python-loader.c
+++ b/plugins/python-loader/python-loader.c
@@ -253,7 +253,7 @@ gplp_func_file_probe (GOFileOpener const *fo, GOPluginService *service,
static void
gplp_func_file_open (GOFileOpener const *fo,
GOPluginService *service,
- IOContext *io_context,
+ GOIOContext *io_context,
gpointer wb_view,
GsfInput *input)
{
@@ -287,7 +287,7 @@ gplp_func_file_open (GOFileOpener const *fo,
Py_DECREF (open_result);
workbook_sheet_attach (wb_view_get_workbook (wb_view), sheet);
} else {
- gnumeric_io_error_string (io_context, py_exc_to_string ());
+ go_io_error_string (io_context, py_exc_to_string ());
gnm_python_clear_error_if_needed (SERVICE_GET_LOADER (service)->py_object);
g_object_unref (sheet);
}
@@ -363,7 +363,7 @@ gplp_loader_data_saver_free (ServiceLoaderDataFileSaver *loader_data)
static void
gplp_func_file_save (GOFileSaver const *fs, GOPluginService *service,
- IOContext *io_context, gconstpointer wb_view,
+ GOIOContext *io_context, gconstpointer wb_view,
GsfOutput *output)
{
ServiceLoaderDataFileSaver *saver_data;
@@ -390,7 +390,7 @@ gplp_func_file_save (GOFileSaver const *fs, GOPluginService *service,
if (save_result != NULL) {
Py_DECREF (save_result);
} else {
- gnumeric_io_error_string (io_context, py_exc_to_string ());
+ go_io_error_string (io_context, py_exc_to_string ());
gnm_python_clear_error_if_needed (SERVICE_GET_LOADER (service)->py_object);
}
}
diff --git a/plugins/qpro/qpro-read.c b/plugins/qpro/qpro-read.c
index dd84849..840fc43 100644
--- a/plugins/qpro/qpro-read.c
+++ b/plugins/qpro/qpro-read.c
@@ -56,7 +56,7 @@ GNM_PLUGIN_MODULE_HEADER;
gboolean qpro_file_probe (GOFileOpener const *fo, GsfInput *input,
FileProbeLevel pl);
-void qpro_file_open (GOFileOpener const *fo, IOContext *context,
+void qpro_file_open (GOFileOpener const *fo, GOIOContext *context,
WorkbookView *new_wb_view, GsfInput *input);
static gboolean
@@ -102,7 +102,7 @@ qpro_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
typedef struct {
GsfInput *input;
- IOContext *io_context;
+ GOIOContext *io_context;
WorkbookView *wbv;
Workbook *wb;
Sheet *cur_sheet;
@@ -864,7 +864,7 @@ qpro_read_sheet (QProReadState *state)
if (low == 100) {
if (high < 10 || high > 400)
- gnm_io_warning (state->io_context,
+ go_io_warning (state->io_context,
_("Invalid zoom %hd %%"), high);
else
g_object_set (sheet, "zoom-factor", high / 100.0, NULL);
@@ -905,7 +905,7 @@ qpro_read_workbook (QProReadState *state, GsfInput *input)
default :
if (id > QPRO_LAST_SANE_ID)
- gnm_io_warning (state->io_context,
+ go_io_warning (state->io_context,
_("Invalid record %d of length %hd"),
id, len);
};
@@ -915,7 +915,7 @@ qpro_read_workbook (QProReadState *state, GsfInput *input)
}
void
-qpro_file_open (GOFileOpener const *fo, IOContext *context,
+qpro_file_open (GOFileOpener const *fo, GOIOContext *context,
WorkbookView *new_wb_view, GsfInput *input)
{
QProReadState state;
@@ -938,7 +938,7 @@ qpro_file_open (GOFileOpener const *fo, IOContext *context,
qpro_read_workbook (&state, stream);
g_object_unref (G_OBJECT (stream));
} else
- gnm_io_warning (context,
+ go_io_warning (context,
_("Unable to find the PerfectOffice_MAIN stream. Is this really a Quattro Pro file?"));
g_object_unref (G_OBJECT (ole));
} else
diff --git a/plugins/sc/sc.c b/plugins/sc/sc.c
index 4bdf5e1..689e507 100644
--- a/plugins/sc/sc.c
+++ b/plugins/sc/sc.c
@@ -36,7 +36,7 @@ GNM_PLUGIN_MODULE_HEADER;
gboolean sc_file_probe (GOFileOpener const *fo, GsfInput *input,
FileProbeLevel pl);
-void sc_file_open (GOFileOpener const *fo, IOContext *io_context,
+void sc_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input);
typedef struct {
@@ -595,7 +595,7 @@ sc_conventions (void)
void
-sc_file_open (GOFileOpener const *fo, IOContext *io_context,
+sc_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input)
{
Workbook *wb;
@@ -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_go_error_info_set (io_context, error);
+ go_io_error_info_set (io_context, error);
}
g_object_unref (G_OBJECT (state.textline));
g_iconv_close (state.converter);
diff --git a/plugins/sylk/sylk-write.c b/plugins/sylk/sylk-write.c
index 385a09f..1388806 100644
--- a/plugins/sylk/sylk-write.c
+++ b/plugins/sylk/sylk-write.c
@@ -216,10 +216,10 @@ sylk_conventions_new (void)
}
G_MODULE_EXPORT void
-sylk_file_save (GOFileSaver const *fs, IOContext *io_context,
+sylk_file_save (GOFileSaver const *fs, GOIOContext *io_context,
gconstpointer wb_view, GsfOutput *output);
void
-sylk_file_save (GOFileSaver const *fs, IOContext *io_context,
+sylk_file_save (GOFileSaver const *fs, GOIOContext *io_context,
gconstpointer wb_view, GsfOutput *output)
{
GnmLocale *locale;
@@ -231,7 +231,7 @@ sylk_file_save (GOFileSaver const *fs, IOContext *io_context,
state.convs = sylk_conventions_new ();
if (NULL == state.sheet) {
- gnumeric_io_error_string (io_context, _("Cannot get default sheet."));
+ go_io_error_string (io_context, _("Cannot get default sheet."));
return;
}
diff --git a/plugins/sylk/sylk.c b/plugins/sylk/sylk.c
index 6b622ee..f8bcc42 100644
--- a/plugins/sylk/sylk.c
+++ b/plugins/sylk/sylk.c
@@ -43,11 +43,11 @@
GNM_PLUGIN_MODULE_HEADER;
gboolean sylk_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl);
-void sylk_file_open (GOFileOpener const *fo, IOContext *io_context,
+void sylk_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input);
typedef struct {
- IOContext *io_context;
+ GOIOContext *io_context;
GsfInputTextline *input;
GIConv converter;
@@ -72,7 +72,7 @@ sylk_read_warning (SylkReader *state, char const *fmt, ...)
va_end (args);
g_warning ("%d:%s", state->line_no, msg);
- gnm_io_warning (state->io_context, "%d:%s", state->line_no, msg);
+ go_io_warning (state->io_context, "%d:%s", state->line_no, msg);
g_free (msg);
}
@@ -793,7 +793,7 @@ sylk_parse_sheet (SylkReader *state)
void
sylk_file_open (GOFileOpener const *fo,
- IOContext *io_context,
+ GOIOContext *io_context,
WorkbookView *wb_view,
GsfInput *input)
{
diff --git a/plugins/xbase/boot.c b/plugins/xbase/boot.c
index 28ca45b..ddc0b14 100644
--- a/plugins/xbase/boot.c
+++ b/plugins/xbase/boot.c
@@ -26,7 +26,7 @@
GNM_PLUGIN_MODULE_HEADER;
-void xbase_file_open (GOFileOpener const *fo, IOContext *io_context,
+void xbase_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input);
@@ -144,7 +144,7 @@ create_header (Sheet *sheet, XBfile *file)
}
void
-xbase_file_open (GOFileOpener const *fo, IOContext *io_context,
+xbase_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input)
{
Workbook *wb;
@@ -156,7 +156,7 @@ xbase_file_open (GOFileOpener const *fo, IOContext *io_context,
int pass;
if ((file = xbase_open (input, &open_error)) == NULL) {
- gnumeric_io_go_error_info_set (io_context, go_error_info_new_str_with_details (
+ go_io_error_info_set (io_context, go_error_info_new_str_with_details (
_("Error while opening xbase file."),
open_error));
return;
diff --git a/src/gui-clipboard.c b/src/gui-clipboard.c
index cde4f3e..d6f0de6 100644
--- a/src/gui-clipboard.c
+++ b/src/gui-clipboard.c
@@ -262,7 +262,7 @@ table_cellregion_read (WorkbookControl *wbc, char const *reader_id,
GSList *sheets;
GnmCellRegion *ret = NULL;
const GOFileOpener *reader = go_file_opener_for_id (reader_id);
- IOContext *ioc;
+ GOIOContext *ioc;
GsfInput *input;
if (!reader) {
@@ -270,11 +270,11 @@ table_cellregion_read (WorkbookControl *wbc, char const *reader_id,
return NULL;
}
- ioc = gnumeric_io_context_new (GO_CMD_CONTEXT (wbc));
+ ioc = go_io_context_new (GO_CMD_CONTEXT (wbc));
input = gsf_input_memory_new (buffer, length, FALSE);
wb_view = wb_view_new_from_input (input, reader, ioc, NULL);
- if (gnumeric_io_error_occurred (ioc) || wb_view == NULL) {
- gnumeric_io_error_display (ioc);
+ if (go_io_error_occurred (ioc) || wb_view == NULL) {
+ go_io_error_display (ioc);
goto out;
}
@@ -522,7 +522,7 @@ table_cellregion_write (GOCmdContext *ctx, GnmCellRegion *cr,
guchar *ret = NULL;
const GOFileSaver *saver = go_file_saver_for_id (saver_id);
GsfOutput *output;
- IOContext *ioc;
+ GOIOContext *ioc;
Workbook *wb;
WorkbookView *wb_view;
Sheet *sheet;
@@ -534,7 +534,7 @@ table_cellregion_write (GOCmdContext *ctx, GnmCellRegion *cr,
return NULL;
output = gsf_output_memory_new ();
- ioc = gnumeric_io_context_new (ctx);
+ ioc = go_io_context_new (ctx);
{
int cols = cr->cols;
@@ -556,7 +556,7 @@ table_cellregion_write (GOCmdContext *ctx, GnmCellRegion *cr,
PASTE_COMMENTS | PASTE_OBJECTS);
if (clipboard_paste_region (cr, &pt, ctx) == FALSE) {
go_file_saver_save (saver, ioc, wb_view, output);
- if (!gnumeric_io_error_occurred (ioc)) {
+ if (!go_io_error_occurred (ioc)) {
GsfOutputMemory *omem = GSF_OUTPUT_MEMORY (output);
gsf_off_t osize = gsf_output_size (output);
diff --git a/src/gui-file.c b/src/gui-file.c
index 90d15e4..81995da 100644
--- a/src/gui-file.c
+++ b/src/gui-file.c
@@ -115,17 +115,17 @@ gboolean
gui_file_read (WBCGtk *wbcg, char const *uri,
GOFileOpener const *optional_format, gchar const *optional_encoding)
{
- IOContext *io_context;
+ GOIOContext *io_context;
WorkbookView *wbv;
go_cmd_context_set_sensitive (GO_CMD_CONTEXT (wbcg), FALSE);
- io_context = gnumeric_io_context_new (GO_CMD_CONTEXT (wbcg));
+ io_context = go_io_context_new (GO_CMD_CONTEXT (wbcg));
wbv = wb_view_new_from_uri (uri, optional_format, io_context,
optional_encoding);
- if (gnumeric_io_error_occurred (io_context) ||
- gnumeric_io_warning_occurred (io_context))
- gnumeric_io_error_display (io_context);
+ if (go_io_error_occurred (io_context) ||
+ go_io_warning_occurred (io_context))
+ go_io_error_display (io_context);
g_object_unref (G_OBJECT (io_context));
go_cmd_context_set_sensitive (GO_CMD_CONTEXT (wbcg), TRUE);
@@ -141,19 +141,19 @@ gui_file_read (WBCGtk *wbcg, char const *uri,
gboolean
gui_file_template (WBCGtk *wbcg, char const *uri)
{
- IOContext *io_context;
+ GOIOContext *io_context;
WorkbookView *wbv;
GOFileOpener const *optional_format = NULL;
gchar const *optional_encoding = NULL;
go_cmd_context_set_sensitive (GO_CMD_CONTEXT (wbcg), FALSE);
- io_context = gnumeric_io_context_new (GO_CMD_CONTEXT (wbcg));
+ io_context = go_io_context_new (GO_CMD_CONTEXT (wbcg));
wbv = wb_view_new_from_uri (uri, optional_format, io_context,
optional_encoding);
- if (gnumeric_io_error_occurred (io_context) ||
- gnumeric_io_warning_occurred (io_context))
- gnumeric_io_error_display (io_context);
+ if (go_io_error_occurred (io_context) ||
+ go_io_warning_occurred (io_context))
+ go_io_error_display (io_context);
g_object_unref (G_OBJECT (io_context));
go_cmd_context_set_sensitive (GO_CMD_CONTEXT (wbcg), TRUE);
diff --git a/src/io-context-gtk.c b/src/io-context-gtk.c
index b62d112..e479803 100644
--- a/src/io-context-gtk.c
+++ b/src/io-context-gtk.c
@@ -28,12 +28,12 @@
#define ICG_POPUP_DELAY 3.0
#define IO_CONTEXT_GTK_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_IO_CONTEXT_GTK, IOContextGtk))
-#define IS_IO_CONTEXT_GTK_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_IO_CONTEXT_GTK))
+ (G_TYPE_CHECK_CLASS_CAST ((klass), GO_TYPE_IO_CONTEXT_GTK, IOContextGtk))
+#define GO_IS_IO_CONTEXT_GTK_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), GO_TYPE_IO_CONTEXT_GTK))
struct _IOContextGtk {
- IOContext parent;
+ GOIOContext parent;
GtkWindow *window;
GtkWindow *parent_window;
GtkProgressBar *file_bar;
@@ -53,7 +53,7 @@ struct _IOContextGtk {
};
struct _IOContextGtkClass {
- IOContextClass parent_class;
+ GOIOContextClass parent_class;
};
enum {
@@ -270,13 +270,13 @@ icg_error_error_info (GOCmdContext *cc, GOErrorInfo *error)
}
static void
-icg_set_num_files (IOContext *icg, guint files_total)
+icg_set_num_files (GOIOContext *icg, guint files_total)
{
IO_CONTEXT_GTK (icg)->files_total = files_total;
}
static void
-icg_processing_file (IOContext *ioc, char const *file)
+icg_processing_file (GOIOContext *ioc, char const *file)
{
IOContextGtk *icg = IO_CONTEXT_GTK (ioc);
@@ -339,7 +339,7 @@ icg_finalize (GObject *obj)
g_timer_destroy (icg->timer);
icg->timer = NULL;
- G_OBJECT_CLASS (g_type_class_peek (TYPE_IO_CONTEXT))->finalize (obj);
+ G_OBJECT_CLASS (g_type_class_peek (GO_TYPE_IO_CONTEXT))->finalize (obj);
}
static void
@@ -372,7 +372,7 @@ icg_gnm_cmd_context_init (GOCmdContextClass *cc_class)
static void
icg_class_init (GObjectClass *gobj_klass)
{
- IOContextClass *ioc_klass = (IOContextClass *)gobj_klass;
+ GOIOContextClass *ioc_klass = (GOIOContextClass *)gobj_klass;
gobj_klass->finalize = icg_finalize;
gobj_klass->set_property = icg_set_property;
@@ -413,7 +413,7 @@ icg_init (IOContextGtk *icg)
GSF_CLASS_FULL (IOContextGtk, io_context_gtk,
NULL, NULL, icg_class_init, NULL,
- icg_init, TYPE_IO_CONTEXT, 0,
+ icg_init, GO_TYPE_IO_CONTEXT, 0,
GSF_INTERFACE (icg_gnm_cmd_context_init, GO_TYPE_CMD_CONTEXT))
void
diff --git a/src/io-context-gtk.h b/src/io-context-gtk.h
index 3148666..6cbd69c 100644
--- a/src/io-context-gtk.h
+++ b/src/io-context-gtk.h
@@ -12,11 +12,11 @@ G_BEGIN_DECLS
typedef struct _IOContextGtk IOContextGtk;
typedef struct _IOContextGtkClass IOContextGtkClass;
-#define TYPE_IO_CONTEXT_GTK (io_context_gtk_get_type ())
+#define GO_TYPE_IO_CONTEXT_GTK (io_context_gtk_get_type ())
#define IO_CONTEXT_GTK(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_IO_CONTEXT_GTK, IOContextGtk))
-#define IS_IO_CONTEXT_GTK(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_IO_CONTEXT_GTK))
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), GO_TYPE_IO_CONTEXT_GTK, IOContextGtk))
+#define GO_IS_IO_CONTEXT_GTK(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GO_TYPE_IO_CONTEXT_GTK))
GType io_context_gtk_get_type (void);
void icg_set_transient_for (IOContextGtk *icg, GtkWindow *parent_window);
diff --git a/src/main-application.c b/src/main-application.c
index a151bc2..1c3bb28 100644
--- a/src/main-application.c
+++ b/src/main-application.c
@@ -300,7 +300,7 @@ main (int argc, char const **argv)
{
gboolean opened_workbook = FALSE;
gboolean with_gui;
- IOContext *ioc;
+ GOIOContext *ioc;
WorkbookView *wbv;
GSList *wbcgs_to_kill = NULL;
@@ -352,8 +352,8 @@ main (int argc, char const **argv)
gnm_init ();
if (with_gui) {
- ioc = IO_CONTEXT
- (g_object_new (TYPE_IO_CONTEXT_GTK,
+ ioc = GO_IO_CONTEXT
+ (g_object_new (GO_TYPE_IO_CONTEXT_GTK,
"show-splash", !gnumeric_no_splash,
"show-warnings", !gnumeric_no_warnings,
NULL));
@@ -362,7 +362,7 @@ main (int argc, char const **argv)
} else {
/* TODO: Make this inconsistency go away */
GOCmdContext *cc = cmd_context_stderr_new ();
- ioc = gnumeric_io_context_new (cc);
+ ioc = go_io_context_new (cc);
g_object_unref (cc);
}
@@ -390,7 +390,7 @@ main (int argc, char const **argv)
for (i = 0; startup_files [i]; i++)
;
- gnm_io_context_set_num_files (ioc, i);
+ go_io_context_set_num_files (ioc, i);
for (i = 0;
startup_files [i] && !initial_workbook_open_complete;
i++) {
@@ -401,14 +401,14 @@ main (int argc, char const **argv)
continue;
}
- gnm_io_context_processing_file (ioc, uri);
+ go_io_context_processing_file (ioc, uri);
wbv = wb_view_new_from_uri (uri, NULL, ioc, NULL);
g_free (uri);
- if (gnumeric_io_error_occurred (ioc) ||
- gnumeric_io_warning_occurred (ioc)) {
- gnumeric_io_error_display (ioc);
- gnumeric_io_error_clear (ioc);
+ if (go_io_error_occurred (ioc) ||
+ go_io_warning_occurred (ioc)) {
+ go_io_error_display (ioc);
+ go_io_error_clear (ioc);
}
if (wbv != NULL) {
WBCGtk *wbcg;
diff --git a/src/print-info.c b/src/print-info.c
index 817684c..c1a53cf 100644
--- a/src/print-info.c
+++ b/src/print-info.c
@@ -699,7 +699,7 @@ hf_render_info_destroy (HFRenderInfo *hfi)
}
static void
-pdf_write_workbook (GOFileSaver const *fs, IOContext *context,
+pdf_write_workbook (GOFileSaver const *fs, GOIOContext *context,
gconstpointer wbv_, GsfOutput *output)
{
WorkbookView const *wbv = wbv_;
diff --git a/src/sheet-control-gui.c b/src/sheet-control-gui.c
index 21e18e3..ebfddd9 100644
--- a/src/sheet-control-gui.c
+++ b/src/sheet-control-gui.c
@@ -3290,7 +3290,7 @@ scg_drag_receive_img_uri (SheetControlGUI *scg, double x, double y, const gchar
{
GError *err = NULL;
GsfInput *input = go_file_open (uri, &err);
- IOContext *ioc = gnumeric_io_context_new (GO_CMD_CONTEXT (scg->wbcg));
+ GOIOContext *ioc = go_io_context_new (GO_CMD_CONTEXT (scg->wbcg));
if (input != NULL) {
unsigned len = gsf_input_size (input);
@@ -3301,10 +3301,10 @@ scg_drag_receive_img_uri (SheetControlGUI *scg, double x, double y, const gchar
} else
go_cmd_context_error (GO_CMD_CONTEXT (ioc), err);
- if (gnumeric_io_error_occurred (ioc) ||
- gnumeric_io_warning_occurred (ioc)) {
- gnumeric_io_error_display (ioc);
- gnumeric_io_error_clear (ioc);
+ if (go_io_error_occurred (ioc) ||
+ go_io_warning_occurred (ioc)) {
+ go_io_error_display (ioc);
+ go_io_error_clear (ioc);
}
g_object_unref (ioc);
}
@@ -3314,7 +3314,7 @@ scg_drag_receive_spreadsheet (SheetControlGUI *scg, const gchar *uri)
{
GError *err = NULL;
GsfInput *input = go_file_open (uri, &err);
- IOContext *ioc = gnumeric_io_context_new (GO_CMD_CONTEXT (scg->wbcg));
+ GOIOContext *ioc = go_io_context_new (GO_CMD_CONTEXT (scg->wbcg));
if (input != NULL) {
WorkbookView *wbv;
@@ -3327,10 +3327,10 @@ scg_drag_receive_spreadsheet (SheetControlGUI *scg, const gchar *uri)
} else
go_cmd_context_error (GO_CMD_CONTEXT (ioc), err);
- if (gnumeric_io_error_occurred (ioc) ||
- gnumeric_io_warning_occurred (ioc)) {
- gnumeric_io_error_display (ioc);
- gnumeric_io_error_clear (ioc);
+ if (go_io_error_occurred (ioc) ||
+ go_io_warning_occurred (ioc)) {
+ go_io_error_display (ioc);
+ go_io_error_clear (ioc);
}
g_object_unref (ioc);
}
diff --git a/src/ssconvert.c b/src/ssconvert.c
index 713bf25..6689c2d 100644
--- a/src/ssconvert.c
+++ b/src/ssconvert.c
@@ -237,7 +237,7 @@ list_them (get_them_f get_them,
*/
static GSList *
read_files_to_merge (const char *inputs[], GOFileOpener *fo,
- IOContext *io_context, GOCmdContext *cc)
+ GOIOContext *io_context, GOCmdContext *cc)
{
GSList *wbs = NULL;
@@ -250,7 +250,7 @@ read_files_to_merge (const char *inputs[], GOFileOpener *fo,
g_free (uri);
inputs++;
- if (gnumeric_io_error_occurred (io_context)) {
+ if (go_io_error_occurred (io_context)) {
go_slist_free_custom (wbs, g_object_unref);
return NULL;
}
@@ -381,15 +381,15 @@ merge_single (Workbook *wb, Workbook *wb2,
/* Merge a collection of workbooks into one. */
static gboolean
merge (Workbook *wb, char const *inputs[],
- GOFileOpener *fo, IOContext *io_context, GOCmdContext *cc)
+ GOFileOpener *fo, GOIOContext *io_context, GOCmdContext *cc)
{
GSList *wbs, *l;
int result = 0;
int cmax, rmax;
wbs = read_files_to_merge (inputs, fo, io_context, cc);
- if (gnumeric_io_error_occurred (io_context)) {
- gnumeric_io_error_display (io_context);
+ if (go_io_error_occurred (io_context)) {
+ go_io_error_display (io_context);
return TRUE;
}
@@ -472,7 +472,7 @@ convert (char const *inarg, char const *outarg, char const *mergeargs[],
}
if (fs != NULL) {
- IOContext *io_context = gnumeric_io_context_new (cc);
+ GOIOContext *io_context = go_io_context_new (cc);
WorkbookView *wbv;
if (mergeargs==NULL) {
wbv = wb_view_new_from_uri (infile, fo,
@@ -482,8 +482,8 @@ convert (char const *inarg, char const *outarg, char const *mergeargs[],
wbv = workbook_view_new (NULL);
}
- if (wbv == NULL || gnumeric_io_error_occurred (io_context)) {
- gnumeric_io_error_display (io_context);
+ if (wbv == NULL || go_io_error_occurred (io_context)) {
+ go_io_error_display (io_context);
res = 1;
} else {
Workbook *wb = wb_view_get_workbook (wbv);
diff --git a/src/ssgrep.c b/src/ssgrep.c
index efe5e41..0a06c6f 100644
--- a/src/ssgrep.c
+++ b/src/ssgrep.c
@@ -270,7 +270,7 @@ search_string_table (Workbook *wb, char const *file_name, GHashTable *targets)
}
static void
-ssgrep (const char *arg, char const *uri, IOContext *ioc, GHashTable *targets, char const *pattern)
+ssgrep (const char *arg, char const *uri, GOIOContext *ioc, GHashTable *targets, char const *pattern)
{
WorkbookView *wbv;
Workbook *wb;
@@ -414,7 +414,7 @@ main (int argc, char const **argv)
{
GHashTable *ssgrep_targets;
GOErrorInfo *plugin_errs;
- IOContext *ioc;
+ GOIOContext *ioc;
GOCmdContext *cc;
GOptionContext *ocontext;
GError *error = NULL;
@@ -519,8 +519,8 @@ main (int argc, char const **argv)
go_error_info_free (plugin_errs);
}
- ioc = gnumeric_io_context_new (cc);
- gnm_io_context_set_num_files (ioc, N);
+ ioc = go_io_context_new (cc);
+ go_io_context_set_num_files (ioc, N);
if (ssgrep_print_filenames == (gboolean)2)
ssgrep_print_filenames = (N > 1);
@@ -528,7 +528,7 @@ main (int argc, char const **argv)
for (; argv[i]; i++) {
const char *arg = argv[i];
char *uri = go_shell_arg_to_uri (arg);
- gnm_io_context_processing_file (ioc, uri);
+ go_io_context_processing_file (ioc, uri);
ssgrep (arg, uri, ioc, ssgrep_targets, ssgrep_pattern);
g_free (uri);
}
diff --git a/src/ssindex.c b/src/ssindex.c
index a3924f7..bba8005 100644
--- a/src/ssindex.c
+++ b/src/ssindex.c
@@ -73,7 +73,7 @@ static GOptionEntry const ssindex_options [] = {
typedef struct {
- IOContext *context;
+ GOIOContext *context;
WorkbookView const *wb_view;
Workbook const *wb;
Sheet *sheet;
@@ -161,7 +161,7 @@ cb_index_name (const char *name, GnmExprName const *nexpr, IndexerState *state)
* - plugins used
**/
static int
-ssindex (char const *file, IOContext *ioc)
+ssindex (char const *file, GOIOContext *ioc)
{
int i, res = 0;
GParamSpec *pspec;
@@ -279,14 +279,14 @@ main (int argc, char const **argv)
}
if (ssindex_run_indexer) {
- IOContext *ioc = gnumeric_io_context_new (cc);
+ GOIOContext *ioc = go_io_context_new (cc);
int i;
- gnm_io_context_set_num_files (ioc, argc - 1);
+ go_io_context_set_num_files (ioc, argc - 1);
for (i = 1; i < argc; i++) {
char const *file = argv[i];
- gnm_io_context_processing_file (ioc, file);
+ go_io_context_processing_file (ioc, file);
res |= ssindex (file, ioc);
}
g_object_unref (ioc);
diff --git a/src/stf-export.c b/src/stf-export.c
index ac50980..042e8a8 100644
--- a/src/stf-export.c
+++ b/src/stf-export.c
@@ -583,7 +583,7 @@ gnm_stf_get_stfe (GObject *obj)
}
static void
-gnm_stf_file_saver_save (GOFileSaver const *fs, IOContext *context,
+gnm_stf_file_saver_save (GOFileSaver const *fs, GOIOContext *context,
gconstpointer wbv, GsfOutput *output)
{
Workbook *wb = wb_view_get_workbook (wbv);
@@ -596,7 +596,7 @@ gnm_stf_file_saver_save (GOFileSaver const *fs, IOContext *context,
gboolean cancelled =
stf_export_dialog (WBC_GTK (context->impl), stfe, wb);
if (cancelled) {
- gnumeric_io_error_unknown (context);
+ go_io_error_unknown (context);
return;
}
}
diff --git a/src/stf.c b/src/stf.c
index 173650e..f9a639e 100644
--- a/src/stf.c
+++ b/src/stf.c
@@ -173,7 +173,7 @@ stf_store_results (DialogStfResult_t *dialogresult,
**/
static void
stf_read_workbook (GOFileOpener const *fo, gchar const *enc,
- IOContext *context, gpointer wbv, GsfInput *input)
+ GOIOContext *context, gpointer wbv, GsfInput *input)
{
DialogStfResult_t *dialogresult = NULL;
char *name, *nameutf8 = NULL;
@@ -338,7 +338,7 @@ stf_text_to_columns (WorkbookControl *wbc, GOCmdContext *cc)
**/
static void
stf_read_workbook_auto_csvtab (GOFileOpener const *fo, gchar const *enc,
- IOContext *context,
+ GOIOContext *context,
gpointer wbv, GsfInput *input)
{
Sheet *sheet, *old_sheet;
@@ -443,7 +443,7 @@ stf_read_workbook_auto_csvtab (GOFileOpener const *fo, gchar const *enc,
/***********************************************************************************/
static void
-stf_write_csv (GOFileSaver const *fs, IOContext *context,
+stf_write_csv (GOFileSaver const *fs, GOIOContext *context,
gconstpointer wbv, GsfOutput *output)
{
Sheet *sheet;
diff --git a/src/test-pango.c b/src/test-pango.c
index f4ed5f0..5db3947 100644
--- a/src/test-pango.c
+++ b/src/test-pango.c
@@ -55,14 +55,14 @@ main (int argc, char const **argv)
{
GOCmdContext *cc;
WorkbookControl *wbc;
- IOContext *ioc;
+ GOIOContext *ioc;
argv = gnm_pre_parse_init (argc, argv);
gtk_init (&argc, &argv);
gnm_init ();
cc = cmd_context_stderr_new ();
- ioc = gnumeric_io_context_new (cc);
+ ioc = go_io_context_new (cc);
g_object_unref (cc);
gnm_plugins_init (GO_CMD_CONTEXT (ioc));
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index 358988a..2f48072 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -114,7 +114,7 @@ static GNM_ACTION_DEF (cb_file_sendto) {
WorkbookView *wbv = wb_control_view (wbc);
GOCmdContext *gcc = GO_CMD_CONTEXT (wbcg);
gboolean problem = FALSE;
- IOContext *io_context;
+ GOIOContext *io_context;
Workbook *wb;
GOFileSaver *fs;
@@ -124,7 +124,7 @@ static GNM_ACTION_DEF (cb_file_sendto) {
if (fs == NULL)
fs = go_file_saver_get_default ();
- io_context = gnumeric_io_context_new (gcc);
+ io_context = go_io_context_new (gcc);
if (fs != NULL) {
char *template, *full_name, *uri;
char *basename = g_path_get_basename (go_doc_get_uri (GO_DOC (wb)));
@@ -152,7 +152,7 @@ static GNM_ACTION_DEF (cb_file_sendto) {
if (errno != EEXIST) {
go_cmd_context_error_export (gcc,
_("Failed to create temporary file for sending."));
- gnumeric_io_error_display (io_context);
+ go_io_error_display (io_context);
problem = TRUE;
break;
}
@@ -170,11 +170,11 @@ static GNM_ACTION_DEF (cb_file_sendto) {
wb_view_save_to_uri (wbv, fs, uri, io_context);
- if (gnumeric_io_error_occurred (io_context) ||
- gnumeric_io_warning_occurred (io_context))
- gnumeric_io_error_display (io_context);
+ if (go_io_error_occurred (io_context) ||
+ go_io_warning_occurred (io_context))
+ go_io_error_display (io_context);
- if (gnumeric_io_error_occurred (io_context)) {
+ if (go_io_error_occurred (io_context)) {
problem = TRUE;
} else {
/* mutt does not handle urls with no destination
@@ -190,7 +190,7 @@ static GNM_ACTION_DEF (cb_file_sendto) {
if (err != NULL) {
go_cmd_context_error (GO_CMD_CONTEXT (io_context), err);
g_error_free (err);
- gnumeric_io_error_display (io_context);
+ go_io_error_display (io_context);
problem = TRUE;
}
}
@@ -209,7 +209,7 @@ static GNM_ACTION_DEF (cb_file_sendto) {
} else {
go_cmd_context_error_export (GO_CMD_CONTEXT (io_context),
_("Default file saver is not available."));
- gnumeric_io_error_display (io_context);
+ go_io_error_display (io_context);
problem = TRUE;
}
diff --git a/src/workbook-view.c b/src/workbook-view.c
index 12bf4d3..fdcc0ff 100644
--- a/src/workbook-view.c
+++ b/src/workbook-view.c
@@ -958,13 +958,13 @@ workbook_view_new (Workbook *wb)
* @wbv : #WorkbookView
* @fs : #GOFileSaver
* @output : #GsfOutput
- * @io_context : #IOContext
+ * @io_context : #GOIOContext
*
* NOTE : Temporary api until we get the new output framework.
**/
void
wbv_save_to_output (WorkbookView *wbv, GOFileSaver const *fs,
- GsfOutput *output, IOContext *io_context)
+ GsfOutput *output, GOIOContext *io_context)
{
GError const *err;
char const *msg;
@@ -980,13 +980,13 @@ wbv_save_to_output (WorkbookView *wbv, GOFileSaver const *fs,
if (NULL == (msg = err->message))
msg = _("An unexplained error happened while saving.");
g_printerr (" ==> %s\n", msg);
- if (!gnumeric_io_error_occurred (io_context))
+ if (!go_io_error_occurred (io_context))
go_cmd_context_error_export (GO_CMD_CONTEXT (io_context), msg);
}
void
wb_view_save_to_uri (WorkbookView *wbv, GOFileSaver const *fs,
- char const *uri, IOContext *io_context)
+ char const *uri, GOIOContext *io_context)
{
char *msg = NULL;
GError *err = NULL;
@@ -1028,7 +1028,7 @@ gboolean
wb_view_save_as (WorkbookView *wbv, GOFileSaver *fs, char const *uri,
GOCmdContext *context)
{
- IOContext *io_context;
+ GOIOContext *io_context;
Workbook *wb;
gboolean has_error, has_warning;
@@ -1039,14 +1039,14 @@ wb_view_save_as (WorkbookView *wbv, GOFileSaver *fs, char const *uri,
wb = wb_view_get_workbook (wbv);
g_object_ref (wb);
- io_context = gnumeric_io_context_new (context);
+ io_context = go_io_context_new (context);
go_cmd_context_set_sensitive (context, FALSE);
wb_view_save_to_uri (wbv, fs, uri, io_context);
go_cmd_context_set_sensitive (context, TRUE);
- has_error = gnumeric_io_error_occurred (io_context);
- has_warning = gnumeric_io_warning_occurred (io_context);
+ has_error = go_io_error_occurred (io_context);
+ has_warning = go_io_warning_occurred (io_context);
if (!has_error) {
if (workbook_set_saveinfo (wb,
go_file_saver_get_format_level (fs), fs) &&
@@ -1054,7 +1054,7 @@ wb_view_save_as (WorkbookView *wbv, GOFileSaver *fs, char const *uri,
go_doc_set_dirty (GO_DOC (wb), FALSE);
}
if (has_error || has_warning)
- gnumeric_io_error_display (io_context);
+ go_io_error_display (io_context);
g_object_unref (G_OBJECT (io_context));
g_object_unref (wb);
@@ -1075,7 +1075,7 @@ wb_view_save_as (WorkbookView *wbv, GOFileSaver *fs, char const *uri,
gboolean
wb_view_save (WorkbookView *wbv, GOCmdContext *context)
{
- IOContext *io_context;
+ GOIOContext *io_context;
Workbook *wb;
GOFileSaver *fs;
gboolean has_error, has_warning;
@@ -1090,7 +1090,7 @@ wb_view_save (WorkbookView *wbv, GOCmdContext *context)
if (fs == NULL)
fs = go_file_saver_get_default ();
- io_context = gnumeric_io_context_new (context);
+ io_context = go_io_context_new (context);
if (fs == NULL)
go_cmd_context_error_export (GO_CMD_CONTEXT (io_context),
_("Default file saver is not available."));
@@ -1099,12 +1099,12 @@ wb_view_save (WorkbookView *wbv, GOCmdContext *context)
wb_view_save_to_uri (wbv, fs, uri, io_context);
}
- has_error = gnumeric_io_error_occurred (io_context);
- has_warning = gnumeric_io_warning_occurred (io_context);
+ has_error = go_io_error_occurred (io_context);
+ has_warning = go_io_warning_occurred (io_context);
if (!has_error)
go_doc_set_dirty (GO_DOC (wb), FALSE);
if (has_error || has_warning)
- gnumeric_io_error_display (io_context);
+ go_io_error_display (io_context);
g_object_unref (G_OBJECT (io_context));
g_object_unref (wb);
@@ -1115,7 +1115,7 @@ wb_view_save (WorkbookView *wbv, GOCmdContext *context)
WorkbookView *
wb_view_new_from_input (GsfInput *input,
GOFileOpener const *optional_fmt,
- IOContext *io_context,
+ GOIOContext *io_context,
char const *optional_enc)
{
WorkbookView *new_wbv = NULL;
@@ -1179,7 +1179,7 @@ wb_view_new_from_input (GsfInput *input,
go_file_opener_open (optional_fmt, optional_enc, io_context, new_wbv, input);
workbook_enable_recursive_dirty (new_wb, old);
- if (gnumeric_io_error_occurred (io_context)) {
+ if (go_io_error_occurred (io_context)) {
g_object_unref (G_OBJECT (new_wb));
new_wbv = NULL;
} else if (workbook_sheet_count (new_wb) == 0) {
@@ -1215,7 +1215,7 @@ wb_view_new_from_input (GsfInput *input,
WorkbookView *
wb_view_new_from_uri (char const *uri,
GOFileOpener const *optional_fmt,
- IOContext *io_context,
+ GOIOContext *io_context,
char const *optional_enc)
{
char *msg = NULL;
diff --git a/src/workbook-view.h b/src/workbook-view.h
index 04734c8..1fc2431 100644
--- a/src/workbook-view.h
+++ b/src/workbook-view.h
@@ -86,17 +86,17 @@ gboolean wb_view_save_as (WorkbookView *wbv, GOFileSaver *fs,
char const *file_name, GOCmdContext *cc);
gboolean wb_view_save (WorkbookView *wbv, GOCmdContext *cc);
void wbv_save_to_output (WorkbookView *wbv, GOFileSaver const *fs,
- GsfOutput *output, IOContext *io_context);
+ GsfOutput *output, GOIOContext *io_context);
void wb_view_save_to_uri (WorkbookView *wbv, GOFileSaver const *fs,
- char const *uri, IOContext *io_context);
+ char const *uri, GOIOContext *io_context);
WorkbookView *wb_view_new_from_input (GsfInput *input,
GOFileOpener const *optional_format,
- IOContext *io_context,
+ GOIOContext *io_context,
gchar const *optional_encoding);
WorkbookView *wb_view_new_from_uri (char const *uri,
GOFileOpener const *optional_format,
- IOContext *io_context,
+ GOIOContext *io_context,
gchar const *optional_encoding);
#define WORKBOOK_VIEW_FOREACH_CONTROL(wbv, control, code) \
diff --git a/src/xml-io.c b/src/xml-io.c
index a6e6ec8..4a9548b 100644
--- a/src/xml-io.c
+++ b/src/xml-io.c
@@ -404,11 +404,11 @@ xml_read_names (XmlParseContext *ctxt, xmlNodePtr tree,
texpr,
&err, TRUE, NULL);
if (err != NULL) {
- gnm_io_warning (ctxt->io_context, "%s", err);
+ go_io_warning (ctxt->io_context, "%s", err);
g_free (err);
}
} else
- gnm_io_warning (ctxt->io_context, "%s", perr.err->message);
+ go_io_warning (ctxt->io_context, "%s", perr.err->message);
parse_error_free (&perr);
xmlFree (name_str);
@@ -1692,7 +1692,7 @@ xml_read_sheet_object (XmlParseContext const *ctxt, xmlNodePtr tree,
if (type == 0) {
char *str = g_strdup_printf (_("Unsupported object type '%s'"),
tree->name);
- gnm_io_warning_unsupported_feature (ctxt->io_context, str);
+ go_io_warning_unsupported_feature (ctxt->io_context, str);
g_free (str);
return NULL;
}
@@ -2351,7 +2351,7 @@ xml_read_workbook_n_elements (xmlNodePtr tree)
* Create a Workbook equivalent to the XML subtree of doc.
*/
static gboolean
-xml_workbook_read (IOContext *context,
+xml_workbook_read (GOIOContext *context,
XmlParseContext *ctxt, xmlNodePtr tree)
{
Sheet *sheet;
@@ -2572,17 +2572,17 @@ maybe_convert (GsfInput *input, gboolean quiet)
/**************************************************************************/
-static IOContext *io_context = NULL;
+static GOIOContext *io_context = NULL;
static void
xml_dom_read_warning (gpointer state, char const *fmt, ...)
{
va_list args;
va_start (args, fmt);
- if (gnumeric_io_warning_occurred (io_context))
- gnumeric_io_error_push (io_context,
+ if (go_io_warning_occurred (io_context))
+ go_io_error_push (io_context,
go_error_info_new_vprintf (GO_ERROR, fmt, args));
else
- gnm_io_warning_varargs (io_context, fmt, args);
+ go_io_warning_varargs (io_context, fmt, args);
va_end (args);
}
@@ -2595,10 +2595,10 @@ xml_dom_read_error (gpointer state, char const *fmt, ...)
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);
+ if (go_io_error_occurred (io_context))
+ go_io_error_push (io_context, ei);
else
- gnumeric_io_go_error_info_set (io_context, ei);
+ go_io_error_info_set (io_context, ei);
}
/**************************************************************************/
@@ -2648,7 +2648,7 @@ xml_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
*/
static void
gnumeric_xml_read_workbook (GOFileOpener const *fo,
- IOContext *context,
+ GOIOContext *context,
gpointer wb_view,
GsfInput *input)
{
diff --git a/src/xml-io.h b/src/xml-io.h
index c6d96e5..e72052c 100644
--- a/src/xml-io.h
+++ b/src/xml-io.h
@@ -18,7 +18,7 @@ struct _XmlParseContext {
Sheet *sheet; /* the associated sheet */
Workbook *wb; /* the associated workbook */
WorkbookView *wb_view;
- IOContext *io_context;
+ GOIOContext *io_context;
GHashTable *style_table;/* old style styles compatibility */
GHashTable *expr_map; /*
diff --git a/src/xml-sax-read.c b/src/xml-sax-read.c
index c196f9d..d9dbf39 100644
--- a/src/xml-sax-read.c
+++ b/src/xml-sax-read.c
@@ -270,7 +270,7 @@ xml_sax_attr_range (xmlChar const * const *attrs, GnmRange *res)
typedef struct {
GsfXMLIn base;
- IOContext *context; /* The IOcontext managing things */
+ GOIOContext *context; /* The IOcontext managing things */
WorkbookView *wb_view; /* View for the new workbook */
Workbook *wb; /* The new workbook */
GnumericXMLVersion version;
@@ -387,7 +387,7 @@ unknown_attr (GsfXMLIn *xin, xmlChar const * const *attrs)
XMLSaxParseState *state = (XMLSaxParseState *)xin->user_state;
if (state->version == GNM_XML_LATEST)
- gnm_io_warning (state->context,
+ go_io_warning (state->context,
_("Unexpected attribute %s::%s == '%s'."),
(NULL != xin->node &&
NULL != xin->node->name) ?
@@ -423,7 +423,7 @@ xml_sax_wb (GsfXMLIn *xin, xmlChar const **attrs)
for (i = 0 ; GnumericVersions [i].id != NULL ; ++i )
if (attr_eq (attrs[1], GnumericVersions [i].id)) {
if (state->version != GNM_XML_UNKNOWN)
- gnm_io_warning (state->context,
+ go_io_warning (state->context,
_("Multiple version specifications. Assuming %d"),
state->version);
else {
@@ -698,7 +698,7 @@ xml_sax_sheet_name (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
if (state->version >= GNM_XML_V7) {
sheet = workbook_sheet_by_name (state->wb, content);
if (!sheet) {
- gnumeric_io_error_string (state->context,
+ go_io_error_string (state->context,
_("File has inconsistent SheetNameIndex element."));
sheet = sheet_new (state->wb, content,
columns, rows);
@@ -1975,7 +1975,7 @@ xml_sax_filter_operator (XMLSaxParseState *state,
return;
}
- gnm_io_warning (state->context, _("Unknown filter operator \"%s\""), str);
+ go_io_warning (state->context, _("Unknown filter operator \"%s\""), str);
}
static void
@@ -2015,7 +2015,7 @@ xml_sax_filter_condition (GsfXMLIn *xin, xmlChar const **attrs)
else if (gnm_xml_attr_int (attrs+i, "Value1", &tmp)) vtype1 = tmp;
if (NULL == type) {
- gnm_io_warning (state->context, _("Missing filter type"));
+ go_io_warning (state->context, _("Missing filter type"));
} else if (0 == g_ascii_strcasecmp (type, "expr")) {
GnmValue *v0 = NULL, *v1 = NULL;
if (val0 != NULL && vtype0 != VALUE_EMPTY)
@@ -2037,7 +2037,7 @@ xml_sax_filter_condition (GsfXMLIn *xin, xmlChar const **attrs)
cond = gnm_filter_condition_new_bucket (
top, items, bucket_count);
} else {
- gnm_io_warning (state->context, _("Unknown filter type \"%s\""), type);
+ go_io_warning (state->context, _("Unknown filter type \"%s\""), type);
}
if (cond != NULL)
gnm_filter_set_condition (state->filter, cond_num, cond, FALSE);
@@ -2057,7 +2057,7 @@ xml_sax_filter_start (GsfXMLIn *xin, xmlChar const **attrs)
range_parse (&r, CXML2C (attrs[i + 1]), gnm_sheet_get_size (state->sheet)))
state->filter = gnm_filter_new (state->sheet, &r);
if (NULL == state->filter)
- gnm_io_warning (state->context, _("Invalid filter, missing Area"));
+ go_io_warning (state->context, _("Invalid filter, missing Area"));
}
static void
@@ -2114,7 +2114,7 @@ xml_sax_read_obj (GsfXMLIn *xin, gboolean needs_cleanup,
if (type == 0) {
char *str = g_strdup_printf (_("Unsupported object type '%s'"),
type_name);
- gnm_io_warning_unsupported_feature (state->context, str);
+ go_io_warning_unsupported_feature (state->context, str);
g_free (str);
return;
}
@@ -2348,7 +2348,7 @@ handle_delayed_names (XMLSaxParseState *state)
nexpr->pos.eval = pp.eval;
expr_name_set_expr (nexpr, texpr);
} else
- gnm_io_warning (state->context, "%s", perr.err->message);
+ go_io_warning (state->context, "%s", perr.err->message);
parse_error_free (&perr);
g_free (expr_str);
@@ -2671,7 +2671,7 @@ maybe_convert (GsfInput *input, gboolean quiet)
}
void
-gnm_xml_file_open (GOFileOpener const *fo, IOContext *io_context,
+gnm_xml_file_open (GOFileOpener const *fo, GOIOContext *io_context,
gpointer wb_view, GsfInput *input)
{
XMLSaxParseState state;
@@ -2741,7 +2741,7 @@ gnm_xml_file_open (GOFileOpener const *fo, IOContext *io_context,
FILE_FL_AUTO,
go_file_saver_for_id ("Gnumeric_XmlIO:sax"));
} else {
- gnumeric_io_error_string (io_context, _("XML document not well formed!"));
+ go_io_error_string (io_context, _("XML document not well formed!"));
}
g_object_unref (input);
diff --git a/src/xml-sax-write.c b/src/xml-sax-write.c
index 69bba39..d61660a 100644
--- a/src/xml-sax-write.c
+++ b/src/xml-sax-write.c
@@ -1267,7 +1267,7 @@ gnm_xml_io_conventions (void)
}
void
-gnm_xml_file_save (GOFileSaver const *fs, IOContext *io_context,
+gnm_xml_file_save (GOFileSaver const *fs, GOIOContext *io_context,
gconstpointer wb_view, GsfOutput *output)
{
GnmOutputXML state;
diff --git a/src/xml-sax.h b/src/xml-sax.h
index f57f284..3205139 100644
--- a/src/xml-sax.h
+++ b/src/xml-sax.h
@@ -8,10 +8,10 @@
G_BEGIN_DECLS
-void gnm_xml_file_open (GOFileOpener const *fo, IOContext *io_context,
+void gnm_xml_file_open (GOFileOpener const *fo, GOIOContext *io_context,
gpointer wb_view, GsfInput *input);
-void gnm_xml_file_save (GOFileSaver const *fs, IOContext *io_context,
+void gnm_xml_file_save (GOFileSaver const *fs, GOIOContext *io_context,
gconstpointer wb_view, GsfOutput *output);
GsfOutputMemory *
gnm_cellregion_to_xml (GnmCellRegion const *cr);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
