GNOME.org
 

[gnumeric] Compilation: catch up with goffice.

commit 4d4dab5b3b8fbc6ea6c16482476c0f4c2577c070
Author: Morten Welinder <terra gnome org>
Date:   Wed Aug 19 20:53:09 2009 -0400

    Compilation: catch up with goffice.

 plugins/dif/dif.c                     |    2 +-
 plugins/excel/boot.c                  |    6 ++--
 plugins/excel/xlsx-read.c             |    2 +-
 plugins/html/html.c                   |    6 ++--
 plugins/perl-loader/perl-loader.c     |    2 +-
 plugins/python-loader/python-loader.c |   40 ++++++++++++++++----------------
 plugins/sylk/sylk.c                   |    2 +-
 src/dialogs/dialog-plugin-manager.c   |    4 +-
 src/gnm-plugin.c                      |   22 +++++++++---------
 src/gui-file.c                        |    8 +++---
 src/libgnumeric.c                     |    6 ++--
 src/print-info.c                      |    2 +-
 src/session.c                         |    2 +-
 src/ssconvert.c                       |    2 +-
 src/stf-export.c                      |    4 +-
 src/stf.c                             |    4 +-
 src/workbook-priv.h                   |    2 +-
 src/workbook.c                        |   10 ++++----
 src/workbook.h                        |    2 +-
 src/xml-io.c                          |    4 +-
 src/xml-sax-read.c                    |    2 +-
 21 files changed, 67 insertions(+), 67 deletions(-)
---
diff --git a/plugins/dif/dif.c b/plugins/dif/dif.c
index d22ad48..dc359e3 100644
--- a/plugins/dif/dif.c
+++ b/plugins/dif/dif.c
@@ -284,7 +284,7 @@ dif_file_open (GOFileOpener const *fo, GOIOContext *io_context,
 	Workbook *wb = wb_view_get_workbook (wbv);
 	DifInputContext *ctxt = dif_input_context_new (io_context, wb, input);
 
-	workbook_set_saveinfo (wb, FILE_FL_MANUAL_REMEMBER,
+	workbook_set_saveinfo (wb, GO_FILE_FL_MANUAL_REMEMBER,
 		go_file_saver_for_id ("Gnumeric_dif:dif"));
 	if (ctxt != NULL) {
 		dif_parse_sheet (ctxt);
diff --git a/plugins/excel/boot.c b/plugins/excel/boot.c
index da06310..7cb832f 100644
--- a/plugins/excel/boot.c
+++ b/plugins/excel/boot.c
@@ -230,13 +230,13 @@ excel_file_open (GOFileOpener const *fo, GOIOContext *context,
 
 	/* simple guess of format based on stream names */
 	if (is_double_stream_file)
-		workbook_set_saveinfo (wb, FILE_FL_AUTO,
+		workbook_set_saveinfo (wb, GO_FILE_FL_AUTO,
 			go_file_saver_for_id ("Gnumeric_Excel:excel_dsf"));
 	else if (is_97)
-		workbook_set_saveinfo (wb, FILE_FL_AUTO,
+		workbook_set_saveinfo (wb, GO_FILE_FL_AUTO,
 			go_file_saver_for_id ("Gnumeric_Excel:excel_biff8"));
 	else
-		workbook_set_saveinfo (wb, FILE_FL_AUTO,
+		workbook_set_saveinfo (wb, GO_FILE_FL_AUTO,
 			go_file_saver_for_id ("Gnumeric_Excel:excel_biff7"));
 }
 
diff --git a/plugins/excel/xlsx-read.c b/plugins/excel/xlsx-read.c
index c152868..341c8ab 100644
--- a/plugins/excel/xlsx-read.c
+++ b/plugins/excel/xlsx-read.c
@@ -5189,7 +5189,7 @@ xlsx_file_open (GOFileOpener const *fo, GOIOContext *context,
 	xlsx_style_array_free (state.table_styles);
 	g_hash_table_destroy (state.theme_colors_by_name);
 
-	workbook_set_saveinfo (state.wb, FILE_FL_AUTO,
+	workbook_set_saveinfo (state.wb, GO_FILE_FL_AUTO,
 		go_file_saver_for_id ("Gnumeric_Excel:xlsx"));
 }
 
diff --git a/plugins/html/html.c b/plugins/html/html.c
index 98a69ff..1e7f0fd 100644
--- a/plugins/html/html.c
+++ b/plugins/html/html.c
@@ -558,7 +558,7 @@ write_row (GsfOutput *output, Sheet *sheet, gint row, GnmRange *range, html_vers
  */
 static void
 write_sheet (GsfOutput *output, Sheet *sheet,
-	     html_version_t version, FileSaveScope save_scope)
+	     html_version_t version, GOFileSaveScope save_scope)
 {
 	GnmRange total_range;
 	gint row;
@@ -575,7 +575,7 @@ write_sheet (GsfOutput *output, Sheet *sheet,
 		break;
 	}
 
-	if (save_scope != FILE_SAVE_RANGE) {
+	if (save_scope != GO_FILE_SAVE_RANGE) {
 		gsf_output_puts (output, "<caption>");
 		html_print_encoded (output, sheet->name_unquoted);
 		gsf_output_puts (output, "</caption>\n");
@@ -600,7 +600,7 @@ html_file_save (GOFileSaver const *fs, GOIOContext *io_context,
 {
 	GSList *sheets, *ptr;
 	Workbook *wb = wb_view_get_workbook (wb_view);
-	FileSaveScope save_scope;
+	GOFileSaveScope save_scope;
 
 	g_return_if_fail (fs != NULL);
 	g_return_if_fail (wb != NULL);
diff --git a/plugins/perl-loader/perl-loader.c b/plugins/perl-loader/perl-loader.c
index d84bb0b..f95b333 100644
--- a/plugins/perl-loader/perl-loader.c
+++ b/plugins/perl-loader/perl-loader.c
@@ -236,7 +236,7 @@ gplp_load_service_function_group (GOPluginLoader *loader,
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
 
-	cbs = plugin_service_get_cbs (service);
+	cbs = go_plugin_service_get_cbs (service);
 	cbs->func_desc_load = &gplp_func_desc_load;
 }
 
diff --git a/plugins/python-loader/python-loader.c b/plugins/python-loader/python-loader.c
index 4229010..de40735 100644
--- a/plugins/python-loader/python-loader.c
+++ b/plugins/python-loader/python-loader.c
@@ -52,7 +52,7 @@ typedef GObjectClass GnmPythonPluginLoaderClass;
 #define PLUGIN_GET_LOADER(plugin) \
 	GNM_PYTHON_PLUGIN_LOADER (g_object_get_data (G_OBJECT (plugin), "python-loader"))
 #define SERVICE_GET_LOADER(service) \
-	PLUGIN_GET_LOADER (plugin_service_get_plugin (service))
+	PLUGIN_GET_LOADER (go_plugin_service_get_plugin (service))
 #define SWITCH_TO_PLUGIN(plugin) \
 	gnm_py_interpreter_switch_to (PLUGIN_GET_LOADER (plugin)->py_interpreter_info)
 
@@ -224,7 +224,7 @@ gplp_func_file_probe (GOFileOpener const *fo, GOPluginService *service,
 	g_return_val_if_fail (_PyGObject_API != NULL, FALSE);
 
 	loader_data = g_object_get_data (G_OBJECT (service), "loader_data");
-	SWITCH_TO_PLUGIN (plugin_service_get_plugin (service));
+	SWITCH_TO_PLUGIN (go_plugin_service_get_plugin (service));
 	input_wrapper = pygobject_new (G_OBJECT (input));
 	if (input_wrapper == NULL) {
 		g_warning ("%s", py_exc_to_string ());
@@ -269,7 +269,7 @@ gplp_func_file_open (GOFileOpener const *fo,
 	old_sheet = wb_view_cur_sheet (wb_view);
 
 	loader_data = g_object_get_data (G_OBJECT (service), "loader_data");
-	SWITCH_TO_PLUGIN (plugin_service_get_plugin (service));
+	SWITCH_TO_PLUGIN (go_plugin_service_get_plugin (service));
 	sheet = sheet_new (wb_view_get_workbook (wb_view), _("Some name"),
 			   gnm_sheet_get_max_cols (old_sheet),
 			   gnm_sheet_get_max_rows (old_sheet));
@@ -307,20 +307,20 @@ gplp_load_service_file_opener (GOPluginLoader *loader,
 	GO_INIT_RET_ERROR_INFO (ret_error);
 	gnm_py_interpreter_switch_to (loader_python->py_interpreter_info);
 	func_name_file_probe = g_strconcat (
-		plugin_service_get_id (service), "_file_probe", NULL);
+		go_plugin_service_get_id (service), "_file_probe", NULL);
 	python_func_file_probe = PyDict_GetItemString (loader_python->main_module_dict,
 	                                               func_name_file_probe);
 	gnm_python_clear_error_if_needed (loader_python->py_object);
 	func_name_file_open = g_strconcat (
-		plugin_service_get_id (service), "_file_open", NULL);
+		go_plugin_service_get_id (service), "_file_open", NULL);
 	python_func_file_open = PyDict_GetItemString (loader_python->main_module_dict,
 	                                              func_name_file_open);
 	gnm_python_clear_error_if_needed (loader_python->py_object);
 	if (python_func_file_open != NULL) {
-		PluginServiceFileOpenerCallbacks *cbs;
+		GOPluginServiceFileOpenerCallbacks *cbs;
 		ServiceLoaderDataFileOpener *loader_data;
 
-		cbs = plugin_service_get_cbs (service);
+		cbs = go_plugin_service_get_cbs (service);
 		cbs->plugin_func_file_probe = gplp_func_file_probe;
 		cbs->plugin_func_file_open = gplp_func_file_open;
 
@@ -376,7 +376,7 @@ gplp_func_file_save (GOFileSaver const *fs, GOPluginService *service,
 	g_return_if_fail (_PyGObject_API != NULL);
 
 	saver_data = g_object_get_data (G_OBJECT (service), "loader_data");
-	SWITCH_TO_PLUGIN (plugin_service_get_plugin (service));
+	SWITCH_TO_PLUGIN (go_plugin_service_get_plugin (service));
 	py_workbook = py_new_Workbook_object (wb_view_get_workbook (wb_view));
 	output_wrapper = pygobject_new (G_OBJECT (output));
 	if (output_wrapper != NULL) {
@@ -409,15 +409,15 @@ gplp_load_service_file_saver (GOPluginLoader *loader,
 	GO_INIT_RET_ERROR_INFO (ret_error);
 	gnm_py_interpreter_switch_to (loader_python->py_interpreter_info);
 	func_name_file_save = g_strconcat (
-		plugin_service_get_id (service), "_file_save", NULL);
+		go_plugin_service_get_id (service), "_file_save", NULL);
 	python_func_file_save = PyDict_GetItemString (loader_python->main_module_dict,
 	                                              func_name_file_save);
 	gnm_python_clear_error_if_needed (loader_python->py_object);
 	if (python_func_file_save != NULL) {
-		PluginServiceFileSaverCallbacks *cbs;
+		GOPluginServiceFileSaverCallbacks *cbs;
 		ServiceLoaderDataFileSaver *saver_data;
 
-		cbs = plugin_service_get_cbs (service);
+		cbs = go_plugin_service_get_cbs (service);
 		cbs->plugin_func_file_save = gplp_func_file_save;
 
 		saver_data = g_new (ServiceLoaderDataFileSaver, 1);
@@ -474,7 +474,7 @@ call_python_function_args (GnmFuncEvalInfo *ei, GnmValue const * const *args)
 	fndef = ei->func_call->func;
 	service = (GOPluginService *) gnm_func_get_user_data (fndef);
 	loader_data = g_object_get_data (G_OBJECT (service), "loader_data");
-	SWITCH_TO_PLUGIN (plugin_service_get_plugin (service));
+	SWITCH_TO_PLUGIN (go_plugin_service_get_plugin (service));
 	fn_info_tuple = PyDict_GetItemString (loader_data->python_fn_info_dict,
 	                                      (gchar *) gnm_func_get_name (fndef));
 	g_assert (fn_info_tuple != NULL);
@@ -504,7 +504,7 @@ call_python_function_nodes (GnmFuncEvalInfo *ei,
 	fndef = ei->func_call->func;
 	service = (GOPluginService *) gnm_func_get_user_data (fndef);
 	loader_data = g_object_get_data (G_OBJECT (service), "loader_data");
-	SWITCH_TO_PLUGIN (plugin_service_get_plugin (service));
+	SWITCH_TO_PLUGIN (go_plugin_service_get_plugin (service));
 	python_fn = PyDict_GetItemString (loader_data->python_fn_info_dict,
 	                                  (gchar *) gnm_func_get_name (fndef));
 
@@ -571,7 +571,7 @@ gplp_func_desc_load (GOPluginService *service,
 	g_return_val_if_fail (name != NULL, FALSE);
 
 	loader_data = g_object_get_data (G_OBJECT (service), "loader_data");
-	SWITCH_TO_PLUGIN (plugin_service_get_plugin (service));
+	SWITCH_TO_PLUGIN (go_plugin_service_get_plugin (service));
 	fn_info_obj = PyDict_GetItemString (loader_data->python_fn_info_dict,
 					    (gchar *) name);
 	if (fn_info_obj == NULL) {
@@ -640,7 +640,7 @@ gplp_load_service_function_group (GOPluginLoader *loader,
 	GO_INIT_RET_ERROR_INFO (ret_error);
 	gnm_py_interpreter_switch_to (loader_python->py_interpreter_info);
 	fn_info_dict_name = g_strconcat (
-		plugin_service_get_id (service), "_functions", NULL);
+		go_plugin_service_get_id (service), "_functions", NULL);
 	python_fn_info_dict = PyDict_GetItemString (loader_python->main_module_dict,
 	                                             fn_info_dict_name);
 	gnm_python_clear_error_if_needed (loader_python->py_object);
@@ -648,7 +648,7 @@ gplp_load_service_function_group (GOPluginLoader *loader,
 		PluginServiceFunctionGroupCallbacks *cbs;
 		ServiceLoaderDataFunctionGroup *loader_data;
 
-		cbs = plugin_service_get_cbs (service);
+		cbs = go_plugin_service_get_cbs (service);
 		cbs->func_desc_load = &gplp_func_desc_load;
 
 		loader_data = g_new (ServiceLoaderDataFunctionGroup, 1);
@@ -688,7 +688,7 @@ gplp_unload_service_function_group (GOPluginLoader *loader,
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
 	loader_data = g_object_get_data (G_OBJECT (service), "loader_data");
-	SWITCH_TO_PLUGIN (plugin_service_get_plugin (service));
+	SWITCH_TO_PLUGIN (go_plugin_service_get_plugin (service));
 	Py_DECREF (loader_data->python_fn_info_dict);
 }
 
@@ -716,7 +716,7 @@ gplp_func_exec_action (GOPluginService *service,
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
 	loader_data = g_object_get_data (G_OBJECT (service), "loader_data");
-	SWITCH_TO_PLUGIN (plugin_service_get_plugin (service));
+	SWITCH_TO_PLUGIN (go_plugin_service_get_plugin (service));
 	fn = PyDict_GetItemString (loader_data->ui_actions, action->id);
 	if (fn == NULL) {
 		*ret_error = go_error_info_new_printf (_("Unknown action: %s"),
@@ -751,7 +751,7 @@ gplp_load_service_ui (GOPluginLoader *loader,
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
 	gnm_py_interpreter_switch_to (loader_python->py_interpreter_info);
-	ui_action_names = g_strconcat (plugin_service_get_id (service),
+	ui_action_names = g_strconcat (go_plugin_service_get_id (service),
 				     "_ui_actions", NULL);
 	ui_actions = PyDict_GetItemString (loader_python->main_module_dict,
 					   ui_action_names);
@@ -760,7 +760,7 @@ gplp_load_service_ui (GOPluginLoader *loader,
 		PluginServiceUICallbacks *cbs;
 		ServiceLoaderDataUI *loader_data;
 
-		cbs = plugin_service_get_cbs (service);
+		cbs = go_plugin_service_get_cbs (service);
 		cbs->plugin_func_exec_action = gplp_func_exec_action;
 
 		loader_data = g_new (ServiceLoaderDataUI, 1);
diff --git a/plugins/sylk/sylk.c b/plugins/sylk/sylk.c
index f8bcc42..5b8b344 100644
--- a/plugins/sylk/sylk.c
+++ b/plugins/sylk/sylk.c
@@ -832,7 +832,7 @@ sylk_file_open (GOFileOpener const *fo,
 	locale = gnm_push_C_locale ();
 	sylk_parse_sheet (&state);
 	gnm_pop_C_locale (locale);
-	workbook_set_saveinfo (state.pp.wb, FILE_FL_AUTO,
+	workbook_set_saveinfo (state.pp.wb, GO_FILE_FL_AUTO,
 		go_file_saver_for_id ("Gnumeric_sylk:sylk"));
 
 	for (i = state.fonts->len ; i-- > 0 ; )
diff --git a/src/dialogs/dialog-plugin-manager.c b/src/dialogs/dialog-plugin-manager.c
index 36ecf96..3109bc8 100644
--- a/src/dialogs/dialog-plugin-manager.c
+++ b/src/dialogs/dialog-plugin-manager.c
@@ -425,8 +425,8 @@ cb_pm_selection_changed (GtkTreeSelection *selection, PluginManagerGUI *pm_gui)
 			gtk_tree_store_append (pm_gui->model_details, &iter3, &iter2);
 			gtk_tree_store_set (
 				pm_gui->model_details, &iter3,
-				DETAILS_DESC, plugin_service_get_description (service),
-				DETAILS_ID, plugin_service_get_id (service),
+				DETAILS_DESC, go_plugin_service_get_description (service),
+				DETAILS_ID, go_plugin_service_get_id (service),
 				-1);
 		);
 		gtk_tree_view_expand_all (pm_gui->view_details);
diff --git a/src/gnm-plugin.c b/src/gnm-plugin.c
index 3a67f44..d3a8136 100644
--- a/src/gnm-plugin.c
+++ b/src/gnm-plugin.c
@@ -20,9 +20,9 @@
 
 #define CXML2C(s) ((char const *)(s))
 
-typedef PluginServiceSimpleClass	PluginServiceFunctionGroupClass;
+typedef GOPluginServiceSimpleClass	PluginServiceFunctionGroupClass;
 struct _PluginServiceFunctionGroup {
-	PluginServiceSimple	base;
+	GOPluginServiceSimple	base;
 
 	gchar *category_name, *translated_category_name;
 	GSList *function_name_list;
@@ -145,7 +145,7 @@ plugin_service_function_group_func_desc_load (GnmFunc const *fn_def,
 
 	g_return_val_if_fail (fn_def != NULL, FALSE);
 
-	plugin_service_load (service, &error);
+	go_plugin_service_load (service, &error);
 	if (error != NULL) {
 		go_error_info_print (error);
 		go_error_info_free (error);
@@ -262,7 +262,7 @@ GSF_CLASS (PluginServiceFunctionGroup, plugin_service_function_group,
  */
 typedef GOPluginServiceClass PluginServiceUIClass;
 struct _PluginServiceUI {
-	PluginServiceSimple	base;
+	GOPluginServiceSimple	base;
 
 	char *file_name;
 	GSList *actions;
@@ -301,7 +301,7 @@ cb_ui_service_activate (GnmAction const *action, WorkbookControl *wbc, GOPluginS
 {
 	GOErrorInfo *load_error = NULL;
 
-	plugin_service_load (service, &load_error);
+	go_plugin_service_load (service, &load_error);
 	if (load_error == NULL) {
 		PluginServiceUI *service_ui = GNM_PLUGIN_SERVICE_UI (service);
 		GOErrorInfo *ignored_error = NULL;
@@ -499,14 +499,14 @@ gnm_plugin_loader_module_load_service_function_group (GOPluginLoader  *loader,
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
 	fn_info_array_name = g_strconcat (
-		plugin_service_get_id (service), "_functions", NULL);
+		go_plugin_service_get_id (service), "_functions", NULL);
 	g_module_symbol (loader_module->handle, fn_info_array_name, (gpointer) &module_fn_info_array);
 	if (module_fn_info_array != NULL) {
 		PluginServiceFunctionGroupCallbacks *cbs;
 		ServiceLoaderDataFunctionGroup *loader_data;
 		gint i;
 
-		cbs = plugin_service_get_cbs (service);
+		cbs = go_plugin_service_get_cbs (service);
 		cbs->func_desc_load = &gnm_plugin_loader_module_func_desc_load;
 
 		loader_data = g_new (ServiceLoaderDataFunctionGroup, 1);
@@ -589,7 +589,7 @@ gnm_plugin_loader_module_load_service_ui (GOPluginLoader *loader,
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
 	ui_actions_array_name = g_strconcat (
-		plugin_service_get_id (service), "_ui_actions", NULL);
+		go_plugin_service_get_id (service), "_ui_actions", NULL);
 	g_module_symbol (loader_module->handle, ui_actions_array_name, (gpointer) &module_ui_actions_array);
 	if (module_ui_actions_array == NULL) {
 		*ret_error = go_error_info_new_printf (
@@ -602,7 +602,7 @@ gnm_plugin_loader_module_load_service_ui (GOPluginLoader *loader,
 	}
 	g_free (ui_actions_array_name);
 
-	cbs = plugin_service_get_cbs (service);
+	cbs = go_plugin_service_get_cbs (service);
 	cbs->plugin_func_exec_action = gnm_plugin_loader_module_func_exec_action;
 
 	loader_data = g_new (ServiceLoaderDataUI, 1);
@@ -632,10 +632,10 @@ static gboolean
 gplm_service_unload (GOPluginLoader *l, GOPluginService *s, GOErrorInfo **err)
 {
 	if (IS_GNM_PLUGIN_SERVICE_FUNCTION_GROUP (s)) {
-		PluginServiceFunctionGroupCallbacks *cbs = plugin_service_get_cbs (s);
+		PluginServiceFunctionGroupCallbacks *cbs = go_plugin_service_get_cbs (s);
 		cbs->func_desc_load = NULL;
 	} else if (IS_GNM_PLUGIN_SERVICE_UI (s)) {
-		PluginServiceUICallbacks *cbs = plugin_service_get_cbs (s);
+		PluginServiceUICallbacks *cbs = go_plugin_service_get_cbs (s);
 		cbs->plugin_func_exec_action = NULL;
 	} else
 		return FALSE;
diff --git a/src/gui-file.c b/src/gui-file.c
index 81995da..f5595e5 100644
--- a/src/gui-file.c
+++ b/src/gui-file.c
@@ -160,7 +160,7 @@ gui_file_template (WBCGtk *wbcg, char const *uri)
 
 	if (wbv != NULL) {
 		Workbook *wb = wb_view_get_workbook (wbv);
-		workbook_set_saveinfo (wb, FILE_FL_NEW, NULL);
+		workbook_set_saveinfo (wb, GO_FILE_FL_NEW, NULL);
 		gui_wb_view_show (wbcg, wbv);
 		return TRUE;
 	}
@@ -381,7 +381,7 @@ check_multiple_sheet_support_if_needed (GOFileSaver *fs,
 {
 	gboolean ret_val = TRUE;
 
-	if (go_file_saver_get_save_scope (fs) != FILE_SAVE_WORKBOOK &&
+	if (go_file_saver_get_save_scope (fs) != GO_FILE_SAVE_WORKBOOK &&
 	    gnm_conf_get_core_file_save_single_sheet ()) {
 		Workbook *wb = wb_view_get_workbook (wb_view);
 		gchar *msg = _("Selected file format doesn't support "
@@ -417,7 +417,7 @@ gui_file_save_as (WBCGtk *wbcg, WorkbookView *wb_view)
 	for (l = go_get_file_savers (); l; l = l->next) {
 		if ((l->data == NULL) ||
 		    (go_file_saver_get_save_scope (GO_FILE_SAVER (l->data))
-		     != FILE_SAVE_RANGE))
+		     != GO_FILE_SAVE_RANGE))
 			savers = g_list_prepend (savers, l->data);
 	}
 	savers = g_list_sort (savers, file_saver_description_cmp);
@@ -594,7 +594,7 @@ gui_file_save (WBCGtk *wbcg, WorkbookView *wb_view)
 					nb->allocation.height);
 	}
 
-	if (wb->file_format_level < FILE_FL_AUTO)
+	if (wb->file_format_level < GO_FILE_FL_AUTO)
 		return gui_file_save_as (wbcg, wb_view);
 	else {
 		gboolean ok = wb_view_save (wb_view, GO_CMD_CONTEXT (wbcg));
diff --git a/src/libgnumeric.c b/src/libgnumeric.c
index 6abc8ec..ce19aa2 100644
--- a/src/libgnumeric.c
+++ b/src/libgnumeric.c
@@ -250,9 +250,9 @@ gnm_init (void)
 	call_gnome_vfs_init ();
 
 	libgoffice_init ();
-	plugin_service_define ("function_group",
+	go_plugin_service_define ("function_group",
 		&plugin_service_function_group_get_type);
-	plugin_service_define ("ui",
+	go_plugin_service_define ("ui",
 		&plugin_service_ui_get_type);
 	go_plugin_loader_module_register_version ("gnumeric", GNM_VERSION_FULL);
 
@@ -339,7 +339,7 @@ gnm_shutdown (void)
 	gnm_style_shutdown ();
 
 	libgoffice_shutdown ();
-	plugin_services_shutdown ();
+	go_plugin_services_shutdown ();
 	g_object_unref (gnm_app_get_app ());
 	gutils_shutdown ();
 }
diff --git a/src/print-info.c b/src/print-info.c
index c1a53cf..9548d6a 100644
--- a/src/print-info.c
+++ b/src/print-info.c
@@ -796,7 +796,7 @@ print_init (void)
 	GOFileSaver *saver = go_file_saver_new (
 		PDF_SAVER_ID, "pdf",
 		_("PDF export"),
-		FILE_FL_WRITE_ONLY, pdf_write_workbook);
+		GO_FILE_FL_WRITE_ONLY, pdf_write_workbook);
 	g_signal_connect (G_OBJECT (saver), "set-export-options",
 			  G_CALLBACK (pdf_set_export_options),
 			  NULL);
diff --git a/src/session.c b/src/session.c
index 826a4e5..637c1a4 100644
--- a/src/session.c
+++ b/src/session.c
@@ -56,7 +56,7 @@ set_clone_restart (GnomeClient *client)
 	workbooks = g_list_copy (gnm_app_workbook_list ());
 	for (ptr = workbooks; ptr != NULL ; ptr = ptr->next) {
 		Workbook *wb = ptr->data;
-		if (wb->file_format_level == FILE_FL_AUTO) {
+		if (wb->file_format_level == GO_FILE_FL_AUTO) {
 			argv[count] = g_strdup (go_doc_get_uri (GO_DOC (wb)));
 			count++;
 		}
diff --git a/src/ssconvert.c b/src/ssconvert.c
index 6689c2d..a497e1c 100644
--- a/src/ssconvert.c
+++ b/src/ssconvert.c
@@ -523,7 +523,7 @@ convert (char const *inarg, char const *outarg, char const *mergeargs[],
 					     wb,
 					     ssconvert_range);
 			else if (workbook_sheet_count (wb) > 1 &&
-				 go_file_saver_get_save_scope (fs) != FILE_SAVE_WORKBOOK) {
+				 go_file_saver_get_save_scope (fs) != GO_FILE_SAVE_WORKBOOK) {
 				if (ssconvert_one_file_per_sheet) {
 					g_warning ("TODO: one sheet per file is not implemented");
 				} else
diff --git a/src/stf-export.c b/src/stf-export.c
index 042e8a8..f4636a8 100644
--- a/src/stf-export.c
+++ b/src/stf-export.c
@@ -693,9 +693,9 @@ gnm_stf_file_saver_new (gchar const *id)
 	GOFileSaver *fs = go_file_saver_new (id,
 					     "txt",
 					     _("Text (configurable)"),
-					     FILE_FL_WRITE_ONLY,
+					     GO_FILE_FL_WRITE_ONLY,
 					     gnm_stf_file_saver_save);
-	go_file_saver_set_save_scope (fs, FILE_SAVE_WORKBOOK);
+	go_file_saver_set_save_scope (fs, GO_FILE_SAVE_WORKBOOK);
 	g_signal_connect (G_OBJECT (fs), "set-export-options",
 			  G_CALLBACK (gnm_stf_fs_set_export_options),
 			  NULL);
diff --git a/src/stf.c b/src/stf.c
index f9a639e..b4d6ab5 100644
--- a/src/stf.c
+++ b/src/stf.c
@@ -586,8 +586,8 @@ stf_init (void)
 	saver = go_file_saver_new (
 		"Gnumeric_stf:stf_csv", "csv",
 		_("Comma separated values (CSV)"),
-		FILE_FL_WRITE_ONLY, stf_write_csv);
-	go_file_saver_set_save_scope (saver, FILE_SAVE_SHEET);
+		GO_FILE_FL_WRITE_ONLY, stf_write_csv);
+	go_file_saver_set_save_scope (saver, GO_FILE_SAVE_SHEET);
 	go_file_saver_register (saver);
 	g_object_unref (saver);
 }
diff --git a/src/workbook-priv.h b/src/workbook-priv.h
index a4f6ac4..63abadd 100644
--- a/src/workbook-priv.h
+++ b/src/workbook-priv.h
@@ -19,7 +19,7 @@ struct _Workbook {
 
 	gboolean is_placeholder;
 
-	FileFormatLevel  file_format_level;
+	GOFileFormatLevel  file_format_level;
 	GOFileSaver	*file_saver;
 
 	/* Undo support */
diff --git a/src/workbook.c b/src/workbook.c
index a07c824..9b1b06e 100644
--- a/src/workbook.c
+++ b/src/workbook.c
@@ -73,7 +73,7 @@ workbook_update_history (Workbook *wb)
 {
 	g_return_if_fail (IS_WORKBOOK (wb));
 
-	if (wb->doc.uri && wb->file_format_level >= FILE_FL_MANUAL_REMEMBER) {
+	if (wb->doc.uri && wb->file_format_level >= GO_FILE_FL_MANUAL_REMEMBER) {
 		const char *mimetype = wb->file_saver
 			? go_file_saver_get_mime_type (wb->file_saver)
 			: NULL;
@@ -179,7 +179,7 @@ workbook_init (GObject *object)
 
 	workbook_set_1904 (wb, FALSE);
 
-	wb->file_format_level = FILE_FL_NEW;
+	wb->file_format_level = GO_FILE_FL_NEW;
 	wb->file_saver        = NULL;
 
 	wb->during_destruction = FALSE;
@@ -382,13 +382,13 @@ workbook_new_with_sheets (int sheet_count)
  * FIXME : Add a check to ensure the name is unique.
  */
 gboolean
-workbook_set_saveinfo (Workbook *wb, FileFormatLevel level, GOFileSaver *fs)
+workbook_set_saveinfo (Workbook *wb, GOFileFormatLevel level, GOFileSaver *fs)
 {
 	g_return_val_if_fail (wb != NULL, FALSE);
-	g_return_val_if_fail (level > FILE_FL_NONE && level <= FILE_FL_AUTO,
+	g_return_val_if_fail (level > GO_FILE_FL_NONE && level <= GO_FILE_FL_AUTO,
 			      FALSE);
 
-	if (level <= FILE_FL_WRITE_ONLY)
+	if (level <= GO_FILE_FL_WRITE_ONLY)
 		return FALSE;
 
 	wb->file_format_level = level;
diff --git a/src/workbook.h b/src/workbook.h
index 9c356d3..89d8bc4 100644
--- a/src/workbook.h
+++ b/src/workbook.h
@@ -44,7 +44,7 @@ GnmExprSharer *workbook_share_expressions (Workbook *wb, gboolean freeit);
 void        workbook_optimize_style     (Workbook *wb);
 
 /* IO Routines */
-gboolean       workbook_set_saveinfo	(Workbook *wb, FileFormatLevel lev,
+gboolean       workbook_set_saveinfo	(Workbook *wb, GOFileFormatLevel lev,
 					 GOFileSaver *saver);
 void           workbook_update_history  (Workbook *wb);
 GOFileSaver *workbook_get_file_saver	(Workbook *wb);
diff --git a/src/xml-io.c b/src/xml-io.c
index 4a9548b..c6d2dcc 100644
--- a/src/xml-io.c
+++ b/src/xml-io.c
@@ -2723,7 +2723,7 @@ gnumeric_xml_read_workbook (GOFileOpener const *fo,
 	ctxt->version = version;
 	xml_workbook_read (context, ctxt, res->xmlRootNode);
 	workbook_set_saveinfo (wb_view_get_workbook (ctxt->wb_view),
-		FILE_FL_AUTO, go_file_saver_for_id ("Gnumeric_XmlIO:sax"));
+		GO_FILE_FL_AUTO, go_file_saver_for_id ("Gnumeric_XmlIO:sax"));
 
 	xml_parse_ctx_destroy (ctxt);
 	xmlFreeDoc (res);
@@ -2751,7 +2751,7 @@ xml_init (void)
 	saver = go_file_saver_new ("Gnumeric_XmlIO:sax",
 				   "gnumeric",
 				   _("Gnumeric XML (*.gnumeric)"),
-				   FILE_FL_AUTO, gnm_xml_file_save);
+				   GO_FILE_FL_AUTO, gnm_xml_file_save);
 	g_object_set (G_OBJECT (saver),
 		      "mime-type", "application/x-gnumeric",
 		      NULL);
diff --git a/src/xml-sax-read.c b/src/xml-sax-read.c
index d9dbf39..04ece6f 100644
--- a/src/xml-sax-read.c
+++ b/src/xml-sax-read.c
@@ -2738,7 +2738,7 @@ gnm_xml_file_open (GOFileOpener const *fo, GOIOContext *io_context,
 		workbook_queue_all_recalc (state.wb);
 		workbook_set_saveinfo
 			(state.wb,
-			 FILE_FL_AUTO,
+			 GO_FILE_FL_AUTO,
 			 go_file_saver_for_id ("Gnumeric_XmlIO:sax"));
 	} else {
 		go_io_error_string (io_context, _("XML document not well formed!"));
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]