[goffice] Remove GConf support.

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

commit 4b662af55964448b2eebb9d644aeea888341544f
Author: Jean Brefort <jean brefort normalesup org>
Date:   Sun Nov 6 20:03:40 2011 +0100

    Remove GConf support.

 ChangeLog                   |    6 +
 NEWS                        |    1 +
 configure.in                |    9 +-
 goffice/app/go-conf-gconf.c |  476 -------------------------------------------
 goffice/app/go-conf.c       |    4 +-
 5 files changed, 9 insertions(+), 487 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b839a6d..0ad0ffc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-06  Jean Brefort  <jean brefort normalesup org>
+
+	* configure.in: drop gconf support.
+	* goffice/app/go-conf.c: ditto.
+	* goffice/app/go-conf-gconf.c: ditto.
+
 2011-11-05  Jean Brefort  <jean brefort normalesup org>
 
 	* goffice/canvas/goc-item.c (goc_item_bounds_changed): invalidate new
diff --git a/NEWS b/NEWS
index 0d63119..477d5e8 100644
--- a/NEWS
+++ b/NEWS
@@ -40,6 +40,7 @@ Jean:
 	* Add some optional support for EPS images. [#663078]
 	* Fixed a memory leak in GocPolyline code. [#663355]
 	* Fixed pixels dust in text rotation selector. [#662393]
+	* Remove GConf support.
 
 Morten:
 	* Recognize scientific formats with longer exponents.
diff --git a/configure.in b/configure.in
index a39193e..a97c154 100644
--- a/configure.in
+++ b/configure.in
@@ -226,20 +226,13 @@ fi
 dnl ***********************************
 dnl Which conf backend should be used?
 dnl ***********************************
-AC_ARG_WITH(config-backend, [  --with-config-backend=gconf|gsettings|keyfile|win32           Choose the config backend ])
+AC_ARG_WITH(config-backend, [  --with-config-backend=gsettings|keyfile|win32           Choose the config backend ])
 case $with_config_backend in
 	win32)
 		if test $with_win32 = no; then AC_MSG_ERROR([ win32 configuration backend only works for win32 builds ]);fi;
 		AC_DEFINE(GOFFICE_WITH_WINREG, 1, [Goffice uses Windows registry])
 		conf_msg="Windows registry"
 		;;
-	gconf)
-		if test $with_win32 = yes; then AC_MSG_ERROR([ gconf configuration backend does not work for win32 builds ]);fi;
-		AC_DEFINE(GOFFICE_WITH_GCONF, 1, [Goffice uses gconf])
-		EXTRA_DEPS="$EXTRA_DEPS gconf-2.0"
-		conf_msg="GConf"
-		goffice_reqs="$goffice_reqs gconf-2.0"
-		;;
 	gsettings)
 		AC_CHECK_LIB(gio-2.0,[g_settings_new],
 		[
diff --git a/goffice/app/go-conf.c b/goffice/app/go-conf.c
index a4da005..a7cb222 100644
--- a/goffice/app/go-conf.c
+++ b/goffice/app/go-conf.c
@@ -52,9 +52,7 @@ go_conf_closure_free (GOConfClosure *cls)
 	g_free (cls);
 }
 
-#ifdef GOFFICE_WITH_GCONF
-#include "go-conf-gconf.c"
-#elif defined GOFFICE_WITH_WINREG
+#if defined GOFFICE_WITH_WINREG
 #include "go-conf-win32.c"
 #elif defined GOFFICE_WITH_GSETTINGS
 #include "go-conf-gsettings.c"