[goffice] 2009-04-26 Jean Brefort <jean brefort normalesup org>

[Jean Bréfort <jbrefort src gnome org>]

commit 3dc5644a89745e4b2853d713d31811d4de740154
Author: Jean Brefort <jean acer fbx proxad net>
Date:   Sun Apr 26 16:48:27 2009 +0200

    2009-04-26  Jean Brefort  <jean brefort normalesup org>
    
    	* goffice/app/go-conf-gconf.c: renamed go_conf_get_type
    	go_conf_get_node_type to avoid a build failure during docs generation.
    	[#580296]
    	* goffice/app/go-conf-keyfile.c: ditto.
    	* goffice/app/go-conf-win32.c: ditto.
    	* goffice/app/go-conf.h: ditto.
---
 ChangeLog                     |    9 +++++++++
 NEWS                          |    6 ++++++
 goffice/app/go-conf-gconf.c   |    6 +++---
 goffice/app/go-conf-keyfile.c |    2 +-
 goffice/app/go-conf-win32.c   |    6 +++---
 goffice/app/go-conf.h         |    2 +-
 6 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6473a10..ad43971 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2009-04-26  Jean Brefort  <jean brefort normalesup org>
 
+	* goffice/app/go-conf-gconf.c: renamed go_conf_get_type
+	go_conf_get_node_type to avoid a build failure during docs generation.
+	[#580296]
+	* goffice/app/go-conf-keyfile.c: ditto.
+	* goffice/app/go-conf-win32.c: ditto.
+	* goffice/app/go-conf.h: ditto.
+
+2009-04-26  Jean Brefort  <jean brefort normalesup org>
+
 	* configure.in: Post release bump.
 	
 2009-04-25  Morten Welinder <terra gnome org>
diff --git a/NEWS b/NEWS
index 49bda0c..c875987 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+goffice 0.7.6:
+
+Jean:
+	* Fixed segfault during documentation generation. [#580296]
+
+--------------------------------------------------------------------------
 goffice 0.7.5:
 
 Jean:
diff --git a/goffice/app/go-conf-gconf.c b/goffice/app/go-conf-gconf.c
index d78f247..64f76a8 100644
--- a/goffice/app/go-conf-gconf.c
+++ b/goffice/app/go-conf-gconf.c
@@ -276,7 +276,7 @@ go_conf_get_long_desc  (GOConfNode *node, gchar const *key)
 }
 
 GType
-go_conf_get_type (GOConfNode *node, gchar const *key)
+go_conf_get_node_type (GOConfNode *node, gchar const *key)
 {
 	GConfSchema *schema = get_schema (node, key);
 	GType t;
@@ -300,7 +300,7 @@ go_conf_get_value_as_str (GOConfNode *node, gchar const *key)
 {
 	gchar *value_string;
 
-	switch (go_conf_get_type (node, key)) {
+	switch (go_conf_get_node_type (node, key)) {
 	case G_TYPE_STRING:
 		value_string = go_conf_get_string (node, key);
 		break;
@@ -379,7 +379,7 @@ go_conf_get_str_list (GOConfNode *node, gchar const *key)
 gboolean
 go_conf_set_value_from_str (GOConfNode *node, gchar const *key, gchar const *val_str)
 {
-	switch (go_conf_get_type (node, key)) {
+	switch (go_conf_get_node_type (node, key)) {
 	case G_TYPE_STRING:
 		go_conf_set_string (node, key, val_str);
 		break;
diff --git a/goffice/app/go-conf-keyfile.c b/goffice/app/go-conf-keyfile.c
index 1981fe1..002a9cf 100644
--- a/goffice/app/go-conf-keyfile.c
+++ b/goffice/app/go-conf-keyfile.c
@@ -417,7 +417,7 @@ go_conf_get_long_desc  (GOConfNode *node, gchar const *key)
 }
 
 GType
-go_conf_get_type (GOConfNode *node, gchar const *key)
+go_conf_get_node_type (GOConfNode *node, gchar const *key)
 {
 	gchar **groups;
 	gchar *real_key;
diff --git a/goffice/app/go-conf-win32.c b/goffice/app/go-conf-win32.c
index 0a12ebb..26f8a5c 100644
--- a/goffice/app/go-conf-win32.c
+++ b/goffice/app/go-conf-win32.c
@@ -466,7 +466,7 @@ go_conf_get_long_desc  (GOConfNode *node, gchar const *key)
 }
 
 GType
-go_conf_get_type (GOConfNode *node, gchar const *key)
+go_conf_get_node_type (GOConfNode *node, gchar const *key)
 {
 	gulong type, size;
 	guchar *ptr = NULL;
@@ -491,7 +491,7 @@ go_conf_get_value_as_str (GOConfNode *node, gchar const *key)
 {
 	gchar *value_string;
 
-	switch (go_conf_get_type (node, key)) {
+	switch (go_conf_get_node_type (node, key)) {
 	case G_TYPE_STRING:
 		value_string = go_conf_get_string (node, key);
 		break;
@@ -516,7 +516,7 @@ gboolean
 go_conf_set_value_from_str (GOConfNode *node, gchar const *key,
 			    gchar const *val_str)
 {
-	switch (go_conf_get_type (node, key)) {
+	switch (go_conf_get_node_type (node, key)) {
 	case G_TYPE_STRING:
 		go_conf_set_string (node, key, val_str);
 		break;
diff --git a/goffice/app/go-conf.h b/goffice/app/go-conf.h
index 0d5c949..e52f325 100644
--- a/goffice/app/go-conf.h
+++ b/goffice/app/go-conf.h
@@ -16,7 +16,7 @@ void	 go_conf_free_node	    (GOConfNode *node);
 
 gchar	*go_conf_get_short_desc     (GOConfNode *node, gchar const *key);
 gchar	*go_conf_get_long_desc      (GOConfNode *node, gchar const *key);
-GType	 go_conf_get_type	    (GOConfNode *node, gchar const *key);
+GType	 go_conf_get_node_type	    (GOConfNode *node, gchar const *key);
 gchar	*go_conf_get_value_as_str   (GOConfNode *node, gchar const *key);
 
 gboolean go_conf_get_bool	(GOConfNode *node, gchar const *key);