GNOME.org
 

[goffice] Compilation: grand renaming, part 5.

commit 937e5c0c384cc88fef1d0922d65c62bd2c19c55b
Author: Morten Welinder <terra gnome org>
Date:   Sun Aug 23 19:49:30 2009 -0400

    Compilation: grand renaming, part 5.

 NEWS                                     |    3 ++
 docs/reference/tmpl/gog-plot-engine.sgml |   14 ---------
 docs/reference/tmpl/gog-theme.sgml       |   14 ---------
 goffice/app/go-conf-gconf.c              |    4 +-
 goffice/app/go-conf-keyfile.c            |    4 +-
 goffice/app/go-conf-win32.c              |    4 +-
 goffice/app/go-conf.h                    |    4 +-
 goffice/app/go-plugin-service.c          |   34 ++++++++++----------
 goffice/app/go-plugin-service.h          |    2 +-
 goffice/app/go-plugin.c                  |   16 +++++-----
 goffice/component/go-component-factory.c |    4 +-
 goffice/component/go-component-factory.h |    4 +-
 goffice/goffice.c                        |   33 ++++++++++----------
 goffice/graph/gog-plot-engine.c          |   10 +++---
 goffice/graph/gog-plot-engine.h          |    4 +-
 goffice/graph/gog-theme.c                |    4 +-
 goffice/graph/gog-theme.h                |    4 +-
 goffice/gtk/go-format-sel.c              |    8 ++--
 goffice/math/go-distribution.c           |    2 +-
 goffice/math/go-distribution.h           |    2 +-
 goffice/math/go-math.c                   |    2 +-
 goffice/math/go-math.h                   |    2 +-
 goffice/utils/formats.c                  |    4 +-
 goffice/utils/go-format.c                |    4 +-
 goffice/utils/go-format.h                |    8 ++--
 goffice/utils/go-libxml-extras.c         |   48 +++++++++++++++---------------
 goffice/utils/go-libxml-extras.h         |   32 ++++++++++----------
 goffice/utils/go-pattern.c               |    4 +-
 28 files changed, 127 insertions(+), 151 deletions(-)
---
diff --git a/NEWS b/NEWS
index c2fb811..efa52b9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 goffice 0.7.10:
 
+Jean:
+	* Canvas improvements.
+
 Morten:
 	* Namespace issues.  [#592283]
 
diff --git a/docs/reference/tmpl/gog-plot-engine.sgml b/docs/reference/tmpl/gog-plot-engine.sgml
index 04f3adc..bddc2dd 100644
--- a/docs/reference/tmpl/gog-plot-engine.sgml
+++ b/docs/reference/tmpl/gog-plot-engine.sgml
@@ -112,17 +112,3 @@ Plot and regression curve plugin management
 @Returns: 
 
 
-<!-- ##### FUNCTION gog_plugin_services_init ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION gog_plugin_services_shutdown ##### -->
-<para>
-
-</para>
-
-
-
diff --git a/docs/reference/tmpl/gog-theme.sgml b/docs/reference/tmpl/gog-theme.sgml
index ed72a00..9a66853 100644
--- a/docs/reference/tmpl/gog-theme.sgml
+++ b/docs/reference/tmpl/gog-theme.sgml
@@ -83,17 +83,3 @@ Graph theme management
 @Returns: 
 
 
-<!-- ##### FUNCTION gog_themes_init ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION gog_themes_shutdown ##### -->
-<para>
-
-</para>
-
-
-
diff --git a/goffice/app/go-conf-gconf.c b/goffice/app/go-conf-gconf.c
index 2651106..add1746 100644
--- a/goffice/app/go-conf-gconf.c
+++ b/goffice/app/go-conf-gconf.c
@@ -10,14 +10,14 @@ struct _GOConfNode {
 static GConfClient *gconf_client = NULL;
 
 void
-go_conf_init (void)
+_go_conf_init (void)
 {
 	if (!gconf_client)
 		gconf_client = gconf_client_get_default ();
 }
 
 void
-go_conf_shutdown (void)
+_go_conf_shutdown (void)
 {
 	if (gconf_client) {
 		g_object_unref (G_OBJECT (gconf_client));
diff --git a/goffice/app/go-conf-keyfile.c b/goffice/app/go-conf-keyfile.c
index 1e025b3..8ef7f0f 100644
--- a/goffice/app/go-conf-keyfile.c
+++ b/goffice/app/go-conf-keyfile.c
@@ -59,13 +59,13 @@ go_conf_get_real_key (GOConfNode const *key, gchar const *subkey)
 }
 
 void
-go_conf_init (void)
+_go_conf_init (void)
 {
 	key_files = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_key_file_free);
 }
 
 void
-go_conf_shutdown (void)
+_go_conf_shutdown (void)
 {
 	if (!key_files)
 		return;
diff --git a/goffice/app/go-conf-win32.c b/goffice/app/go-conf-win32.c
index c046469..7cdb333 100644
--- a/goffice/app/go-conf-win32.c
+++ b/goffice/app/go-conf-win32.c
@@ -13,12 +13,12 @@ struct _GOConfNode {
 };
 
 void
-go_conf_init (void)
+_go_conf_init (void)
 {
 }
 
 void
-go_conf_shutdown (void)
+_go_conf_shutdown (void)
 {
 }
 
diff --git a/goffice/app/go-conf.h b/goffice/app/go-conf.h
index 9fd9984..0e566ac 100644
--- a/goffice/app/go-conf.h
+++ b/goffice/app/go-conf.h
@@ -8,8 +8,8 @@ G_BEGIN_DECLS
 
 typedef struct _GOConfNode GOConfNode;
 
-void go_conf_init (void);
-void go_conf_shutdown (void);
+void _go_conf_init (void);
+void _go_conf_shutdown (void);
 
 GOConfNode * go_conf_get_node       (GOConfNode *parent, gchar const *key);
 void	 go_conf_free_node	    (GOConfNode *node);
diff --git a/goffice/app/go-plugin-service.c b/goffice/app/go-plugin-service.c
index 2489e11..4aa6e4d 100644
--- a/goffice/app/go-plugin-service.c
+++ b/goffice/app/go-plugin-service.c
@@ -261,20 +261,20 @@ go_plugin_service_file_opener_read_xml (GOPluginService *service, xmlNode *tree,
 	gchar *description;
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
-	if (xml_node_get_int (tree, "priority", &priority))
+	if (go_xml_node_get_int (tree, "priority", &priority))
 		priority = CLAMP (priority, 0, 100);
 	else
 		priority = 50;
 
-	if (!xml_node_get_bool (tree, "probe", &has_probe))
+	if (!go_xml_node_get_bool (tree, "probe", &has_probe))
 		has_probe = TRUE;
 
-	information_node = e_xml_get_child_by_name (tree, (xmlChar *)"information");
+	information_node = go_xml_get_child_by_name (tree, (xmlChar *)"information");
 	if (information_node != NULL) {
 		xmlNode *node;
 		xmlChar *val;
 
-		node = e_xml_get_child_by_name_by_lang (
+		node = go_xml_get_child_by_name_by_lang (
 		       information_node, "description");
 		if (node != NULL) {
 			val = xmlNodeGetContent (node);
@@ -292,7 +292,7 @@ go_plugin_service_file_opener_read_xml (GOPluginService *service, xmlNode *tree,
 		xmlNode *list, *node;
 		GOPluginServiceFileOpener *service_file_opener = GO_PLUGIN_SERVICE_FILE_OPENER (service);
 
-		list = e_xml_get_child_by_name (tree, (xmlChar *)"suffixes");
+		list = go_xml_get_child_by_name (tree, (xmlChar *)"suffixes");
 		if (list != NULL) {
 			for (node = list->xmlChildrenNode; node != NULL; node = node->next)
 				if (strcmp (node->name, "suffix") == 0 &&
@@ -301,7 +301,7 @@ go_plugin_service_file_opener_read_xml (GOPluginService *service, xmlNode *tree,
 		}
 		GO_SLIST_REVERSE (suffixes);
 
-		list = e_xml_get_child_by_name (tree, (xmlChar *)"mime-types");
+		list = go_xml_get_child_by_name (tree, (xmlChar *)"mime-types");
 		if (list != NULL) {
 			for (node = list->xmlChildrenNode; node != NULL; node = node->next)
 				if (strcmp (node->name, "mime-type") == 0 &&
@@ -590,12 +590,12 @@ go_plugin_service_file_saver_read_xml (GOPluginService *service, xmlNode *tree,
 	gchar *description;
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
-	information_node = e_xml_get_child_by_name (tree, (xmlChar *)"information");
+	information_node = go_xml_get_child_by_name (tree, (xmlChar *)"information");
 	if (information_node != NULL) {
 		xmlNode *node;
 		xmlChar *val;
 
-		node = e_xml_get_child_by_name_by_lang (
+		node = go_xml_get_child_by_name_by_lang (
 		       information_node, "description");
 		if (node != NULL) {
 			val = xmlNodeGetContent (node);
@@ -615,28 +615,28 @@ go_plugin_service_file_saver_read_xml (GOPluginService *service, xmlNode *tree,
 		GOPluginServiceFileSaver *psfs =
 			GO_PLUGIN_SERVICE_FILE_SAVER (service);
 
-		s = xml_node_get_cstr (tree, "file_extension");
+		s = go_xml_node_get_cstr (tree, "file_extension");
 		psfs->file_extension = g_strdup (CXML2C (s));
 		xmlFree (s);
 
-		s = xml_node_get_cstr (tree, "mime_type");
+		s = go_xml_node_get_cstr (tree, "mime_type");
 		psfs->mime_type = g_strdup (CXML2C (s));
 		xmlFree (s);
 
 		psfs->description = description;
 
-		(void)xml_node_get_enum (tree, "format_level",
+		(void)go_xml_node_get_enum (tree, "format_level",
 					 GO_TYPE_FILE_SAVER_LEVEL, &level);
 		psfs->format_level = (GOFileFormatLevel)level;
 
-		if (!xml_node_get_int (tree, "default_saver_priority", &(psfs->default_saver_priority)))
+		if (!go_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",
+		(void)go_xml_node_get_enum (tree, "save_scope",
 					 GO_TYPE_FILE_SAVER_SCOPE, &scope);
 		psfs->save_scope = (GOFileSaveScope)scope;
 
-		if (!xml_node_get_bool (tree, "overwrite_files", &(psfs->overwrite_files)))
+		if (!go_xml_node_get_bool (tree, "overwrite_files", &(psfs->overwrite_files)))
 			psfs->overwrite_files = TRUE;
 	} else {
 		*ret_error = go_error_info_new_str (_("File saver has no description"));
@@ -999,7 +999,7 @@ go_plugin_service_new (GOPlugin *plugin, xmlNode *tree, GOErrorInfo **ret_error)
 	g_return_val_if_fail (strcmp (tree->name, "service") == 0, NULL);
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
-	type_str = xml_node_get_cstr (tree, "type");
+	type_str = go_xml_node_get_cstr (tree, "type");
 	if (type_str == NULL) {
 		*ret_error = go_error_info_new_str (_("No \"type\" attribute on \"service\" element."));
 		return NULL;
@@ -1015,7 +1015,7 @@ go_plugin_service_new (GOPlugin *plugin, xmlNode *tree, GOErrorInfo **ret_error)
 
 	service = g_object_new (ctor(), NULL);
 	service->plugin = plugin;
-	service->id = xml_node_get_cstr (tree, "id");
+	service->id = go_xml_node_get_cstr (tree, "id");
 	if (service->id == NULL)
 		service->id = g_strdup ("default");
 
@@ -1117,7 +1117,7 @@ go_plugin_service_deactivate (GOPluginService *service, GOErrorInfo **ret_error)
 /*****************************************************************************/
 
 void
-go_plugin_services_init (void)
+_go_plugin_services_init (void)
 {
 	static struct {
 		char const *type_str;
diff --git a/goffice/app/go-plugin-service.h b/goffice/app/go-plugin-service.h
index 0403ffa..48b30dc 100644
--- a/goffice/app/go-plugin-service.h
+++ b/goffice/app/go-plugin-service.h
@@ -102,7 +102,7 @@ void		go_plugin_service_load   (GOPluginService *service, GOErrorInfo **ret_erro
 void		go_plugin_service_unload (GOPluginService *service, GOErrorInfo **ret_error);
 
 typedef GType (*GOPluginServiceCreate) (void);
-void go_plugin_services_init     (void);
+void _go_plugin_services_init     (void);
 void go_plugin_services_shutdown (void);
 void go_plugin_service_define    (char const *type_str,
 			       GOPluginServiceCreate ctor);
diff --git a/goffice/app/go-plugin.c b/goffice/app/go-plugin.c
index 27f7677..008a3aa 100644
--- a/goffice/app/go-plugin.c
+++ b/goffice/app/go-plugin.c
@@ -621,7 +621,7 @@ go_plugin_read_dependency_list (xmlNode *tree)
 				dep = g_new (PluginDependency, 1);
 				dep->plugin_id = plugin_id;
 				dep->plugin = NULL;
-				if (!xml_node_get_bool (node, "force_load", &(dep->force_load)))
+				if (!go_xml_node_get_bool (node, "force_load", &(dep->force_load)))
 					dep->force_load = FALSE;
 				GO_SLIST_PREPEND (dependency_list, dep);
 			}
@@ -642,7 +642,7 @@ go_plugin_read_service_list (GOPlugin *plugin, xmlNode *tree, GOErrorInfo **ret_
 	g_return_val_if_fail (tree != NULL, NULL);
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
-	node = e_xml_get_child_by_name (tree, (xmlChar *)"services");
+	node = go_xml_get_child_by_name (tree, (xmlChar *)"services");
 	if (node == NULL)
 		return NULL;
 	node = node->xmlChildrenNode;
@@ -754,12 +754,12 @@ go_plugin_read (GOPlugin *plugin, gchar const *dir_name, GOErrorInfo **ret_error
 	}
 	tree = doc->xmlRootNode;
 	id = xmlGetProp (tree, (xmlChar *)"id");
-	information_node = e_xml_get_child_by_name (tree, (xmlChar *)"information");
+	information_node = go_xml_get_child_by_name (tree, (xmlChar *)"information");
 	if (information_node != NULL) {
 		xmlNode *node;
 		xmlChar *val;
 
-		node = e_xml_get_child_by_name_by_lang (information_node, "name");
+		node = go_xml_get_child_by_name_by_lang (information_node, "name");
 		if (node != NULL) {
 			val = xmlNodeGetContent (node);
 			name = g_strdup ((gchar *)val);
@@ -767,26 +767,26 @@ go_plugin_read (GOPlugin *plugin, gchar const *dir_name, GOErrorInfo **ret_error
 		} else
 			name = NULL;
 
-		node = e_xml_get_child_by_name_by_lang (information_node, "description");
+		node = go_xml_get_child_by_name_by_lang (information_node, "description");
 		if (node != NULL) {
 			val = xmlNodeGetContent (node);
 			description = g_strdup ((gchar *)val);
 			xmlFree (val);
 		} else
 			description = NULL;
-		if (e_xml_get_child_by_name (information_node, (xmlChar const *)"require_explicit_enabling"))
+		if (go_xml_get_child_by_name (information_node, (xmlChar const *)"require_explicit_enabling"))
 			require_explicit_enabling = TRUE;
 	} else {
 		name = NULL;
 		description = NULL;
 	}
-	dependencies_node = e_xml_get_child_by_name (tree, (xmlChar *)"dependencies");
+	dependencies_node = go_xml_get_child_by_name (tree, (xmlChar *)"dependencies");
 	if (dependencies_node != NULL) {
 		dependency_list = go_plugin_read_dependency_list (dependencies_node);
 	} else {
 		dependency_list = NULL;
 	}
-	loader_node = e_xml_get_child_by_name (tree, (xmlChar *)"loader");
+	loader_node = go_xml_get_child_by_name (tree, (xmlChar *)"loader");
 	if (loader_node != NULL) {
 		char *p;
 
diff --git a/goffice/component/go-component-factory.c b/goffice/component/go-component-factory.c
index 1660a32..e9a9b51 100644
--- a/goffice/component/go-component-factory.c
+++ b/goffice/component/go-component-factory.c
@@ -205,7 +205,7 @@ GSF_CLASS (GOComponentTypeService, go_component_type_service,
 	   go_component_type_service_class_init,
 	   go_component_type_service_init, GO_TYPE_PLUGIN_SERVICE_SIMPLE)
 /***************************************************************************/
-     void goc_plugin_services_init (void)
+     void _goc_plugin_services_init (void)
 {
 	go_plugin_service_define ("component_engine",
 			       &go_component_engine_service_get_type);
@@ -214,7 +214,7 @@ GSF_CLASS (GOComponentTypeService, go_component_type_service,
 }
 
 void
-goc_plugin_services_shutdown (void)
+_goc_plugin_services_shutdown (void)
 {
 	g_slist_foreach (refd_plugins, (GFunc) go_plugin_use_unref, NULL);
 	g_slist_foreach (refd_plugins, (GFunc) g_object_unref, NULL);
diff --git a/goffice/component/go-component-factory.h b/goffice/component/go-component-factory.h
index 094dc14..549a1d6 100644
--- a/goffice/component/go-component-factory.h
+++ b/goffice/component/go-component-factory.h
@@ -48,8 +48,8 @@ void go_components_add_mime_type (char *mime, GOMimePriority priority, char cons
 void go_components_set_mime_suffix (char const *mime, char const *suffix);
 char const *go_components_get_mime_suffix (char const *mime);
 
-void goc_plugin_services_init (void);
-void goc_plugin_services_shutdown (void);
+void _goc_plugin_services_init (void);
+void _goc_plugin_services_shutdown (void);
 
 G_END_DECLS
 
diff --git a/goffice/goffice.c b/goffice/goffice.c
index aa7082a..7700cc0 100644
--- a/goffice/goffice.c
+++ b/goffice/goffice.c
@@ -121,17 +121,18 @@ libgoffice_init (void)
 	bindtextdomain (GETTEXT_PACKAGE, libgoffice_locale_dir);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	g_type_init ();
+	gsf_init ();
+
 	_go_string_init ();
-	go_conf_init ();
+	_go_conf_init ();
 	_go_fonts_init ();
-	go_math_init ();
-	gsf_init ();
+	_go_math_init ();
 
 	/* keep trigger happy linkers from leaving things out */
-	go_plugin_services_init ();
-	gog_plugin_services_init ();
+	_go_plugin_services_init ();
+	_gog_plugin_services_init ();
 #ifdef GOFFICE_WITH_GTK
-	goc_plugin_services_init ();
+	_goc_plugin_services_init ();
 #endif
 	(void) GOG_TYPE_GRAPH;
 	(void) GOG_TYPE_CHART;
@@ -153,25 +154,25 @@ libgoffice_init (void)
 	(void) GO_TYPE_DATA_SCALAR_VAL;
 	(void) GO_TYPE_DATA_SCALAR_STR;
 	(void) GOG_3D_BOX_TYPE;
-	gog_themes_init	();
-	go_number_format_init ();
-	go_currency_date_format_init ();
-	go_distributions_init ();
+	_gog_themes_init ();
+	_go_number_format_init ();
+	_go_currency_date_format_init ();
+	_go_distributions_init ();
 	initialized = TRUE;
 }
 
 void
 libgoffice_shutdown (void)
 {
-	gog_themes_shutdown ();
+	_gog_themes_shutdown ();
 	_go_fonts_shutdown ();
-	go_conf_shutdown ();
+	_go_conf_shutdown ();
 #ifdef GOFFICE_WITH_GTK
-	goc_plugin_services_shutdown ();
+	_goc_plugin_services_shutdown ();
 #endif
-	gog_plugin_services_shutdown ();
-	go_currency_date_format_shutdown ();
-	go_number_format_shutdown ();
+	_gog_plugin_services_shutdown ();
+	_go_currency_date_format_shutdown ();
+	_go_number_format_shutdown ();
 	_go_string_shutdown ();
 #ifdef G_OS_WIN32
 	/* const_cast, we created these above */
diff --git a/goffice/graph/gog-plot-engine.c b/goffice/graph/gog-plot-engine.c
index 291048f..a2f29c9 100644
--- a/goffice/graph/gog-plot-engine.c
+++ b/goffice/graph/gog-plot-engine.c
@@ -154,7 +154,7 @@ cb_pending_plot_types_load (char const *path,
 		if (!xmlIsBlankNode (ptr) && ptr->name && !strcmp (ptr->name, "Family")) {
 			name	    = xmlGetProp (ptr, "_name");
 			image_file  = xmlGetProp (ptr, "sample_image_file");
-			if (!xml_node_get_int (ptr, "priority", &priority))
+			if (!go_xml_node_get_int (ptr, "priority", &priority))
 				priority = 0;
 			axis_set_str = xmlGetProp (ptr, "axis_set");
 			axis_set = gog_axis_set_from_str (axis_set_str);
@@ -183,8 +183,8 @@ cb_pending_plot_types_load (char const *path,
 			image_file  = xmlGetProp (ptr, "sample_image_file");
 			description = xmlGetProp (ptr, "_description");
 			engine	    = xmlGetProp (ptr, "engine");
-			if (xml_node_get_int (ptr, "col", &col) &&
-			    xml_node_get_int (ptr, "row", &row)) {
+			if (go_xml_node_get_int (ptr, "col", &col) &&
+			    go_xml_node_get_int (ptr, "row", &row)) {
 				type = gog_plot_type_register (family, col, row,
 					name, image_file, description, engine);
 				if (type != NULL) {
@@ -661,7 +661,7 @@ GSF_CLASS (GogTrendLineService, gog_trend_line_service,
 /***************************************************************************/
 
 void
-gog_plugin_services_init (void)
+_gog_plugin_services_init (void)
 {
 	go_plugin_service_define ("plot_engine", &gog_plot_engine_service_get_type);
 	go_plugin_service_define ("plot_type",   &gog_plot_type_service_get_type);
@@ -671,7 +671,7 @@ gog_plugin_services_init (void)
 }
 
 void
-gog_plugin_services_shutdown (void)
+_gog_plugin_services_shutdown (void)
 {
 	g_slist_foreach (refd_plugins, (GFunc)go_plugin_use_unref, NULL);
 	g_slist_foreach (refd_plugins, (GFunc)g_object_unref, NULL);
diff --git a/goffice/graph/gog-plot-engine.h b/goffice/graph/gog-plot-engine.h
index 7529738..dae0fb8 100644
--- a/goffice/graph/gog-plot-engine.h
+++ b/goffice/graph/gog-plot-engine.h
@@ -66,8 +66,8 @@ struct _GogTrendLineType {
 
 GHashTable const *gog_trend_line_types (void);
 
-void gog_plugin_services_init (void);
-void gog_plugin_services_shutdown (void);
+void _gog_plugin_services_init (void);
+void _gog_plugin_services_shutdown (void);
 
 G_END_DECLS
 
diff --git a/goffice/graph/gog-theme.c b/goffice/graph/gog-theme.c
index 28d8a8d..64b8767 100644
--- a/goffice/graph/gog-theme.c
+++ b/goffice/graph/gog-theme.c
@@ -478,7 +478,7 @@ gog_theme_registry_get_theme_names (void)
 /**************************************************************************/
 
 void
-gog_themes_init	(void)
+_gog_themes_init (void)
 {
 	GogTheme *theme;
 	GOStyle *style;
@@ -758,7 +758,7 @@ gog_themes_init	(void)
 }
 
 void
-gog_themes_shutdown (void)
+_gog_themes_shutdown (void)
 {
 	GSList *ptr;
 
diff --git a/goffice/graph/gog-theme.h b/goffice/graph/gog-theme.h
index bdf882f..cf937ce 100644
--- a/goffice/graph/gog-theme.h
+++ b/goffice/graph/gog-theme.h
@@ -43,8 +43,8 @@ GogTheme   *gog_theme_registry_lookup 		(char const *name);
 GSList	   *gog_theme_registry_get_theme_names	(void);
 	
 /* private */
-void gog_themes_init	 (void);
-void gog_themes_shutdown (void);
+void _gog_themes_init	 (void);
+void _gog_themes_shutdown (void);
 
 G_END_DECLS
 
diff --git a/goffice/gtk/go-format-sel.c b/goffice/gtk/go-format-sel.c
index e1b85e5..f9885ed 100644
--- a/goffice/gtk/go-format-sel.c
+++ b/goffice/gtk/go-format-sel.c
@@ -36,20 +36,20 @@
 #define START_LOCALE_SWITCH							\
 	do {									\
 		if (gfs->locale) {						\
-			go_currency_date_format_shutdown ();			\
+			_go_currency_date_format_shutdown ();			\
 			oldlocale = g_strdup (setlocale (LC_ALL, NULL));	\
 			go_setlocale (LC_ALL, gfs->locale);			\
-			go_currency_date_format_init ();			\
+			_go_currency_date_format_init ();			\
 		}								\
 	} while (0)
 
 #define END_LOCALE_SWITCH							\
 	do {									\
 		if (oldlocale) {						\
-			go_currency_date_format_shutdown ();			\
+			_go_currency_date_format_shutdown ();			\
 			go_setlocale (LC_ALL, oldlocale);			\
 			g_free (oldlocale);					\
-			go_currency_date_format_init ();			\
+			_go_currency_date_format_init ();			\
 		}								\
 	} while (0)
 
diff --git a/goffice/math/go-distribution.c b/goffice/math/go-distribution.c
index 35572f2..72425be 100644
--- a/goffice/math/go-distribution.c
+++ b/goffice/math/go-distribution.c
@@ -860,7 +860,7 @@ go_distribution_get_distribution_name (GODistribution *dist)
 }
 
 void
-go_distributions_init ()
+_go_distributions_init (void)
 {
 	go_dist_normal_get_type ();
 	go_dist_uniform_get_type ();
diff --git a/goffice/math/go-distribution.h b/goffice/math/go-distribution.h
index dd3d98a..bc1ac4e 100644
--- a/goffice/math/go-distribution.h
+++ b/goffice/math/go-distribution.h
@@ -72,7 +72,7 @@ long double go_distribution_get_inverse_survivall (GODistribution *dist, long do
 
 void go_distribution_scale (GODistribution *dist, double location, double scale);
 
-void go_distributions_init (void);
+void _go_distributions_init (void);
 
 G_END_DECLS
 
diff --git a/goffice/math/go-math.c b/goffice/math/go-math.c
index ebe3758..39dce13 100644
--- a/goffice/math/go-math.c
+++ b/goffice/math/go-math.c
@@ -72,7 +72,7 @@ running_under_buggy_valgrind (void)
 #endif
 
 void
-go_math_init (void)
+_go_math_init (void)
 {
 	const char *bug_url = "http://bugzilla.gnome.org/enter_bug.cgi?product=libgoffice";;
 	char *old_locale;
diff --git a/goffice/math/go-math.h b/goffice/math/go-math.h
index 83ec3e0..b95e600 100644
--- a/goffice/math/go-math.h
+++ b/goffice/math/go-math.h
@@ -14,7 +14,7 @@ G_BEGIN_DECLS
 #define M_PI 3.14159265358979323846
 #endif
 
-void go_math_init (void);
+void _go_math_init (void);
 void go_continued_fraction (double val, int max_denom, int *res_num, int *res_denom);
 void go_stern_brocot	   (double val, int max_denom, int *res_num, int *res_denom);
 
diff --git a/goffice/utils/formats.c b/goffice/utils/formats.c
index c2954dc..b17c67f 100644
--- a/goffice/utils/formats.c
+++ b/goffice/utils/formats.c
@@ -194,7 +194,7 @@ guess_date_sep (void)
 }
 
 void
-go_currency_date_format_init (void)
+_go_currency_date_format_init (void)
 {
 	GOFormatCurrency const *currency = go_format_locale_currency ();
 	GHashTable *dt_hash;
@@ -313,7 +313,7 @@ go_currency_date_format_init (void)
 }
 
 void
-go_currency_date_format_shutdown (void)
+_go_currency_date_format_shutdown (void)
 {
 	/* We need to free allocated strings since */
 	/* currency_date_format_init/shutdown may  */
diff --git a/goffice/utils/go-format.c b/goffice/utils/go-format.c
index 27bb879..0d3f4fe 100644
--- a/goffice/utils/go-format.c
+++ b/goffice/utils/go-format.c
@@ -3561,7 +3561,7 @@ SUFFIX(go_format_value) (GOFormat const *fmt, DOUBLE val)
 
 #ifdef DEFINE_COMMON
 void
-go_number_format_init (void)
+_go_number_format_init (void)
 {
 	style_format_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
 		NULL, (GDestroyNotify) go_format_unref);
@@ -3585,7 +3585,7 @@ cb_format_leak (gpointer key, gpointer value, gpointer user_data)
 
 #ifdef DEFINE_COMMON
 void
-go_number_format_shutdown (void)
+_go_number_format_shutdown (void)
 {
 	GHashTable *tmp;
 
diff --git a/goffice/utils/go-format.h b/goffice/utils/go-format.h
index 24deed9..9f93e5e 100644
--- a/goffice/utils/go-format.h
+++ b/goffice/utils/go-format.h
@@ -235,10 +235,10 @@ GOFormatCurrency const *go_format_locale_currency (void);
 
 /*************************************************************************/
 
-void go_number_format_init (void);
-void go_number_format_shutdown (void);
-void go_currency_date_format_init     (void);
-void go_currency_date_format_shutdown (void);
+void _go_number_format_init (void);
+void _go_number_format_shutdown (void);
+void _go_currency_date_format_init     (void);
+void _go_currency_date_format_shutdown (void);
 
 G_END_DECLS
 
diff --git a/goffice/utils/go-libxml-extras.c b/goffice/utils/go-libxml-extras.c
index 2a3c54e..8b04b57 100644
--- a/goffice/utils/go-libxml-extras.c
+++ b/goffice/utils/go-libxml-extras.c
@@ -52,7 +52,7 @@ go_xml_parse_file (char const *filename)
  * result must be xmlFree
  */
 xmlChar *
-xml_node_get_cstr (xmlNodePtr node, char const *name)
+go_xml_node_get_cstr (xmlNodePtr node, char const *name)
 {
 	if (name != NULL)
 		return xmlGetProp (node, CC2XML (name));
@@ -64,7 +64,7 @@ xml_node_get_cstr (xmlNodePtr node, char const *name)
 	return NULL;
 }
 void
-xml_node_set_cstr (xmlNodePtr node, char const *name, char const *val)
+go_xml_node_set_cstr (xmlNodePtr node, char const *name, char const *val)
 {
 	if (name)
 		xmlSetProp (node, CC2XML (name), CC2XML (val));
@@ -73,9 +73,9 @@ xml_node_set_cstr (xmlNodePtr node, char const *name, char const *val)
 }
 
 gboolean
-xml_node_get_bool (xmlNodePtr node, char const *name, gboolean *val)
+go_xml_node_get_bool (xmlNodePtr node, char const *name, gboolean *val)
 {
-	xmlChar *buf = xml_node_get_cstr (node, name);
+	xmlChar *buf = go_xml_node_get_cstr (node, name);
 	if (buf == NULL)
 		return FALSE;
 
@@ -86,20 +86,20 @@ xml_node_get_bool (xmlNodePtr node, char const *name, gboolean *val)
 }
 
 void
-xml_node_set_bool (xmlNodePtr node, char const *name, gboolean val)
+go_xml_node_set_bool (xmlNodePtr node, char const *name, gboolean val)
 {
-	xml_node_set_cstr (node, name, val ? "true" : "false");
+	go_xml_node_set_cstr (node, name, val ? "true" : "false");
 }
 
 gboolean
-xml_node_get_int (xmlNodePtr node, char const *name, int *val)
+go_xml_node_get_int (xmlNodePtr node, char const *name, int *val)
 {
 	xmlChar *buf;
 	char *end;
 	gboolean ok;
 	long l;
 
-	buf = xml_node_get_cstr (node, name);
+	buf = go_xml_node_get_cstr (node, name);
 	if (buf == NULL)
 		return FALSE;
 
@@ -112,21 +112,21 @@ xml_node_get_int (xmlNodePtr node, char const *name, int *val)
 }
 
 void
-xml_node_set_int (xmlNodePtr node, char const *name, int val)
+go_xml_node_set_int (xmlNodePtr node, char const *name, int val)
 {
 	char str[4 * sizeof (int)];
 	sprintf (str, "%d", val);
-	xml_node_set_cstr (node, name, str);
+	go_xml_node_set_cstr (node, name, str);
 }
 
 gboolean
-xml_node_get_double (xmlNodePtr node, char const *name, double *val)
+go_xml_node_get_double (xmlNodePtr node, char const *name, double *val)
 {
 	xmlChar *buf;
 	char *end;
 	gboolean ok;
 
-	buf = xml_node_get_cstr (node, name);
+	buf = go_xml_node_get_cstr (node, name);
 	if (buf == NULL)
 		return FALSE;
 
@@ -139,7 +139,7 @@ xml_node_get_double (xmlNodePtr node, char const *name, double *val)
 }
 
 void
-xml_node_set_double (xmlNodePtr node, char const *name, double val,
+go_xml_node_set_double (xmlNodePtr node, char const *name, double val,
 		     int precision)
 {
 	char str[101 + DBL_DIG];
@@ -152,12 +152,12 @@ xml_node_set_double (xmlNodePtr node, char const *name, double val,
 	else
 		g_snprintf (str, 100 + DBL_DIG, "%f", val);
 
-	xml_node_set_cstr (node, name, str);
+	go_xml_node_set_cstr (node, name, str);
 }
 
 
 gboolean
-xml_node_get_gocolor (xmlNodePtr node, char const *name, GOColor *res)
+go_xml_node_get_gocolor (xmlNodePtr node, char const *name, GOColor *res)
 {
 	xmlChar *color;
 	int r, g, b;
@@ -178,18 +178,18 @@ xml_node_get_gocolor (xmlNodePtr node, char const *name, GOColor *res)
 }
 
 void
-xml_node_set_gocolor (xmlNodePtr node, char const *name, GOColor val)
+go_xml_node_set_gocolor (xmlNodePtr node, char const *name, GOColor val)
 {
 	unsigned r, g, b;
 	char str[4 * sizeof (val)];
 
 	UINT_TO_RGB (val, &r, &g, &b);
 	sprintf (str, "%X:%X:%X", r, g, b);
-	xml_node_set_cstr (node, name, str);
+	go_xml_node_set_cstr (node, name, str);
 }
 
 gboolean
-xml_node_get_enum (xmlNodePtr node, char const *name, GType etype, gint *val)
+go_xml_node_get_enum (xmlNodePtr node, char const *name, GType etype, gint *val)
 {
 	GEnumClass *eclass = G_ENUM_CLASS (g_type_class_peek (etype));
 	GEnumValue *ev;
@@ -202,7 +202,7 @@ xml_node_get_enum (xmlNodePtr node, char const *name, GType etype, gint *val)
 
 	ev = g_enum_get_value_by_name (eclass, CXML2C (s));
 	if (!ev) ev = g_enum_get_value_by_nick (eclass, CXML2C (s));
-	if (!ev && xml_node_get_int (node, name, &i))
+	if (!ev && go_xml_node_get_int (node, name, &i))
 		/* Check that the value is valid.  */
 		ev = g_enum_get_value (eclass, i);
 	xmlFree (s);
@@ -213,13 +213,13 @@ xml_node_get_enum (xmlNodePtr node, char const *name, GType etype, gint *val)
 }
 
 void
-xml_node_set_enum (xmlNodePtr node, char const *name, GType etype, gint val)
+go_xml_node_set_enum (xmlNodePtr node, char const *name, GType etype, gint val)
 {
 	GEnumClass *eclass = G_ENUM_CLASS (g_type_class_peek (etype));
 	GEnumValue *ev = g_enum_get_value (eclass, val);
 
 	if (ev)
-		xml_node_set_cstr (node, name, ev->value_name);
+		go_xml_node_set_cstr (node, name, ev->value_name);
 	else
 		g_warning ("Invalid value %d for type %s",
 			   val, g_type_name (etype));
@@ -228,7 +228,7 @@ xml_node_set_enum (xmlNodePtr node, char const *name, GType etype, gint val)
 /*************************************************************************/
 
 xmlNode *
-e_xml_get_child_by_name (xmlNode const *parent, char const *child_name)
+go_xml_get_child_by_name (xmlNode const *parent, char const *child_name)
 {
 	xmlNode *child;
 
@@ -244,7 +244,7 @@ e_xml_get_child_by_name (xmlNode const *parent, char const *child_name)
 }
 
 xmlNode *
-e_xml_get_child_by_name_no_lang (xmlNode const *parent, char const *name)
+go_xml_get_child_by_name_no_lang (xmlNode const *parent, char const *name)
 {
 	xmlNodePtr node;
 
@@ -269,7 +269,7 @@ e_xml_get_child_by_name_no_lang (xmlNode const *parent, char const *name)
 
 
 xmlNode *
-e_xml_get_child_by_name_by_lang (xmlNode const *parent, gchar const *name)
+go_xml_get_child_by_name_by_lang (xmlNode const *parent, gchar const *name)
 {
 	xmlNodePtr   best_node = NULL, node;
 	gint         best_lang_score = INT_MAX;
diff --git a/goffice/utils/go-libxml-extras.h b/goffice/utils/go-libxml-extras.h
index ce6725c..c7a29af 100644
--- a/goffice/utils/go-libxml-extras.h
+++ b/goffice/utils/go-libxml-extras.h
@@ -29,22 +29,22 @@ G_BEGIN_DECLS
 
 xmlDocPtr  go_xml_parse_file    (const char *filename);
 
-xmlChar   *xml_node_get_cstr	(xmlNodePtr node, char const *name);
-void	   xml_node_set_cstr	(xmlNodePtr node, char const *name, char const *val);
-gboolean   xml_node_get_bool	(xmlNodePtr node, char const *name, gboolean *result);
-void       xml_node_set_bool	(xmlNodePtr node, char const *name, gboolean val);
-gboolean   xml_node_get_int	(xmlNodePtr node, char const *name, int *result);
-void       xml_node_set_int	(xmlNodePtr node, char const *name, int  val);
-gboolean   xml_node_get_double	(xmlNodePtr node, char const *name, double *result);
-void       xml_node_set_double	(xmlNodePtr node, char const *name, double  val, int precision);
-gboolean   xml_node_get_gocolor (xmlNodePtr node, char const *name, GOColor *result);
-void	   xml_node_set_gocolor (xmlNodePtr node, char const *name, GOColor  val);
-gboolean   xml_node_get_enum    (xmlNodePtr node, char const *name, GType etype, gint *val);
-void       xml_node_set_enum    (xmlNodePtr node, char const *name, GType etype, gint val);
-
-xmlNode *e_xml_get_child_by_name	 (xmlNode const *tree, char const *name);
-xmlNode *e_xml_get_child_by_name_no_lang (xmlNode const *tree, char const *name);
-xmlNode *e_xml_get_child_by_name_by_lang (xmlNode const *tree, char const *name);
+xmlChar   *go_xml_node_get_cstr	(xmlNodePtr node, char const *name);
+void	   go_xml_node_set_cstr	(xmlNodePtr node, char const *name, char const *val);
+gboolean   go_xml_node_get_bool	(xmlNodePtr node, char const *name, gboolean *result);
+void       go_xml_node_set_bool	(xmlNodePtr node, char const *name, gboolean val);
+gboolean   go_xml_node_get_int	(xmlNodePtr node, char const *name, int *result);
+void       go_xml_node_set_int	(xmlNodePtr node, char const *name, int  val);
+gboolean   go_xml_node_get_double	(xmlNodePtr node, char const *name, double *result);
+void       go_xml_node_set_double	(xmlNodePtr node, char const *name, double  val, int precision);
+gboolean   go_xml_node_get_gocolor (xmlNodePtr node, char const *name, GOColor *result);
+void	   go_xml_node_set_gocolor (xmlNodePtr node, char const *name, GOColor  val);
+gboolean   go_xml_node_get_enum    (xmlNodePtr node, char const *name, GType etype, gint *val);
+void       go_xml_node_set_enum    (xmlNodePtr node, char const *name, GType etype, gint val);
+
+xmlNode *go_xml_get_child_by_name	 (xmlNode const *tree, char const *name);
+xmlNode *go_xml_get_child_by_name_no_lang (xmlNode const *tree, char const *name);
+xmlNode *go_xml_get_child_by_name_by_lang (xmlNode const *tree, char const *name);
 
 void	   go_xml_out_add_color (GsfXMLOut *out, char const *id, GOColor c);
 
diff --git a/goffice/utils/go-pattern.c b/goffice/utils/go-pattern.c
index 47a5856..7e4b3f2 100644
--- a/goffice/utils/go-pattern.c
+++ b/goffice/utils/go-pattern.c
@@ -180,10 +180,10 @@ go_pattern_get_svg_path (GOPattern const *pattern, double *width, double *height
 			if (name != NULL) {
 				if (strcmp ((char *)name, go_patterns [pattern->pattern].str) == 0) {
 					if (width != NULL && 
-						xml_node_get_double (ptr, "width", &value))
+						go_xml_node_get_double (ptr, "width", &value))
 					    *width = value;
 					if (height != NULL &&
-						xml_node_get_double (ptr, "height", &value))
+						go_xml_node_get_double (ptr, "height", &value))
 					    *height = value;
 					svg_path = xmlGetProp (ptr, CC2XML ("d"));
 					break;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]