goffice r2076 - in trunk: . goffice

[jbrefort svn gnome org]

Author: jbrefort
Date: Fri May  9 06:29:35 2008
New Revision: 2076
URL: http://svn.gnome.org/viewvc/goffice?rev=2076&view=rev

Log:
2008-05-09  Jean Brefort  <jean brefort normalesup org>

	* goffice/goffice.c: (libgoffice_init), (libgoffice_shutdown):
	fixed typo.



Modified:
   trunk/ChangeLog
   trunk/goffice/goffice.c

Modified: trunk/goffice/goffice.c
==============================================================================
--- trunk/goffice/goffice.c	(original)
+++ trunk/goffice/goffice.c	Fri May  9 06:29:35 2008
@@ -40,6 +40,7 @@
 #include <goffice/utils/go-format.h>
 #include <goffice/utils/go-font.h>
 #include <goffice/app/go-plugin-service.h>
+#include <goffice/app/go-conf.h>
 #include <goffice/component/go-component-factory.h>
 #include <gsf/gsf-utils.h>
 
@@ -73,7 +74,7 @@
 }
 
 void
-libgoffice_init (void)
+libgoffice_init ()
 {
 	static gboolean initialized = FALSE;
 
@@ -100,6 +101,7 @@
 
 	bindtextdomain (GETTEXT_PACKAGE, libgoffice_locale_dir);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	go_conf_init ();
 	go_fonts_init ();
 	go_math_init ();
 	gsf_init ();
@@ -107,7 +109,7 @@
 	/* keep trigger happy linkers from leaving things out */
 	plugin_services_init ();
 	gog_plugin_services_init ();
-#ifdef GOFFICE_HAVE_GTK
+#ifdef GOFFICE_WITH_GTK
 	goc_plugin_services_init ();
 #endif
 	(void) GOG_GRAPH_TYPE;
@@ -137,12 +139,13 @@
 {
 	gog_themes_shutdown ();
 	go_fonts_shutdown ();
-#ifdef GOFFICE_HAVE_GTK
+#ifdef GOFFICE_WITH_GTK
 	goc_plugin_services_shutdown ();
 #endif
 	gog_plugin_services_shutdown ();
 	go_currency_date_format_shutdown ();
 	go_number_format_shutdown ();
+	go_conf_shutdown ();
 #ifdef G_OS_WIN32
 	/* const_cast, we created these above */
 	g_free ((char *)libgoffice_data_dir);