libgsf r1039 - in trunk: . gsf

[jdassen svn gnome org]

Author: jdassen
Date: Fri Jan 30 16:21:08 2009
New Revision: 1039
URL: http://svn.gnome.org/viewvc/libgsf?rev=1039&view=rev

Log:
gsf/gsf-output-csv.c (gsf_output_csv_quoting_mode_get_type): Declare
"values" as static, as the second argument to g_enum_register_static may not
be stack-allocated, because GObject keeps a reference to the data. This
fixes a problem generating the documentation in some environments; see
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39015 .


Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/gsf/gsf-output-csv.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Fri Jan 30 16:21:08 2009
@@ -1,5 +1,10 @@
 libgsf 1.14.12
 
+J.H.M. Dassen (Ray):
+	* Fix incorrect use of g_enum_register_static which broke
+	  documentation generation in some environments.
+	  [http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39015]
+
 Morten:
 	* Handle malformed xml better.  [#568994]
 

Modified: trunk/gsf/gsf-output-csv.c
==============================================================================
--- trunk/gsf/gsf-output-csv.c	(original)
+++ trunk/gsf/gsf-output-csv.c	Fri Jan 30 16:21:08 2009
@@ -182,7 +182,7 @@
 	static GType gsf_output_csv_quoting_mode_type = 0;
 
 	if (gsf_output_csv_quoting_mode_type == 0) {
-		GEnumValue const values[] = {
+		static GEnumValue const values[] = {
 		{ GSF_OUTPUT_CSV_QUOTING_MODE_NEVER,  (char *)"GSF_OUTPUT_CSV_QUOTING_MODE_NEVER",  (char *)"never" },
 		{ GSF_OUTPUT_CSV_QUOTING_MODE_AUTO,   (char *)"GSF_OUTPUT_CSV_QUOTING_MODE_AUTO",   (char *)"auto" },
 		{ GSF_OUTPUT_CSV_QUOTING_MODE_ALWAYS, (char *)"GSF_OUTPUT_CSV_QUOTING_MODE_ALWAYS", (char *)"always" },