GNOME.org
 

[goffice] Compilation: grand renaming, part 3.

commit 93e2c6b5393548bb21af0cf875e79b4389234155
Author: Morten Welinder <terra gnome org>
Date:   Wed Aug 19 20:52:43 2009 -0400

    Compilation: grand renaming, part 3.

 goffice/app/file-priv.h                  |    8 +-
 goffice/app/file.c                       |   46 +++---
 goffice/app/file.h                       |   50 +++---
 goffice/app/go-plugin-loader-module.c    |   14 +-
 goffice/app/go-plugin-service-impl.h     |   10 +-
 goffice/app/go-plugin-service.c          |  301 +++++++++++++++---------------
 goffice/app/go-plugin-service.h          |   88 +++++-----
 goffice/app/go-plugin.c                  |    8 +-
 goffice/component/go-component-factory.c |   18 +-
 goffice/goffice.c                        |    2 +-
 goffice/graph/gog-plot-engine.c          |   50 +++---
 11 files changed, 301 insertions(+), 294 deletions(-)
---
diff --git a/goffice/app/file-priv.h b/goffice/app/file-priv.h
index 76f72f6..8453123 100644
--- a/goffice/app/file-priv.h
+++ b/goffice/app/file-priv.h
@@ -9,7 +9,7 @@ G_BEGIN_DECLS
  * GOFileOpener
  */
 
-#define GO_FILE_OPENER_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GO_FILE_OPENER, GOFileOpenerClass))
+#define GO_FILE_OPENER_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GO_TYPE_FILE_OPENER, GOFileOpenerClass))
 #define GO_FILE_OPENER_METHOD(obj,name) \
         ((GO_FILE_OPENER_CLASS (G_OBJECT_GET_CLASS (obj)))->name)
 
@@ -57,7 +57,7 @@ void go_file_opener_setup (GOFileOpener *fo, const gchar *id,
 
 #define GO_FILE_SAVER_METHOD(obj,name) \
         ((GO_FILE_SAVER_CLASS (G_OBJECT_GET_CLASS (obj)))->name)
-#define GO_FILE_SAVER_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GO_FILE_SAVER, GOFileSaverClass))
+#define GO_FILE_SAVER_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GO_TYPE_FILE_SAVER, GOFileSaverClass))
 
 struct _GOFileSaverClass {
 	GObjectClass parent_class;
@@ -83,8 +83,8 @@ struct _GOFileSaver {
 	gchar                *extension;
 	gchar                *description;
 	gboolean              overwrite_files;
-	FileFormatLevel       format_level;
-	FileSaveScope         save_scope;
+	GOFileFormatLevel       format_level;
+	GOFileSaveScope         save_scope;
 	GOFileSaverSaveFunc   save_func;
 };
 
diff --git a/goffice/app/file.c b/goffice/app/file.c
index 0d5d989..e1c1767 100644
--- a/goffice/app/file.c
+++ b/goffice/app/file.c
@@ -164,7 +164,7 @@ go_file_opener_new (gchar const *id,
 {
 	GOFileOpener *fo;
 
-	fo = GO_FILE_OPENER (g_object_new (TYPE_GO_FILE_OPENER, NULL));
+	fo = GO_FILE_OPENER (g_object_new (GO_TYPE_FILE_OPENER, NULL));
 	go_file_opener_setup (fo, id, description, suffixes, mimes, FALSE,
 			      probe_func, open_func);
 
@@ -195,7 +195,7 @@ go_file_opener_new_with_enc (gchar const *id,
 {
         GOFileOpener *fo;
 
-        fo = GO_FILE_OPENER (g_object_new (TYPE_GO_FILE_OPENER, NULL));
+        fo = GO_FILE_OPENER (g_object_new (GO_TYPE_FILE_OPENER, NULL));
         go_file_opener_setup (fo, id, description, suffixes, mimes, TRUE,
 			      probe_func, (GOFileOpenerOpenFunc)open_func);
         return fo;
@@ -312,8 +312,8 @@ go_file_saver_init (GOFileSaver *fs)
 	fs->mime_type = NULL;
 	fs->description = NULL;
 	fs->overwrite_files = TRUE;
-	fs->format_level = FILE_FL_NEW;
-	fs->save_scope = FILE_SAVE_WORKBOOK;
+	fs->format_level = GO_FILE_FL_NEW;
+	fs->save_scope = GO_FILE_SAVE_WORKBOOK;
 	fs->save_func = NULL;
 }
 
@@ -511,7 +511,7 @@ go_file_saver_class_init (GOFileSaverClass *klass)
 				    _("Format Level"),
 				    _(""),
 				    GO_TYPE_FILE_SAVER_LEVEL,
-				    FILE_FL_NEW,
+				    GO_FILE_FL_NEW,
 				    GSF_PARAM_STATIC |
 				    G_PARAM_READWRITE));
 
@@ -522,7 +522,7 @@ go_file_saver_class_init (GOFileSaverClass *klass)
 				    _("Scope"),
 				    _("How much of a document is saved"),
 				    GO_TYPE_FILE_SAVER_SCOPE,
-				    FILE_SAVE_WORKBOOK,
+				    GO_FILE_SAVE_WORKBOOK,
 				    GSF_PARAM_STATIC |
 				    G_PARAM_READWRITE));
 
@@ -562,12 +562,12 @@ GOFileSaver *
 go_file_saver_new (gchar const *id,
 		   gchar const *extension,
 		   gchar const *description,
-		   FileFormatLevel level,
+		   GOFileFormatLevel level,
 		   GOFileSaverSaveFunc save_func)
 {
 	GOFileSaver *fs;
 
-	fs = GO_FILE_SAVER (g_object_new (TYPE_GO_FILE_SAVER,
+	fs = GO_FILE_SAVER (g_object_new (GO_TYPE_FILE_SAVER,
 					  "id", id,
 					  "extension", extension,
 					  "description", description,
@@ -579,18 +579,18 @@ go_file_saver_new (gchar const *id,
 }
 
 void
-go_file_saver_set_save_scope (GOFileSaver *fs, FileSaveScope scope)
+go_file_saver_set_save_scope (GOFileSaver *fs, GOFileSaveScope scope)
 {
 	g_return_if_fail (GO_IS_FILE_SAVER (fs));
-	g_return_if_fail (scope < FILE_SAVE_LAST);
+	g_return_if_fail (scope < GO_FILE_SAVE_LAST);
 
 	fs->save_scope = scope;
 }
 
-FileSaveScope
+GOFileSaveScope
 go_file_saver_get_save_scope (GOFileSaver const *fs)
 {
-	g_return_val_if_fail (GO_IS_FILE_SAVER (fs), FILE_SAVE_WORKBOOK);
+	g_return_val_if_fail (GO_IS_FILE_SAVER (fs), GO_FILE_SAVE_WORKBOOK);
 
 	return fs->save_scope;
 }
@@ -627,10 +627,10 @@ go_file_saver_get_description (GOFileSaver const *fs)
 	return fs->description;
 }
 
-FileFormatLevel
+GOFileFormatLevel
 go_file_saver_get_format_level (GOFileSaver const *fs)
 {
-	g_return_val_if_fail (GO_IS_FILE_SAVER (fs), FILE_FL_NEW);
+	g_return_val_if_fail (GO_IS_FILE_SAVER (fs), GO_FILE_FL_NEW);
 
 	return fs->format_level;
 }
@@ -730,12 +730,12 @@ go_file_saver_level_get_type (void)
 	static GType etype = 0;
 	if (etype == 0) {
 		static GEnumValue values[] = {
-			{ FILE_FL_NONE, (char*)"GO_FILE_SAVER_LEVEL_NONE", (char*)"none" },
-			{ FILE_FL_WRITE_ONLY, (char*)"GO_FILE_SAVER_LEVEL_WRITE_ONLY", (char*)"write_only" },
-			{ FILE_FL_NEW, (char*)"GO_FILE_SAVER_LEVEL_NEW", (char*)"new" },
-			{ FILE_FL_MANUAL, (char*)"GO_FILE_SAVER_LEVEL_MANUAL", (char*)"manual" },
-			{ FILE_FL_MANUAL_REMEMBER, (char*)"GO_FILE_SAVER_LEVEL_MANUAL_REMEMBER", (char*)"manual_remember" },
-			{ FILE_FL_AUTO, (char*)"GO_FILE_SAVER_LEVEL_AUTO", (char*)"auto" },
+			{ GO_FILE_FL_NONE, (char*)"GO_FILE_SAVER_LEVEL_NONE", (char*)"none" },
+			{ GO_FILE_FL_WRITE_ONLY, (char*)"GO_FILE_SAVER_LEVEL_WRITE_ONLY", (char*)"write_only" },
+			{ GO_FILE_FL_NEW, (char*)"GO_FILE_SAVER_LEVEL_NEW", (char*)"new" },
+			{ GO_FILE_FL_MANUAL, (char*)"GO_FILE_SAVER_LEVEL_MANUAL", (char*)"manual" },
+			{ GO_FILE_FL_MANUAL_REMEMBER, (char*)"GO_FILE_SAVER_LEVEL_MANUAL_REMEMBER", (char*)"manual_remember" },
+			{ GO_FILE_FL_AUTO, (char*)"GO_FILE_SAVER_LEVEL_AUTO", (char*)"auto" },
 			{ 0, NULL, NULL }
 		};
 		etype = g_enum_register_static ("GOFileSaverLevel", values);
@@ -749,9 +749,9 @@ go_file_saver_scope_get_type (void)
 	static GType etype = 0;
 	if (etype == 0) {
 		static GEnumValue values[] = {
-			{ FILE_SAVE_WORKBOOK, (char*)"GO_FILE_SAVER_SCOPE_WORKBOOK", (char*)"workbook" },
-			{ FILE_SAVE_SHEET, (char*)"GO_FILE_SAVER_SCOPE_SHEET", (char*)"sheet" },
-			{ FILE_SAVE_RANGE, (char*)"GO_FILE_SAVER_SCOPE_RANGE", (char*)"range" },
+			{ GO_FILE_SAVE_WORKBOOK, (char*)"GO_FILE_SAVER_SCOPE_WORKBOOK", (char*)"workbook" },
+			{ GO_FILE_SAVE_SHEET, (char*)"GO_FILE_SAVER_SCOPE_SHEET", (char*)"sheet" },
+			{ GO_FILE_SAVE_RANGE, (char*)"GO_FILE_SAVER_SCOPE_RANGE", (char*)"range" },
 			{ 0, NULL, NULL }
 		};
 		etype = g_enum_register_static ("GOFileSaverScope", values);
diff --git a/goffice/app/file.h b/goffice/app/file.h
index 504bfb6..5bd8679 100644
--- a/goffice/app/file.h
+++ b/goffice/app/file.h
@@ -10,31 +10,31 @@ G_BEGIN_DECLS
 /*
  * File format levels. They are ordered. When we save a file, we
  * remember the name, but not if we already have a name at a higher level.
- * When created, workbooks are assigned a name at level FILE_FL_NEW.
+ * When created, workbooks are assigned a name at level GO_FILE_FL_NEW.
  */
 typedef enum {
-	FILE_FL_NONE,            /* No name assigned, won't happen */
-	FILE_FL_WRITE_ONLY,      /* PostScript etc, won't be remembered */
-	FILE_FL_NEW,             /* Wb just created */
-	FILE_FL_MANUAL,          /* Save gets punted to save as */
-	FILE_FL_MANUAL_REMEMBER, /* Ditto, but remember in history */
-	FILE_FL_AUTO,            /* Save will save to this filename */
-	FILE_FL_LAST
-} FileFormatLevel;
+	GO_FILE_FL_NONE,            /* No name assigned, won't happen */
+	GO_FILE_FL_WRITE_ONLY,      /* PostScript etc, won't be remembered */
+	GO_FILE_FL_NEW,             /* Wb just created */
+	GO_FILE_FL_MANUAL,          /* Save gets punted to save as */
+	GO_FILE_FL_MANUAL_REMEMBER, /* Ditto, but remember in history */
+	GO_FILE_FL_AUTO,            /* Save will save to this filename */
+	GO_FILE_FL_LAST
+} GOFileFormatLevel;
 GType go_file_saver_level_get_type (void);
 #define GO_TYPE_FILE_SAVER_LEVEL (go_file_saver_level_get_type ())
 
 /*
- * FileSaveScope specifies what information file saver can save in a file.
+ * GOFileSaveScope specifies what information file saver can save in a file.
  * Many savers can save the whole workbook (with all sheets), but others
  * save only current sheet, usually because of file format limitations.
  */
 typedef enum {
-	FILE_SAVE_WORKBOOK,
-	FILE_SAVE_SHEET,
-	FILE_SAVE_RANGE,
-	FILE_SAVE_LAST
-} FileSaveScope;
+	GO_FILE_SAVE_WORKBOOK,
+	GO_FILE_SAVE_SHEET,
+	GO_FILE_SAVE_RANGE,
+	GO_FILE_SAVE_LAST
+} GOFileSaveScope;
 GType go_file_saver_scope_get_type (void);
 #define GO_TYPE_FILE_SAVER_SCOPE (go_file_saver_scope_get_type ())
 
@@ -44,9 +44,9 @@ GType go_file_saver_scope_get_type (void);
 
 typedef struct _GOFileOpenerClass GOFileOpenerClass;
 
-#define TYPE_GO_FILE_OPENER             (go_file_opener_get_type ())
-#define GO_FILE_OPENER(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GO_FILE_OPENER, GOFileOpener))
-#define GO_IS_FILE_OPENER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GO_FILE_OPENER))
+#define GO_TYPE_FILE_OPENER             (go_file_opener_get_type ())
+#define GO_FILE_OPENER(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GO_TYPE_FILE_OPENER, GOFileOpener))
+#define GO_IS_FILE_OPENER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GO_TYPE_FILE_OPENER))
 
 typedef gboolean (*GOFileOpenerProbeFunc) (GOFileOpener const *fo,
 					    GsfInput *input,
@@ -99,9 +99,9 @@ GSList const *go_file_opener_get_mimes	  	  (GOFileOpener const *fo);
 
 typedef struct _GOFileSaverClass GOFileSaverClass;
 
-#define TYPE_GO_FILE_SAVER             (go_file_saver_get_type ())
-#define GO_FILE_SAVER(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GO_FILE_SAVER, GOFileSaver))
-#define GO_IS_FILE_SAVER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GO_FILE_SAVER))
+#define GO_TYPE_FILE_SAVER             (go_file_saver_get_type ())
+#define GO_FILE_SAVER(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GO_TYPE_FILE_SAVER, GOFileSaver))
+#define GO_IS_FILE_SAVER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GO_TYPE_FILE_SAVER))
 
 typedef void (*GOFileSaverSaveFunc) (GOFileSaver const *fs,
 				     GOIOContext *io_context,
@@ -113,12 +113,12 @@ GType go_file_saver_get_type (void);
 GOFileSaver *go_file_saver_new (char const *id,
 				char const *extension,
 				char const *description,
-				FileFormatLevel level,
+				GOFileFormatLevel level,
 				GOFileSaverSaveFunc save_func);
 
 
-void          go_file_saver_set_save_scope (GOFileSaver *fs, FileSaveScope scope);
-FileSaveScope go_file_saver_get_save_scope (GOFileSaver const *fs);
+void          go_file_saver_set_save_scope (GOFileSaver *fs, GOFileSaveScope scope);
+GOFileSaveScope go_file_saver_get_save_scope (GOFileSaver const *fs);
 
 gboolean     go_file_saver_set_export_options (GOFileSaver *fs,
 					       GODoc *doc,
@@ -134,7 +134,7 @@ char const *go_file_saver_get_id	  	(GOFileSaver const *fs);
 char const *go_file_saver_get_extension	(GOFileSaver const *fs);
 char const *go_file_saver_get_mime_type	(GOFileSaver const *fs);
 char const *go_file_saver_get_description	(GOFileSaver const *fs);
-FileFormatLevel go_file_saver_get_format_level	(GOFileSaver const *fs);
+GOFileFormatLevel go_file_saver_get_format_level	(GOFileSaver const *fs);
 
 /*
  *
diff --git a/goffice/app/go-plugin-loader-module.c b/goffice/app/go-plugin-loader-module.c
index feb5851..a61e460 100644
--- a/goffice/app/go-plugin-loader-module.c
+++ b/goffice/app/go-plugin-loader-module.c
@@ -243,7 +243,7 @@ go_plugin_loader_module_func_file_open (GOFileOpener const *fo, GOPluginService
 static char *
 make_function_name (const GOPluginService *service, const char *suffix)
 {
-	const char *id = plugin_service_get_id (service);
+	const char *id = go_plugin_service_get_id (service);
 	size_t idlen = strlen (id);
 	size_t slen = strlen (suffix);
 	size_t pad = 4;
@@ -275,10 +275,10 @@ go_plugin_loader_module_load_service_file_opener (GOPluginLoader *loader,
 	func_name_file_open = make_function_name (service, "_file_open");
 	g_module_symbol (loader_module->handle, func_name_file_open, &module_func_file_open);
 	if (module_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 = go_plugin_loader_module_func_file_probe;
 		cbs->plugin_func_file_open = go_plugin_loader_module_func_file_open;
 
@@ -339,10 +339,10 @@ go_plugin_loader_module_load_service_file_saver (GOPluginLoader *loader,
 	func_name_file_save = make_function_name (service, "_file_save");
 	g_module_symbol (loader_module->handle, func_name_file_save, &module_func_file_save);
 	if (module_func_file_save != NULL) {
-		PluginServiceFileSaverCallbacks *cbs;
+		GOPluginServiceFileSaverCallbacks *cbs;
 		ServiceLoaderDataFileSaver *loader_data;
 
-		cbs = plugin_service_get_cbs (service);
+		cbs = go_plugin_service_get_cbs (service);
 		cbs->plugin_func_file_save = go_plugin_loader_module_func_file_save;
 
 		loader_data = g_new (ServiceLoaderDataFileSaver, 1);
@@ -406,10 +406,10 @@ go_plugin_loader_module_load_service_plugin_loader (GOPluginLoader *loader,
 	g_module_symbol (loader_module->handle, func_name_get_loader_type,
 			 &module_func_get_loader_type);
 	if (module_func_get_loader_type != NULL) {
-		PluginServicePluginLoaderCallbacks *cbs;
+		GOPluginServicePluginLoaderCallbacks *cbs;
 		ServiceLoaderDataPluginLoader *loader_data;
 
-		cbs = plugin_service_get_cbs (service);
+		cbs = go_plugin_service_get_cbs (service);
 		cbs->plugin_func_get_loader_type = go_plugin_loader_module_func_get_loader_type;
 
 		loader_data = g_new (ServiceLoaderDataPluginLoader, 1);
diff --git a/goffice/app/go-plugin-service-impl.h b/goffice/app/go-plugin-service-impl.h
index 23ea631..ed0355c 100644
--- a/goffice/app/go-plugin-service-impl.h
+++ b/goffice/app/go-plugin-service-impl.h
@@ -59,20 +59,20 @@ typedef struct{
 typedef struct{
 	GOPluginServiceClass plugin_service_class;
 	GHashTable *pending; /* has service instances by type names */
-} PluginServiceGObjectLoaderClass;
+} GOPluginServiceGObjectLoaderClass;
 
-struct _PluginServiceGObjectLoader {
+struct _GOPluginServiceGObjectLoader {
 	GOPluginService plugin_service;
 };
 
-#define GPS_GOBJECT_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GO_TYPE_PLUGIN_SERVICE, PluginServiceGObjectLoaderClass))
+#define GPS_GOBJECT_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GO_TYPE_PLUGIN_SERVICE, GOPluginServiceGObjectLoaderClass))
 #define GPS_GOBJECT_LOADER_GET_CLASS(o) GPS_GOBJECT_LOADER_CLASS (G_OBJECT_GET_CLASS (o))
 
 typedef struct{
 	GOPluginServiceClass plugin_service_class;
-} PluginServiceSimpleClass;
+} GOPluginServiceSimpleClass;
 
-struct _PluginServiceSimple {
+struct _GOPluginServiceSimple {
 	GOPluginService plugin_service;
 };
 
diff --git a/goffice/app/go-plugin-service.c b/goffice/app/go-plugin-service.c
index 91c7ae0..989d6ce 100644
--- a/goffice/app/go-plugin-service.c
+++ b/goffice/app/go-plugin-service.c
@@ -49,7 +49,7 @@ get_plugin_file_savers_hash (GOPlugin *plugin)
 
 
 static void
-plugin_service_init (GObject *obj)
+go_plugin_service_init (GObject *obj)
 {
 	GOPluginService *service = GO_PLUGIN_SERVICE (obj);
 
@@ -62,7 +62,7 @@ plugin_service_init (GObject *obj)
 }
 
 static void
-plugin_service_finalize (GObject *obj)
+go_plugin_service_finalize (GObject *obj)
 {
 	GOPluginService *service = GO_PLUGIN_SERVICE (obj);
 	GObjectClass *parent_class;
@@ -77,42 +77,42 @@ plugin_service_finalize (GObject *obj)
 }
 
 static void
-plugin_service_class_init (GObjectClass *gobject_class)
+go_plugin_service_class_init (GObjectClass *gobject_class)
 {
 	GOPluginServiceClass *plugin_service_class = GPS_CLASS (gobject_class);
 
-	gobject_class->finalize = plugin_service_finalize;
+	gobject_class->finalize = go_plugin_service_finalize;
 	plugin_service_class->read_xml = NULL;
 	plugin_service_class->activate = NULL;
 	plugin_service_class->deactivate = NULL;
 	plugin_service_class->get_description = NULL;
 }
 
-GSF_CLASS (GOPluginService, plugin_service,
-	   plugin_service_class_init, plugin_service_init,
+GSF_CLASS (GOPluginService, go_plugin_service,
+	   go_plugin_service_class_init, go_plugin_service_init,
            G_TYPE_OBJECT)
 
 
 /****************************************************************************/
 
 /*
- * PluginServiceGeneral
+ * GOPluginServiceGeneral
  */
 
 typedef struct{
 	GOPluginServiceClass plugin_service_class;
-} PluginServiceGeneralClass;
+} GOPluginServiceGeneralClass;
 
-struct _PluginServiceGeneral {
+struct _GOPluginServiceGeneral {
 	GOPluginService plugin_service;
-	PluginServiceGeneralCallbacks cbs;
+	GOPluginServiceGeneralCallbacks cbs;
 };
 
 
 static void
-plugin_service_general_init (GObject *obj)
+go_plugin_service_general_init (GObject *obj)
 {
-	PluginServiceGeneral *service_general = GO_PLUGIN_SERVICE_GENERAL (obj);
+	GOPluginServiceGeneral *service_general = GO_PLUGIN_SERVICE_GENERAL (obj);
 
 	GO_PLUGIN_SERVICE (obj)->cbs_ptr = &service_general->cbs;
 	service_general->cbs.plugin_func_init = NULL;
@@ -120,13 +120,13 @@ plugin_service_general_init (GObject *obj)
 }
 
 static void
-plugin_service_general_activate (GOPluginService *service, GOErrorInfo **ret_error)
+go_plugin_service_general_activate (GOPluginService *service, GOErrorInfo **ret_error)
 {
-	PluginServiceGeneral *service_general = GO_PLUGIN_SERVICE_GENERAL (service);
+	GOPluginServiceGeneral *service_general = GO_PLUGIN_SERVICE_GENERAL (service);
 	GOErrorInfo *error = NULL;
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
-	plugin_service_load (service, &error);
+	go_plugin_service_load (service, &error);
 	if (error != NULL) {
 		*ret_error = go_error_info_new_str_with_details (
 		             _("Error while loading plugin service."),
@@ -145,9 +145,9 @@ plugin_service_general_activate (GOPluginService *service, GOErrorInfo **ret_err
 }
 
 static void
-plugin_service_general_deactivate (GOPluginService *service, GOErrorInfo **ret_error)
+go_plugin_service_general_deactivate (GOPluginService *service, GOErrorInfo **ret_error)
 {
-	PluginServiceGeneral *service_general = GO_PLUGIN_SERVICE_GENERAL (service);
+	GOPluginServiceGeneral *service_general = GO_PLUGIN_SERVICE_GENERAL (service);
 	GOErrorInfo *error = NULL;
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
@@ -163,29 +163,29 @@ plugin_service_general_deactivate (GOPluginService *service, GOErrorInfo **ret_e
 }
 
 static char *
-plugin_service_general_get_description (GOPluginService *service)
+go_plugin_service_general_get_description (GOPluginService *service)
 {
 	return g_strdup (_("General"));
 }
 
 static void
-plugin_service_general_class_init (GObjectClass *gobject_class)
+go_plugin_service_general_class_init (GObjectClass *gobject_class)
 {
 	GOPluginServiceClass *plugin_service_class = GPS_CLASS (gobject_class);
 
-	plugin_service_class->activate = plugin_service_general_activate;
-	plugin_service_class->deactivate = plugin_service_general_deactivate;
-	plugin_service_class->get_description = plugin_service_general_get_description;
+	plugin_service_class->activate = go_plugin_service_general_activate;
+	plugin_service_class->deactivate = go_plugin_service_general_deactivate;
+	plugin_service_class->get_description = go_plugin_service_general_get_description;
 }
 
-GSF_CLASS (PluginServiceGeneral, plugin_service_general,
-           plugin_service_general_class_init, plugin_service_general_init,
+GSF_CLASS (GOPluginServiceGeneral, go_plugin_service_general,
+           go_plugin_service_general_class_init, go_plugin_service_general_init,
            GO_TYPE_PLUGIN_SERVICE)
 
 /****************************************************************************/
 
 /*
- * PluginServiceFileOpener
+ * GOPluginServiceFileOpener
  */
 
 typedef struct _GOPluginFileOpener GOPluginFileOpener;
@@ -193,7 +193,7 @@ static GOPluginFileOpener *go_plugin_file_opener_new (GOPluginService *service);
 
 struct _InputFileSaveInfo {
 	gchar *saver_id_str;
-	FileFormatLevel format_level;
+	GOFileFormatLevel format_level;
 };
 
 typedef struct _InputFileSaveInfo InputFileSaveInfo;
@@ -201,9 +201,9 @@ typedef struct _InputFileSaveInfo InputFileSaveInfo;
 
 typedef struct{
 	GOPluginServiceClass plugin_service_class;
-} PluginServiceFileOpenerClass;
+} GOPluginServiceFileOpenerClass;
 
-struct _PluginServiceFileOpener {
+struct _GOPluginServiceFileOpener {
 	GOPluginService plugin_service;
 
 	gint priority;
@@ -213,14 +213,14 @@ struct _PluginServiceFileOpener {
 	GSList *mimes;		/* list of char * */
 
 	GOFileOpener *opener;
-	PluginServiceFileOpenerCallbacks cbs;
+	GOPluginServiceFileOpenerCallbacks cbs;
 };
 
 
 static void
-plugin_service_file_opener_init (GObject *obj)
+go_plugin_service_file_opener_init (GObject *obj)
 {
-	PluginServiceFileOpener *service_file_opener = GO_PLUGIN_SERVICE_FILE_OPENER (obj);
+	GOPluginServiceFileOpener *service_file_opener = GO_PLUGIN_SERVICE_FILE_OPENER (obj);
 
 	GO_PLUGIN_SERVICE (obj)->cbs_ptr = &service_file_opener->cbs;
 	service_file_opener->description = NULL;
@@ -232,9 +232,9 @@ plugin_service_file_opener_init (GObject *obj)
 }
 
 static void
-plugin_service_file_opener_finalize (GObject *obj)
+go_plugin_service_file_opener_finalize (GObject *obj)
 {
-	PluginServiceFileOpener *service_file_opener = GO_PLUGIN_SERVICE_FILE_OPENER (obj);
+	GOPluginServiceFileOpener *service_file_opener = GO_PLUGIN_SERVICE_FILE_OPENER (obj);
 	GObjectClass *parent_class;
 
 	g_free (service_file_opener->description);
@@ -253,7 +253,7 @@ plugin_service_file_opener_finalize (GObject *obj)
 }
 
 static void
-plugin_service_file_opener_read_xml (GOPluginService *service, xmlNode *tree, GOErrorInfo **ret_error)
+go_plugin_service_file_opener_read_xml (GOPluginService *service, xmlNode *tree, GOErrorInfo **ret_error)
 {
 	int priority;
 	gboolean has_probe;
@@ -290,7 +290,7 @@ plugin_service_file_opener_read_xml (GOPluginService *service, xmlNode *tree, GO
 		GSList *suffixes = NULL, *mimes = NULL;
 		char *tmp;
 		xmlNode *list, *node;
-		PluginServiceFileOpener *service_file_opener = GO_PLUGIN_SERVICE_FILE_OPENER (service);
+		GOPluginServiceFileOpener *service_file_opener = GO_PLUGIN_SERVICE_FILE_OPENER (service);
 
 		list = e_xml_get_child_by_name (tree, (xmlChar *)"suffixes");
 		if (list != NULL) {
@@ -321,9 +321,10 @@ plugin_service_file_opener_read_xml (GOPluginService *service, xmlNode *tree, GO
 }
 
 static void
-plugin_service_file_opener_activate (GOPluginService *service, GOErrorInfo **ret_error)
+go_plugin_service_file_opener_activate (GOPluginService *service,
+					GOErrorInfo **ret_error)
 {
-	PluginServiceFileOpener *service_file_opener = GO_PLUGIN_SERVICE_FILE_OPENER (service);
+	GOPluginServiceFileOpener *service_file_opener = GO_PLUGIN_SERVICE_FILE_OPENER (service);
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
 	service_file_opener->opener = GO_FILE_OPENER (go_plugin_file_opener_new (service));
@@ -333,9 +334,10 @@ plugin_service_file_opener_activate (GOPluginService *service, GOErrorInfo **ret
 }
 
 static void
-plugin_service_file_opener_deactivate (GOPluginService *service, GOErrorInfo **ret_error)
+go_plugin_service_file_opener_deactivate (GOPluginService *service,
+					  GOErrorInfo **ret_error)
 {
-	PluginServiceFileOpener *service_file_opener = GO_PLUGIN_SERVICE_FILE_OPENER (service);
+	GOPluginServiceFileOpener *service_file_opener = GO_PLUGIN_SERVICE_FILE_OPENER (service);
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
 	go_file_opener_unregister (service_file_opener->opener);
@@ -343,28 +345,29 @@ plugin_service_file_opener_deactivate (GOPluginService *service, GOErrorInfo **r
 }
 
 static char *
-plugin_service_file_opener_get_description (GOPluginService *service)
+go_plugin_service_file_opener_get_description (GOPluginService *service)
 {
-	PluginServiceFileOpener *service_file_opener = GO_PLUGIN_SERVICE_FILE_OPENER (service);
+	GOPluginServiceFileOpener *service_file_opener = GO_PLUGIN_SERVICE_FILE_OPENER (service);
 
 	return g_strdup_printf (
 		_("File opener - %s"), service_file_opener->description);
 }
 
 static void
-plugin_service_file_opener_class_init (GObjectClass *gobject_class)
+go_plugin_service_file_opener_class_init (GObjectClass *gobject_class)
 {
 	GOPluginServiceClass *plugin_service_class = GPS_CLASS (gobject_class);
 
-	gobject_class->finalize = plugin_service_file_opener_finalize;
-	plugin_service_class->read_xml = plugin_service_file_opener_read_xml;
-	plugin_service_class->activate = plugin_service_file_opener_activate;
-	plugin_service_class->deactivate = plugin_service_file_opener_deactivate;
-	plugin_service_class->get_description = plugin_service_file_opener_get_description;
+	gobject_class->finalize = go_plugin_service_file_opener_finalize;
+	plugin_service_class->read_xml = go_plugin_service_file_opener_read_xml;
+	plugin_service_class->activate = go_plugin_service_file_opener_activate;
+	plugin_service_class->deactivate = go_plugin_service_file_opener_deactivate;
+	plugin_service_class->get_description = go_plugin_service_file_opener_get_description;
 }
 
-GSF_CLASS (PluginServiceFileOpener, plugin_service_file_opener,
-           plugin_service_file_opener_class_init, plugin_service_file_opener_init,
+GSF_CLASS (GOPluginServiceFileOpener, go_plugin_service_file_opener,
+           go_plugin_service_file_opener_class_init,
+	   go_plugin_service_file_opener_init,
            GO_TYPE_PLUGIN_SERVICE)
 
 
@@ -397,7 +400,7 @@ static gboolean
 go_plugin_file_opener_can_probe (GOFileOpener const *fo, FileProbeLevel pl)
 {
 	GOPluginFileOpener *pfo = GO_PLUGIN_FILE_OPENER (fo);
-	PluginServiceFileOpener *service_file_opener = GO_PLUGIN_SERVICE_FILE_OPENER (pfo->service);
+	GOPluginServiceFileOpener *service_file_opener = GO_PLUGIN_SERVICE_FILE_OPENER (pfo->service);
 	if (pl == FILE_PROBE_FILE_NAME)
 		return service_file_opener->suffixes != NULL;
 	return service_file_opener->has_probe;
@@ -408,7 +411,7 @@ go_plugin_file_opener_probe (GOFileOpener const *fo, GsfInput *input,
                                FileProbeLevel pl)
 {
 	GOPluginFileOpener *pfo = GO_PLUGIN_FILE_OPENER (fo);
-	PluginServiceFileOpener *service_file_opener = GO_PLUGIN_SERVICE_FILE_OPENER (pfo->service);
+	GOPluginServiceFileOpener *service_file_opener = GO_PLUGIN_SERVICE_FILE_OPENER (pfo->service);
 
 	g_return_val_if_fail (GSF_IS_INPUT (input), FALSE);
 
@@ -434,7 +437,7 @@ go_plugin_file_opener_probe (GOFileOpener const *fo, GsfInput *input,
 	if (service_file_opener->has_probe) {
 		GOErrorInfo *ignored_error = NULL;
 
-		plugin_service_load (pfo->service, &ignored_error);
+		go_plugin_service_load (pfo->service, &ignored_error);
 		if (ignored_error != NULL) {
 			go_error_info_print (ignored_error);
 			go_error_info_free (ignored_error);
@@ -459,12 +462,12 @@ go_plugin_file_opener_open (GOFileOpener const *fo, gchar const *unused_enc,
 
 {
 	GOPluginFileOpener *pfo = GO_PLUGIN_FILE_OPENER (fo);
-	PluginServiceFileOpener *service_file_opener = GO_PLUGIN_SERVICE_FILE_OPENER (pfo->service);
+	GOPluginServiceFileOpener *service_file_opener = GO_PLUGIN_SERVICE_FILE_OPENER (pfo->service);
 	GOErrorInfo *error = NULL;
 
 	g_return_if_fail (GSF_IS_INPUT (input));
 
-	plugin_service_load (pfo->service, &error);
+	go_plugin_service_load (pfo->service, &error);
 	if (error != NULL) {
 		go_io_error_info_set (io_context, error);
 		go_io_error_push (io_context, go_error_info_new_str (
@@ -488,7 +491,7 @@ go_plugin_file_opener_class_init (GOPluginFileOpenerClass *klass)
 
 GSF_CLASS (GOPluginFileOpener, go_plugin_file_opener,
 	   go_plugin_file_opener_class_init, go_plugin_file_opener_init,
-	   TYPE_GO_FILE_OPENER)
+	   GO_TYPE_FILE_OPENER)
 
 static GSList *
 go_str_slist_dup (GSList *l)
@@ -502,7 +505,7 @@ go_str_slist_dup (GSList *l)
 static GOPluginFileOpener *
 go_plugin_file_opener_new (GOPluginService *service)
 {
-	PluginServiceFileOpener *service_file_opener = GO_PLUGIN_SERVICE_FILE_OPENER (service);
+	GOPluginServiceFileOpener *service_file_opener = GO_PLUGIN_SERVICE_FILE_OPENER (service);
 	GOPluginFileOpener *fo;
 	gchar *opener_id;
 
@@ -524,7 +527,7 @@ go_plugin_file_opener_new (GOPluginService *service)
 
 
 /*
- * PluginServiceFileSaver
+ * GOPluginServiceFileSaver
  */
 
 typedef struct _GOPluginFileSaver GOPluginFileSaver;
@@ -533,28 +536,28 @@ static GOPluginFileSaver *go_plugin_file_saver_new (GOPluginService *service);
 
 typedef struct{
 	GOPluginServiceClass plugin_service_class;
-} PluginServiceFileSaverClass;
+} GOPluginServiceFileSaverClass;
 
-struct _PluginServiceFileSaver {
+struct _GOPluginServiceFileSaver {
 	GOPluginService plugin_service;
 
 	gchar *file_extension;
 	gchar *mime_type;
-	FileFormatLevel format_level;
+	GOFileFormatLevel format_level;
 	gchar *description;
 	gint   default_saver_priority;
-	FileSaveScope save_scope;
+	GOFileSaveScope save_scope;
 	gboolean overwrite_files;
 
 	GOFileSaver *saver;
-	PluginServiceFileSaverCallbacks cbs;
+	GOPluginServiceFileSaverCallbacks cbs;
 };
 
 
 static void
-plugin_service_file_saver_init (GObject *obj)
+go_plugin_service_file_saver_init (GObject *obj)
 {
-	PluginServiceFileSaver *service_file_saver = GO_PLUGIN_SERVICE_FILE_SAVER (obj);
+	GOPluginServiceFileSaver *service_file_saver = GO_PLUGIN_SERVICE_FILE_SAVER (obj);
 
 	GO_PLUGIN_SERVICE (obj)->cbs_ptr = &service_file_saver->cbs;
 	service_file_saver->file_extension = NULL;
@@ -565,9 +568,9 @@ plugin_service_file_saver_init (GObject *obj)
 }
 
 static void
-plugin_service_file_saver_finalize (GObject *obj)
+go_plugin_service_file_saver_finalize (GObject *obj)
 {
-	PluginServiceFileSaver *service_file_saver = GO_PLUGIN_SERVICE_FILE_SAVER (obj);
+	GOPluginServiceFileSaver *service_file_saver = GO_PLUGIN_SERVICE_FILE_SAVER (obj);
 	GObjectClass *parent_class;
 
 	g_free (service_file_saver->file_extension);
@@ -581,7 +584,7 @@ plugin_service_file_saver_finalize (GObject *obj)
 }
 
 static void
-plugin_service_file_saver_read_xml (GOPluginService *service, xmlNode *tree, GOErrorInfo **ret_error)
+go_plugin_service_file_saver_read_xml (GOPluginService *service, xmlNode *tree, GOErrorInfo **ret_error)
 {
 	xmlNode *information_node;
 	gchar *description;
@@ -607,9 +610,9 @@ plugin_service_file_saver_read_xml (GOPluginService *service, xmlNode *tree, GOE
 
 	if (description != NULL) {
 		xmlChar *s;
-		int scope = FILE_SAVE_WORKBOOK;
-		int level = FILE_FL_WRITE_ONLY;
-		PluginServiceFileSaver *psfs =
+		int scope = GO_FILE_SAVE_WORKBOOK;
+		int level = GO_FILE_FL_WRITE_ONLY;
+		GOPluginServiceFileSaver *psfs =
 			GO_PLUGIN_SERVICE_FILE_SAVER (service);
 
 		s = xml_node_get_cstr (tree, "file_extension");
@@ -624,14 +627,14 @@ plugin_service_file_saver_read_xml (GOPluginService *service, xmlNode *tree, GOE
 
 		(void)xml_node_get_enum (tree, "format_level",
 					 GO_TYPE_FILE_SAVER_LEVEL, &level);
-		psfs->format_level = (FileFormatLevel)level;
+		psfs->format_level = (GOFileFormatLevel)level;
 
 		if (!xml_node_get_int (tree, "default_saver_priority", &(psfs->default_saver_priority)))
 			psfs->default_saver_priority = -1;
 
 		(void)xml_node_get_enum (tree, "save_scope",
 					 GO_TYPE_FILE_SAVER_SCOPE, &scope);
-		psfs->save_scope = (FileSaveScope)scope;
+		psfs->save_scope = (GOFileSaveScope)scope;
 
 		if (!xml_node_get_bool (tree, "overwrite_files", &(psfs->overwrite_files)))
 			psfs->overwrite_files = TRUE;
@@ -641,9 +644,9 @@ plugin_service_file_saver_read_xml (GOPluginService *service, xmlNode *tree, GOE
 }
 
 static void
-plugin_service_file_saver_activate (GOPluginService *service, GOErrorInfo **ret_error)
+go_plugin_service_file_saver_activate (GOPluginService *service, GOErrorInfo **ret_error)
 {
-	PluginServiceFileSaver *service_file_saver = GO_PLUGIN_SERVICE_FILE_SAVER (service);
+	GOPluginServiceFileSaver *service_file_saver = GO_PLUGIN_SERVICE_FILE_SAVER (service);
 	GHashTable *file_savers_hash;
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
@@ -661,9 +664,9 @@ plugin_service_file_saver_activate (GOPluginService *service, GOErrorInfo **ret_
 }
 
 static void
-plugin_service_file_saver_deactivate (GOPluginService *service, GOErrorInfo **ret_error)
+go_plugin_service_file_saver_deactivate (GOPluginService *service, GOErrorInfo **ret_error)
 {
-	PluginServiceFileSaver *service_file_saver = GO_PLUGIN_SERVICE_FILE_SAVER (service);
+	GOPluginServiceFileSaver *service_file_saver = GO_PLUGIN_SERVICE_FILE_SAVER (service);
 	GHashTable *file_savers_hash;
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
@@ -674,28 +677,28 @@ plugin_service_file_saver_deactivate (GOPluginService *service, GOErrorInfo **re
 }
 
 static char *
-plugin_service_file_saver_get_description (GOPluginService *service)
+go_plugin_service_file_saver_get_description (GOPluginService *service)
 {
-	PluginServiceFileSaver *service_file_saver = GO_PLUGIN_SERVICE_FILE_SAVER (service);
+	GOPluginServiceFileSaver *service_file_saver = GO_PLUGIN_SERVICE_FILE_SAVER (service);
 
 	return g_strdup_printf (
 		_("File saver - %s"), service_file_saver->description);
 }
 
 static void
-plugin_service_file_saver_class_init (GObjectClass *gobject_class)
+go_plugin_service_file_saver_class_init (GObjectClass *gobject_class)
 {
 	GOPluginServiceClass *plugin_service_class = GPS_CLASS (gobject_class);
 
-	gobject_class->finalize = plugin_service_file_saver_finalize;
-	plugin_service_class->read_xml = plugin_service_file_saver_read_xml;
-	plugin_service_class->activate = plugin_service_file_saver_activate;
-	plugin_service_class->deactivate = plugin_service_file_saver_deactivate;
-	plugin_service_class->get_description = plugin_service_file_saver_get_description;
+	gobject_class->finalize = go_plugin_service_file_saver_finalize;
+	plugin_service_class->read_xml = go_plugin_service_file_saver_read_xml;
+	plugin_service_class->activate = go_plugin_service_file_saver_activate;
+	plugin_service_class->deactivate = go_plugin_service_file_saver_deactivate;
+	plugin_service_class->get_description = go_plugin_service_file_saver_get_description;
 }
 
-GSF_CLASS (PluginServiceFileSaver, plugin_service_file_saver,
-           plugin_service_file_saver_class_init, plugin_service_file_saver_init,
+GSF_CLASS (GOPluginServiceFileSaver, go_plugin_service_file_saver,
+           go_plugin_service_file_saver_class_init, go_plugin_service_file_saver_init,
            GO_TYPE_PLUGIN_SERVICE)
 
 
@@ -730,12 +733,12 @@ go_plugin_file_saver_save (GOFileSaver const *fs, GOIOContext *io_context,
 			    GsfOutput *output)
 {
 	GOPluginFileSaver *pfs = GO_PLUGIN_FILE_SAVER (fs);
-	PluginServiceFileSaver *service_file_saver = GO_PLUGIN_SERVICE_FILE_SAVER (pfs->service);
+	GOPluginServiceFileSaver *service_file_saver = GO_PLUGIN_SERVICE_FILE_SAVER (pfs->service);
 	GOErrorInfo *error = NULL;
 
 	g_return_if_fail (GSF_IS_OUTPUT (output));
 
-	plugin_service_load (pfs->service, &error);
+	go_plugin_service_load (pfs->service, &error);
 	if (error != NULL) {
 		go_io_error_info_set (io_context, error);
 		go_io_error_push (io_context, go_error_info_new_str (
@@ -759,13 +762,13 @@ go_plugin_file_saver_class_init (GOPluginFileSaverClass *klass)
 
 GSF_CLASS (GOPluginFileSaver, go_plugin_file_saver,
 	   go_plugin_file_saver_class_init, go_plugin_file_saver_init,
-	   TYPE_GO_FILE_SAVER)
+	   GO_TYPE_FILE_SAVER)
 
 static GOPluginFileSaver *
 go_plugin_file_saver_new (GOPluginService *service)
 {
 	GOPluginFileSaver *pfs;
-	PluginServiceFileSaver *psfs = GO_PLUGIN_SERVICE_FILE_SAVER (service);
+	GOPluginServiceFileSaver *psfs = GO_PLUGIN_SERVICE_FILE_SAVER (service);
 	gchar *saver_id;
 
 	saver_id = g_strconcat (go_plugin_get_id (service->plugin),
@@ -790,36 +793,37 @@ go_plugin_file_saver_new (GOPluginService *service)
 }
 
 /*
- * PluginServicePluginLoader
+ * GOPluginServicePluginLoader
  */
 
 typedef struct{
 	GOPluginServiceClass plugin_service_class;
-} PluginServicePluginLoaderClass;
+} GOPluginServicePluginLoaderClass;
 
-struct _PluginServicePluginLoader {
+struct _GOPluginServicePluginLoader {
 	GOPluginService plugin_service;
-	PluginServicePluginLoaderCallbacks cbs;
+	GOPluginServicePluginLoaderCallbacks cbs;
 };
 
 
 static void
-plugin_service_plugin_loader_init (GObject *obj)
+go_plugin_service_plugin_loader_init (GObject *obj)
 {
-	PluginServicePluginLoader *service_plugin_loader = GO_PLUGIN_SERVICE_PLUGIN_LOADER (obj);
+	GOPluginServicePluginLoader *service_plugin_loader = GO_PLUGIN_SERVICE_PLUGIN_LOADER (obj);
 
 	GO_PLUGIN_SERVICE (obj)->cbs_ptr = &service_plugin_loader->cbs;
 }
 
 GType
-plugin_service_plugin_loader_generate_type (GOPluginService *service, GOErrorInfo **ret_error)
+go_plugin_service_plugin_loader_generate_type (GOPluginService *service,
+					       GOErrorInfo **ret_error)
 {
-	PluginServicePluginLoader *service_plugin_loader = GO_PLUGIN_SERVICE_PLUGIN_LOADER (service);
+	GOPluginServicePluginLoader *service_plugin_loader = GO_PLUGIN_SERVICE_PLUGIN_LOADER (service);
 	GOErrorInfo *error = NULL;
 	GType loader_type;
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
-	plugin_service_load (service, &error);
+	go_plugin_service_load (service, &error);
 	if (error == NULL) {
 		loader_type = service_plugin_loader->cbs.plugin_func_get_loader_type (
 			service, &error);
@@ -835,7 +839,8 @@ plugin_service_plugin_loader_generate_type (GOPluginService *service, GOErrorInf
 }
 
 static void
-plugin_service_plugin_loader_activate (GOPluginService *service, GOErrorInfo **ret_error)
+go_plugin_service_plugin_loader_activate (GOPluginService *service,
+					  GOErrorInfo **ret_error)
 {
 	gchar *full_id;
 
@@ -848,7 +853,8 @@ plugin_service_plugin_loader_activate (GOPluginService *service, GOErrorInfo **r
 }
 
 static void
-plugin_service_plugin_loader_deactivate (GOPluginService *service, GOErrorInfo **ret_error)
+go_plugin_service_plugin_loader_deactivate (GOPluginService *service,
+					    GOErrorInfo **ret_error)
 {
 	gchar *full_id;
 
@@ -861,93 +867,94 @@ plugin_service_plugin_loader_deactivate (GOPluginService *service, GOErrorInfo *
 }
 
 static char *
-plugin_service_plugin_loader_get_description (GOPluginService *service)
+go_plugin_service_plugin_loader_get_description (GOPluginService *service)
 {
 	return g_strdup (_("Plugin loader"));
 }
 
 static void
-plugin_service_plugin_loader_class_init (GObjectClass *gobject_class)
+go_plugin_service_plugin_loader_class_init (GObjectClass *gobject_class)
 {
 	GOPluginServiceClass *plugin_service_class = GPS_CLASS (gobject_class);
 
-	plugin_service_class->activate = plugin_service_plugin_loader_activate;
-	plugin_service_class->deactivate = plugin_service_plugin_loader_deactivate;
-	plugin_service_class->get_description = plugin_service_plugin_loader_get_description;
+	plugin_service_class->activate = go_plugin_service_plugin_loader_activate;
+	plugin_service_class->deactivate = go_plugin_service_plugin_loader_deactivate;
+	plugin_service_class->get_description = go_plugin_service_plugin_loader_get_description;
 }
 
-GSF_CLASS (PluginServicePluginLoader, plugin_service_plugin_loader,
-           plugin_service_plugin_loader_class_init, plugin_service_plugin_loader_init,
+GSF_CLASS (GOPluginServicePluginLoader, go_plugin_service_plugin_loader,
+           go_plugin_service_plugin_loader_class_init,
+	   go_plugin_service_plugin_loader_init,
            GO_TYPE_PLUGIN_SERVICE)
 
 /**************************************************************************
- * PluginServiceGObjectLoader
+ * GOPluginServiceGObjectLoader
  */
 
 static char *
-plugin_service_gobject_loader_get_description (GOPluginService *service)
+go_plugin_service_gobject_loader_get_description (GOPluginService *service)
 {
 	return g_strdup (_("GObject loader"));
 }
 
 static void
-plugin_service_gobject_loader_read_xml (GOPluginService *service,
+go_plugin_service_gobject_loader_read_xml (GOPluginService *service,
 					G_GNUC_UNUSED xmlNode *tree,
 					G_GNUC_UNUSED GOErrorInfo **ret_error)
 {
-	PluginServiceGObjectLoaderClass *gobj_loader_class = GPS_GOBJECT_LOADER_GET_CLASS (service);
+	GOPluginServiceGObjectLoaderClass *gobj_loader_class = GPS_GOBJECT_LOADER_GET_CLASS (service);
 	g_return_if_fail (gobj_loader_class->pending != NULL);
 	g_hash_table_replace (gobj_loader_class->pending, service->id, service);
 }
 
 static void
-plugin_service_gobject_loader_class_init (PluginServiceGObjectLoaderClass *gobj_loader_class)
+go_plugin_service_gobject_loader_class_init (GOPluginServiceGObjectLoaderClass *gobj_loader_class)
 {
 	GOPluginServiceClass *psc = GPS_CLASS (gobj_loader_class);
 
-	psc->get_description	= plugin_service_gobject_loader_get_description;
-	psc->read_xml		= plugin_service_gobject_loader_read_xml;
+	psc->get_description	= go_plugin_service_gobject_loader_get_description;
+	psc->read_xml		= go_plugin_service_gobject_loader_read_xml;
 	gobj_loader_class->pending = NULL;
 }
 
-GSF_CLASS (PluginServiceGObjectLoader, plugin_service_gobject_loader,
-           plugin_service_gobject_loader_class_init, NULL,
+GSF_CLASS (GOPluginServiceGObjectLoader, go_plugin_service_gobject_loader,
+           go_plugin_service_gobject_loader_class_init, NULL,
            GO_TYPE_PLUGIN_SERVICE_SIMPLE)
 
 /**************************************************************************
- * PluginServiceSimple
+ * GOPluginServiceSimple
  */
 
 static void
-plugin_service_simple_activate (GOPluginService *service, GOErrorInfo **ret_error)
+go_plugin_service_simple_activate (GOPluginService *service, GOErrorInfo **ret_error)
 {
 	service->is_active = TRUE;
 }
 
 static void
-plugin_service_simple_deactivate (GOPluginService *service, GOErrorInfo **ret_error)
+go_plugin_service_simple_deactivate (GOPluginService *service, GOErrorInfo **ret_error)
 {
 	service->is_active = FALSE;
 }
 
 static void
-plugin_service_simple_class_init (GObjectClass *gobject_class)
+go_plugin_service_simple_class_init (GObjectClass *gobject_class)
 {
 	GOPluginServiceClass *psc = GPS_CLASS (gobject_class);
 
-	psc->activate		= plugin_service_simple_activate;
-	psc->deactivate		= plugin_service_simple_deactivate;
+	psc->activate		= go_plugin_service_simple_activate;
+	psc->deactivate		= go_plugin_service_simple_deactivate;
 }
 
-GSF_CLASS (PluginServiceSimple, plugin_service_simple,
-           plugin_service_simple_class_init,
+GSF_CLASS (GOPluginServiceSimple, go_plugin_service_simple,
+           go_plugin_service_simple_class_init,
 	   NULL,
            GO_TYPE_PLUGIN_SERVICE)
 
 /* ---------------------------------------------------------------------- */
 
 void
-plugin_service_load (GOPluginService *service, GOErrorInfo **ret_error)
+go_plugin_service_load (GOPluginService *service, GOErrorInfo **ret_error)
 {
 	g_return_if_fail (GO_IS_PLUGIN_SERVICE (service));
 
@@ -961,7 +968,7 @@ plugin_service_load (GOPluginService *service, GOErrorInfo **ret_error)
 }
 
 void
-plugin_service_unload (GOPluginService *service, GOErrorInfo **ret_error)
+go_plugin_service_unload (GOPluginService *service, GOErrorInfo **ret_error)
 {
 	GOErrorInfo *error = NULL;
 
@@ -980,7 +987,7 @@ plugin_service_unload (GOPluginService *service, GOErrorInfo **ret_error)
 }
 
 GOPluginService *
-plugin_service_new (GOPlugin *plugin, xmlNode *tree, GOErrorInfo **ret_error)
+go_plugin_service_new (GOPlugin *plugin, xmlNode *tree, GOErrorInfo **ret_error)
 {
 	GOPluginService *service = NULL;
 	char *type_str;
@@ -1026,7 +1033,7 @@ plugin_service_new (GOPlugin *plugin, xmlNode *tree, GOErrorInfo **ret_error)
 }
 
 char const *
-plugin_service_get_id (const GOPluginService *service)
+go_plugin_service_get_id (const GOPluginService *service)
 {
 	g_return_val_if_fail (GO_IS_PLUGIN_SERVICE (service), NULL);
 
@@ -1034,7 +1041,7 @@ plugin_service_get_id (const GOPluginService *service)
 }
 
 char const *
-plugin_service_get_description (GOPluginService *service)
+go_plugin_service_get_description (GOPluginService *service)
 {
 	g_return_val_if_fail (GO_IS_PLUGIN_SERVICE (service), NULL);
 
@@ -1046,7 +1053,7 @@ plugin_service_get_description (GOPluginService *service)
 }
 
 GOPlugin *
-plugin_service_get_plugin (GOPluginService *service)
+go_plugin_service_get_plugin (GOPluginService *service)
 {
 	g_return_val_if_fail (GO_IS_PLUGIN_SERVICE (service), NULL);
 
@@ -1054,7 +1061,7 @@ plugin_service_get_plugin (GOPluginService *service)
 }
 
 gpointer
-plugin_service_get_cbs (GOPluginService *service)
+go_plugin_service_get_cbs (GOPluginService *service)
 {
 	g_return_val_if_fail (GO_IS_PLUGIN_SERVICE (service), NULL);
 	g_return_val_if_fail (service->cbs_ptr != NULL, NULL);
@@ -1063,7 +1070,7 @@ plugin_service_get_cbs (GOPluginService *service)
 }
 
 void
-plugin_service_activate (GOPluginService *service, GOErrorInfo **ret_error)
+go_plugin_service_activate (GOPluginService *service, GOErrorInfo **ret_error)
 {
 	g_return_if_fail (GO_IS_PLUGIN_SERVICE (service));
 
@@ -1075,7 +1082,7 @@ plugin_service_activate (GOPluginService *service, GOErrorInfo **ret_error)
 	{
 		GOErrorInfo *load_error = NULL;
 
-		plugin_service_load (service, &load_error);
+		go_plugin_service_load (service, &load_error);
 		if (load_error != NULL) {
 			*ret_error = go_error_info_new_str_with_details (
 				_("We must load service before activating it (PLUGIN_ALWAYS_LOAD is set) "
@@ -1088,7 +1095,7 @@ plugin_service_activate (GOPluginService *service, GOErrorInfo **ret_error)
 }
 
 void
-plugin_service_deactivate (GOPluginService *service, GOErrorInfo **ret_error)
+go_plugin_service_deactivate (GOPluginService *service, GOErrorInfo **ret_error)
 {
 	g_return_if_fail (GO_IS_PLUGIN_SERVICE (service));
 
@@ -1102,7 +1109,7 @@ plugin_service_deactivate (GOPluginService *service, GOErrorInfo **ret_error)
 
 		service->is_active = FALSE;
 		/* FIXME */
-		plugin_service_unload (service, &ignored_error);
+		go_plugin_service_unload (service, &ignored_error);
 		go_error_info_free (ignored_error);
 	}
 }
@@ -1110,22 +1117,22 @@ plugin_service_deactivate (GOPluginService *service, GOErrorInfo **ret_error)
 /*****************************************************************************/
 
 void
-plugin_services_init (void)
+go_plugin_services_init (void)
 {
 	static struct {
 		char const *type_str;
 		GOPluginServiceCreate ctor;
 	} const builtin_services[] = {
-		{ "general",		plugin_service_general_get_type},
-		{ "file_opener",	plugin_service_file_opener_get_type},
-		{ "file_saver",		plugin_service_file_saver_get_type},
-		{ "plugin_loader",	plugin_service_plugin_loader_get_type},
+		{ "general",		go_plugin_service_general_get_type},
+		{ "file_opener",	go_plugin_service_file_opener_get_type},
+		{ "file_saver",		go_plugin_service_file_saver_get_type},
+		{ "plugin_loader",	go_plugin_service_plugin_loader_get_type},
 /* base classes, not really for direct external use,
  * put here for expositional purposes
  */
 #if 0
-		{ "gobject_loader",	plugin_service_gobject_loader_get_type}
-		{ "simple",		plugin_service_simple_get_type}
+		{ "gobject_loader",	go_plugin_service_gobject_loader_get_type}
+		{ "simple",		go_plugin_service_simple_get_type}
 #endif
 	};
 	unsigned i;
@@ -1134,12 +1141,12 @@ plugin_services_init (void)
 
 	services = g_hash_table_new (g_str_hash, g_str_equal);
 	for (i = 0; i < G_N_ELEMENTS (builtin_services); i++)
-		plugin_service_define (builtin_services[i].type_str,
+		go_plugin_service_define (builtin_services[i].type_str,
 				       builtin_services[i].ctor);
 }
 
 void
-plugin_services_shutdown (void)
+go_plugin_services_shutdown (void)
 {
 	g_return_if_fail (services != NULL);
 	g_hash_table_destroy (services);
@@ -1147,14 +1154,14 @@ plugin_services_shutdown (void)
 }
 
 /**
- * plugin_service_define:
+ * go_plugin_service_define:
  * @type_str :  char const *
  * @ctor : #GOPluginServiceCreate
  *
  * Allow the definition of new service types
  **/
 void
-plugin_service_define (char const *type_str, GOPluginServiceCreate ctor)
+go_plugin_service_define (char const *type_str, GOPluginServiceCreate ctor)
 {
 	g_return_if_fail (services != NULL);
 
diff --git a/goffice/app/go-plugin-service.h b/goffice/app/go-plugin-service.h
index ea9115a..3204be9 100644
--- a/goffice/app/go-plugin-service.h
+++ b/goffice/app/go-plugin-service.h
@@ -10,29 +10,29 @@
 
 G_BEGIN_DECLS
 
-#define GO_TYPE_PLUGIN_SERVICE         (plugin_service_get_type ())
+#define GO_TYPE_PLUGIN_SERVICE         (go_plugin_service_get_type ())
 #define GO_PLUGIN_SERVICE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN_SERVICE, GOPluginService))
 #define GO_IS_PLUGIN_SERVICE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_PLUGIN_SERVICE))
 
-GType plugin_service_get_type (void);
+GType go_plugin_service_get_type (void);
 
-#define GO_TYPE_PLUGIN_SERVICE_GENERAL  (plugin_service_general_get_type ())
-#define GO_PLUGIN_SERVICE_GENERAL(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN_SERVICE_GENERAL, PluginServiceGeneral))
+#define GO_TYPE_PLUGIN_SERVICE_GENERAL  (go_plugin_service_general_get_type ())
+#define GO_PLUGIN_SERVICE_GENERAL(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN_SERVICE_GENERAL, GOPluginServiceGeneral))
 #define GO_IS_PLUGIN_SERVICE_GENERAL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_PLUGIN_SERVICE_GENERAL))
 
-GType plugin_service_general_get_type (void);
-typedef struct _PluginServiceGeneral PluginServiceGeneral;
+GType go_plugin_service_general_get_type (void);
+typedef struct _GOPluginServiceGeneral GOPluginServiceGeneral;
 typedef struct {
 	void (*plugin_func_init) (GOPluginService *service, GOErrorInfo **ret_error);
 	void (*plugin_func_cleanup) (GOPluginService *service, GOErrorInfo **ret_error);
-} PluginServiceGeneralCallbacks;
+} GOPluginServiceGeneralCallbacks;
 
-#define GO_TYPE_PLUGIN_SERVICE_FILE_OPENER  (plugin_service_file_opener_get_type ())
-#define GO_PLUGIN_SERVICE_FILE_OPENER(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN_SERVICE_FILE_OPENER, PluginServiceFileOpener))
+#define GO_TYPE_PLUGIN_SERVICE_FILE_OPENER  (go_plugin_service_file_opener_get_type ())
+#define GO_PLUGIN_SERVICE_FILE_OPENER(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN_SERVICE_FILE_OPENER, GOPluginServiceFileOpener))
 #define GO_IS_PLUGIN_SERVICE_FILE_OPENER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_PLUGIN_SERVICE_FILE_OPENER))
 
-GType plugin_service_file_opener_get_type (void);
-typedef struct _PluginServiceFileOpener PluginServiceFileOpener;
+GType go_plugin_service_file_opener_get_type (void);
+typedef struct _GOPluginServiceFileOpener GOPluginServiceFileOpener;
 typedef struct {
 	/* plugin_func_file_probe may be NULL */
 	gboolean (*plugin_func_file_probe) (
@@ -42,69 +42,69 @@ typedef struct {
 	         GOFileOpener const *fo, GOPluginService *service,
 	         GOIOContext *io_context, gpointer fixme_workbook_view,
 		 GsfInput *input);
-} PluginServiceFileOpenerCallbacks;
+} GOPluginServiceFileOpenerCallbacks;
 
 
-#define GO_TYPE_PLUGIN_SERVICE_FILE_SAVER  (plugin_service_file_saver_get_type ())
-#define GO_PLUGIN_SERVICE_FILE_SAVER(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN_SERVICE_FILE_SAVER, PluginServiceFileSaver))
+#define GO_TYPE_PLUGIN_SERVICE_FILE_SAVER  (go_plugin_service_file_saver_get_type ())
+#define GO_PLUGIN_SERVICE_FILE_SAVER(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN_SERVICE_FILE_SAVER, GOPluginServiceFileSaver))
 #define GO_IS_PLUGIN_SERVICE_FILE_SAVER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_PLUGIN_SERVICE_FILE_SAVER))
 
-GType plugin_service_file_saver_get_type (void);
-typedef struct _PluginServiceFileSaver PluginServiceFileSaver;
+GType go_plugin_service_file_saver_get_type (void);
+typedef struct _GOPluginServiceFileSaver GOPluginServiceFileSaver;
 typedef struct {
 	void  (*plugin_func_file_save) (
 	      GOFileSaver const *fs, GOPluginService *service,
 	      GOIOContext *io_context, gconstpointer fixme_workbook_view,
 	      GsfOutput *output);
-} PluginServiceFileSaverCallbacks;
+} GOPluginServiceFileSaverCallbacks;
 
-#define GO_TYPE_PLUGIN_SERVICE_PLUGIN_LOADER  (plugin_service_plugin_loader_get_type ())
-#define GO_PLUGIN_SERVICE_PLUGIN_LOADER(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN_SERVICE_PLUGIN_LOADER, PluginServicePluginLoader))
+#define GO_TYPE_PLUGIN_SERVICE_PLUGIN_LOADER  (go_plugin_service_plugin_loader_get_type ())
+#define GO_PLUGIN_SERVICE_PLUGIN_LOADER(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN_SERVICE_PLUGIN_LOADER, GOPluginServicePluginLoader))
 #define GO_IS_PLUGIN_SERVICE_PLUGIN_LOADER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_PLUGIN_SERVICE_PLUGIN_LOADER))
 
-GType plugin_service_plugin_loader_get_type (void);
-typedef struct _PluginServicePluginLoader PluginServicePluginLoader;
+GType go_plugin_service_plugin_loader_get_type (void);
+typedef struct _GOPluginServicePluginLoader GOPluginServicePluginLoader;
 typedef struct {
 	GType (*plugin_func_get_loader_type) (
 	      GOPluginService *service, GOErrorInfo **ret_error);
-} PluginServicePluginLoaderCallbacks;
+} GOPluginServicePluginLoaderCallbacks;
 
-GType plugin_service_plugin_loader_generate_type (GOPluginService *service,
-                                                  GOErrorInfo **ret_error);
+GType go_plugin_service_plugin_loader_generate_type (GOPluginService *service,
+						     GOErrorInfo **ret_error);
 
 /****************************************************************************/
 
-#define GO_TYPE_PLUGIN_SERVICE_GOBJECT_LOADER  (plugin_service_gobject_loader_get_type ())
-#define GO_PLUGIN_SERVICE_GOBJECT_LOADER(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN_SERVICE_GOBJECT_LOADER, PluginServiceGObjectLoader))
+#define GO_TYPE_PLUGIN_SERVICE_GOBJECT_LOADER  (go_plugin_service_gobject_loader_get_type ())
+#define GO_PLUGIN_SERVICE_GOBJECT_LOADER(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN_SERVICE_GOBJECT_LOADER, GOPluginServiceGObjectLoader))
 #define GO_IS_PLUGIN_SERVICE_GOBJECT_LOADER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_PLUGIN_SERVICE_GOBJECT_LOADER))
 
-GType plugin_service_gobject_loader_get_type (void);
-typedef struct _PluginServiceGObjectLoader PluginServiceGObjectLoader;
+GType go_plugin_service_gobject_loader_get_type (void);
+typedef struct _GOPluginServiceGObjectLoader GOPluginServiceGObjectLoader;
 
 /****************************************************************************/
-#define GO_TYPE_PLUGIN_SERVICE_SIMPLE  (plugin_service_simple_get_type ())
-#define GO_PLUGIN_SERVICE_SIMPLE(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN_SERVICE_SIMPLE, PluginServiceSimple))
+#define GO_TYPE_PLUGIN_SERVICE_SIMPLE  (go_plugin_service_simple_get_type ())
+#define GO_PLUGIN_SERVICE_SIMPLE(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN_SERVICE_SIMPLE, GOPluginServiceSimple))
 #define GO_IS_PLUGIN_SERVICE_SIMPLE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_PLUGIN_SERVICE_SIMPLE))
 
-GType plugin_service_simple_get_type (void);
-typedef struct _PluginServiceSimple PluginServiceSimple;
+GType go_plugin_service_simple_get_type (void);
+typedef struct _GOPluginServiceSimple GOPluginServiceSimple;
 
 /****************************************************************************/
 
-GOPluginService  *plugin_service_new (GOPlugin *plugin, xmlNode *tree, GOErrorInfo **ret_error);
-char const     *plugin_service_get_id (const GOPluginService *service);
-char const     *plugin_service_get_description (GOPluginService *service);
-GOPlugin      *plugin_service_get_plugin (GOPluginService *service);
-gpointer	plugin_service_get_cbs (GOPluginService *service);
-void		plugin_service_activate (GOPluginService *service, GOErrorInfo **ret_error);
-void		plugin_service_deactivate (GOPluginService *service, GOErrorInfo **ret_error);
-void		plugin_service_load   (GOPluginService *service, GOErrorInfo **ret_error);
-void		plugin_service_unload (GOPluginService *service, GOErrorInfo **ret_error);
+GOPluginService  *go_plugin_service_new (GOPlugin *plugin, xmlNode *tree, GOErrorInfo **ret_error);
+char const     *go_plugin_service_get_id (const GOPluginService *service);
+char const     *go_plugin_service_get_description (GOPluginService *service);
+GOPlugin      *go_plugin_service_get_plugin (GOPluginService *service);
+gpointer	go_plugin_service_get_cbs (GOPluginService *service);
+void		go_plugin_service_activate (GOPluginService *service, GOErrorInfo **ret_error);
+void		go_plugin_service_deactivate (GOPluginService *service, GOErrorInfo **ret_error);
+void		go_plugin_service_load   (GOPluginService *service, GOErrorInfo **ret_error);
+void		go_plugin_service_unload (GOPluginService *service, GOErrorInfo **ret_error);
 
 typedef GType (*GOPluginServiceCreate) (void);
-void plugin_services_init     (void);
-void plugin_services_shutdown (void);
-void plugin_service_define    (char const *type_str,
+void go_plugin_services_init     (void);
+void go_plugin_services_shutdown (void);
+void go_plugin_service_define    (char const *type_str,
 			       GOPluginServiceCreate ctor);
 
 G_END_DECLS
diff --git a/goffice/app/go-plugin.c b/goffice/app/go-plugin.c
index cd8b405..27f7677 100644
--- a/goffice/app/go-plugin.c
+++ b/goffice/app/go-plugin.c
@@ -578,7 +578,7 @@ get_loader_type_by_id (gchar const *id_str, GOErrorInfo **ret_error)
 		             id_str);
 		return G_TYPE_NONE;
 	}
-	loader_type = plugin_service_plugin_loader_generate_type (
+	loader_type = go_plugin_service_plugin_loader_generate_type (
 	              loader_service, &error);
 	if (error != NULL) {
 		*ret_error = go_error_info_new_printf (
@@ -651,7 +651,7 @@ go_plugin_read_service_list (GOPlugin *plugin, xmlNode *tree, GOErrorInfo **ret_
 			GOPluginService *service;
 			GOErrorInfo *service_error;
 
-			service = plugin_service_new (plugin, node, &service_error);
+			service = go_plugin_service_new (plugin, node, &service_error);
 
 			if (service != NULL) {
 				g_assert (service_error == NULL);
@@ -973,7 +973,7 @@ go_plugin_activate (GOPlugin *plugin, GOErrorInfo **ret_error)
 		GOPluginService *service = l->data;
 		GOErrorInfo *service_error;
 
-		plugin_service_activate (service, &service_error);
+		go_plugin_service_activate (service, &service_error);
 		if (service_error != NULL) {
 			GOErrorInfo *error;
 
@@ -1026,7 +1026,7 @@ go_plugin_deactivate (GOPlugin *plugin, GOErrorInfo **ret_error)
 		GOPluginService *service = l->data;
 		GOErrorInfo *service_error;
 
-		plugin_service_deactivate (service, &service_error);
+		go_plugin_service_deactivate (service, &service_error);
 		if (service_error != NULL) {
 			GOErrorInfo *error;
 
diff --git a/goffice/component/go-component-factory.c b/goffice/component/go-component-factory.c
index d6e6d5f..1660a32 100644
--- a/goffice/component/go-component-factory.c
+++ b/goffice/component/go-component-factory.c
@@ -43,8 +43,8 @@ static GSList *refd_plugins = NULL;
 
 static GType go_component_engine_service_get_type (void);
 
-typedef PluginServiceGObjectLoader GOComponentEngineService;
-typedef PluginServiceGObjectLoaderClass GOComponentEngineServiceClass;
+typedef GOPluginServiceGObjectLoader GOComponentEngineService;
+typedef GOPluginServiceGObjectLoaderClass GOComponentEngineServiceClass;
 
 static GHashTable *pending_engines = NULL;
 static GHashTable *mime_types = NULL;
@@ -59,7 +59,7 @@ go_component_engine_service_get_description (GOPluginService * service)
 }
 
 static void
-go_component_engine_service_class_init (PluginServiceGObjectLoaderClass *
+go_component_engine_service_class_init (GOPluginServiceGObjectLoaderClass *
 					gobj_loader_class)
 {
 	GOPluginServiceClass *ps_class = GPS_CLASS (gobj_loader_class);
@@ -83,12 +83,12 @@ GType go_component_type_service_get_type (void);
 
 typedef struct
 {
-	PluginServiceSimple base;
+	GOPluginServiceSimple base;
 
 	GSList *mime_types;
 } GOComponentTypeService;
 
-typedef PluginServiceSimpleClass GOComponentTypeServiceClass;
+typedef GOPluginServiceSimpleClass GOComponentTypeServiceClass;
 
 static GObjectClass *component_type_parent_klass;
 char const *GOPriorityName[] = {
@@ -207,9 +207,9 @@ GSF_CLASS (GOComponentTypeService, go_component_type_service,
 /***************************************************************************/
      void goc_plugin_services_init (void)
 {
-	plugin_service_define ("component_engine",
+	go_plugin_service_define ("component_engine",
 			       &go_component_engine_service_get_type);
-	plugin_service_define ("component_type",
+	go_plugin_service_define ("component_type",
 			       &go_component_type_service_get_type);
 }
 
@@ -303,7 +303,7 @@ go_component_new_by_mime_type (char const *mime_type)
 
 		g_return_val_if_fail (!service->is_loaded, NULL);
 
-		plugin_service_load (service, &err);
+		go_plugin_service_load (service, &err);
 		type = g_type_from_name (mtype->component_type_name);
 
 		if (err != NULL)
@@ -317,7 +317,7 @@ go_component_new_by_mime_type (char const *mime_type)
 		/*
 		 * The plugin defined a gtype so it must not be unloaded.
 		 */
-		plugin = plugin_service_get_plugin (service);
+		plugin = go_plugin_service_get_plugin (service);
 		refd_plugins = g_slist_prepend (refd_plugins, plugin);
 		g_object_ref (plugin);
 		go_plugin_use_ref (plugin);
diff --git a/goffice/goffice.c b/goffice/goffice.c
index ee8709d..3d014fb 100644
--- a/goffice/goffice.c
+++ b/goffice/goffice.c
@@ -128,7 +128,7 @@ libgoffice_init (void)
 	gsf_init ();
 
 	/* keep trigger happy linkers from leaving things out */
-	plugin_services_init ();
+	go_plugin_services_init ();
 	gog_plugin_services_init ();
 #ifdef GOFFICE_WITH_GTK
 	goc_plugin_services_init ();
diff --git a/goffice/graph/gog-plot-engine.c b/goffice/graph/gog-plot-engine.c
index eb020b9..291048f 100644
--- a/goffice/graph/gog-plot-engine.c
+++ b/goffice/graph/gog-plot-engine.c
@@ -45,8 +45,8 @@ static GSList *refd_plugins;
 
 static GType gog_plot_engine_service_get_type (void);
 
-typedef PluginServiceGObjectLoader	GogPlotEngineService;
-typedef PluginServiceGObjectLoaderClass GogPlotEngineServiceClass;
+typedef GOPluginServiceGObjectLoader	GogPlotEngineService;
+typedef GOPluginServiceGObjectLoaderClass GogPlotEngineServiceClass;
 
 static GHashTable *pending_engines = NULL;
 
@@ -57,7 +57,7 @@ gog_plot_engine_service_get_description (GOPluginService *service)
 }
 
 static void
-gog_plot_engine_service_class_init (PluginServiceGObjectLoaderClass *gobj_loader_class)
+gog_plot_engine_service_class_init (GOPluginServiceGObjectLoaderClass *gobj_loader_class)
 {
 	GOPluginServiceClass *ps_class = GPS_CLASS (gobj_loader_class);
 
@@ -89,7 +89,7 @@ gog_plot_new_by_name (char const *id)
 
 		g_return_val_if_fail (!service->is_loaded, NULL);
 
-		plugin_service_load (service, &err);
+		go_plugin_service_load (service, &err);
 		type = g_type_from_name (id);
 
 		if (err != NULL) {
@@ -102,7 +102,7 @@ gog_plot_new_by_name (char const *id)
 		/*
 		 * The plugin defined a gtype so it must not be unloaded.
 		 */
-		plugin = plugin_service_get_plugin (service);
+		plugin = go_plugin_service_get_plugin (service);
 		refd_plugins = g_slist_prepend (refd_plugins, plugin);
 		g_object_ref (plugin);
 		go_plugin_use_ref (plugin);
@@ -121,13 +121,13 @@ gog_plot_new_by_name (char const *id)
 GType gog_plot_type_service_get_type (void);
 
 typedef struct {
-	PluginServiceSimple	base;
+	GOPluginServiceSimple	base;
 
 	GSList	*families, *types, *paths;
 } GogPlotTypeService;
 
 typedef struct{
-	PluginServiceSimpleClass	base;
+	GOPluginServiceSimpleClass	base;
 } GogPlotTypeServiceClass;
 
 static GHashTable *pending_plot_type_files = NULL;
@@ -241,7 +241,7 @@ gog_plot_type_service_read_xml (GOPluginService *service, xmlNode *tree, GOError
 		    NULL != (path = xmlNodeGetContent (ptr))) {
 			if (!g_path_is_absolute (path)) {
 				char const *dir = go_plugin_get_dir_name (
-					plugin_service_get_plugin (service));
+					go_plugin_service_get_plugin (service));
 				char *tmp = g_build_filename (dir, path, NULL);
 				g_free (path);
 				path = tmp;
@@ -362,8 +362,8 @@ GSF_CLASS (GogPlotTypeService, gog_plot_type_service,
 
 GType gog_theme_service_get_type (void);
 
-typedef PluginServiceSimple GogThemeService;
-typedef PluginServiceSimpleClass GogThemeServiceClass;
+typedef GOPluginServiceSimple GogThemeService;
+typedef GOPluginServiceSimpleClass GogThemeServiceClass;
 
 static void
 gog_theme_service_read_xml (GOPluginService *service, xmlNode *tree, GOErrorInfo **ret_error)
@@ -377,12 +377,12 @@ gog_theme_service_read_xml (GOPluginService *service, xmlNode *tree, GOErrorInfo
 		    NULL != (path = xmlNodeGetContent (ptr))) {
 			if (!g_path_is_absolute (path)) {
 				char const *dir = go_plugin_get_dir_name (
-					plugin_service_get_plugin (service));
+					go_plugin_service_get_plugin (service));
 				char *tmp = g_build_filename (dir, path, NULL);
 				g_free (path);
 				path = tmp;
 			}
-			theme = gog_theme_new_from_file (plugin_service_get_description (service),
+			theme = gog_theme_new_from_file (go_plugin_service_get_description (service),
 							 path);
 			gog_theme_registry_add (theme, FALSE);	
 		}
@@ -414,8 +414,8 @@ GSF_CLASS (GogThemeService, gog_theme_service,
 
 static GType gog_trend_line_engine_service_get_type (void);
 
-typedef PluginServiceGObjectLoader	GogTrendLineEngineService;
-typedef PluginServiceGObjectLoaderClass GogTrendLineEngineServiceClass;
+typedef GOPluginServiceGObjectLoader	GogTrendLineEngineService;
+typedef GOPluginServiceGObjectLoaderClass GogTrendLineEngineServiceClass;
 
 static GHashTable *pending_trend_lines_engines = NULL;
 
@@ -426,7 +426,7 @@ gog_trend_line_engine_service_get_description (GOPluginService *service)
 }
 
 static void
-gog_trend_line_engine_service_class_init (PluginServiceGObjectLoaderClass *gobj_loader_class)
+gog_trend_line_engine_service_class_init (GOPluginServiceGObjectLoaderClass *gobj_loader_class)
 {
 	GOPluginServiceClass *ps_class = GPS_CLASS (gobj_loader_class);
 
@@ -458,7 +458,7 @@ gog_trend_line_new_by_name (char const *id)
 
 		g_return_val_if_fail (!service->is_loaded, NULL);
 
-		plugin_service_load (service, &err);
+		go_plugin_service_load (service, &err);
 		type = g_type_from_name (id);
 
 		if (err != NULL) {
@@ -471,7 +471,7 @@ gog_trend_line_new_by_name (char const *id)
 		/*
 		 * The plugin defined a gtype so it must not be unloaded.
 		 */
-		plugin = plugin_service_get_plugin (service);
+		plugin = go_plugin_service_get_plugin (service);
 		refd_plugins = g_slist_prepend (refd_plugins, plugin);
 		g_object_ref (plugin);
 		go_plugin_use_ref (plugin);
@@ -489,11 +489,11 @@ gog_trend_line_new_by_name (char const *id)
 GType gog_trend_line_service_get_type (void);
 
 typedef struct {
-	PluginServiceSimple	base;
+	GOPluginServiceSimple	base;
 
 	GSList	*types, *paths;
 } GogTrendLineService;
-typedef PluginServiceSimpleClass GogTrendLineServiceClass;
+typedef GOPluginServiceSimpleClass GogTrendLineServiceClass;
 
 static GHashTable *pending_trend_line_type_files = NULL;
 static GHashTable *trend_line_types = NULL;
@@ -562,7 +562,7 @@ gog_trend_line_service_read_xml (GOPluginService *service, xmlNode *tree, GOErro
 		    NULL != (path = xmlNodeGetContent (ptr))) {
 			if (!g_path_is_absolute (path)) {
 				char const *dir = go_plugin_get_dir_name (
-					plugin_service_get_plugin (service));
+					go_plugin_service_get_plugin (service));
 				char *tmp = g_build_filename (dir, path, NULL);
 				g_free (path);
 				path = tmp;
@@ -663,11 +663,11 @@ GSF_CLASS (GogTrendLineService, gog_trend_line_service,
 void
 gog_plugin_services_init (void)
 {
-	plugin_service_define ("plot_engine", &gog_plot_engine_service_get_type);
-	plugin_service_define ("plot_type",   &gog_plot_type_service_get_type);
-	plugin_service_define ("chart_theme",  &gog_theme_service_get_type);
-	plugin_service_define ("trendline_engine", &gog_trend_line_engine_service_get_type);
-	plugin_service_define ("trendline_type", &gog_trend_line_service_get_type);
+	go_plugin_service_define ("plot_engine", &gog_plot_engine_service_get_type);
+	go_plugin_service_define ("plot_type",   &gog_plot_type_service_get_type);
+	go_plugin_service_define ("chart_theme",  &gog_theme_service_get_type);
+	go_plugin_service_define ("trendline_engine", &gog_trend_line_engine_service_get_type);
+	go_plugin_service_define ("trendline_type", &gog_trend_line_service_get_type);
 }
 
 void
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]