[gnome-settings-daemon] gconf: Remove GConf bridge plugin

[Bastien Nocera <hadess src gnome org>]

commit f4ef02038a1f57edf7a23ba91829f15cddfc7eff
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Sep 20 10:40:51 2011 +0100

    gconf: Remove GConf bridge plugin
    
    As we shouldn't have to migrate anything now.

 configure.ac                                       |   28 ----
 ...gnome.settings-daemon.plugins.gschema.xml.in.in |   12 --
 plugins/Makefile.am                                |    6 -
 plugins/color/gcm-tables.c                         |  171 --------------------
 plugins/color/gcm-tables.h                         |   67 --------
 plugins/gconf/Makefile.am                          |   40 -----
 plugins/gconf/conf-watcher.c                       |  150 -----------------
 plugins/gconf/conf-watcher.h                       |   61 -------
 plugins/gconf/gconf.gnome-settings-plugin.in       |    8 -
 plugins/gconf/gsd-gconf-manager.c                  |  159 ------------------
 plugins/gconf/gsd-gconf-manager.h                  |   57 -------
 plugins/gconf/gsd-gconf-plugin.c                   |   95 -----------
 plugins/gconf/gsd-gconf-plugin.h                   |   59 -------
 13 files changed, 0 insertions(+), 913 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3c940d7..93b21b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -205,32 +205,6 @@ dnl ---------------------------------------------------------------------------
 
 PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
 
-dnl ---------------------------------------------------------------------------
-dnl - GConf<->GSettings bridge
-dnl ---------------------------------------------------------------------------
-
-build_gconf_bridge=false
-AC_ARG_ENABLE(gconf-bridge,
-  AC_HELP_STRING([--disable-gconf-bridge],
-                 [turn off GConf bridge plugin]),
-      [case "${enableval}" in
-              yes) WANT_GCONF_BRIDGE=yes ;;
-	      no) WANT_GCONF_BRIDGE=no ;;
-	      *) AC_MSG_ERROR(bad value ${enableval} for --disable-gconf-bridge) ;;
-      esac],
-      [WANT_GCONF_BRIDGE=no]) dnl Default value
-
-if test x$WANT_GCONF_BRIDGE = xyes; then
-      PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.6.1,
-            [build_gconf_bridge=true
-             AC_DEFINE(BUILD_GCONF_BRIDGE, 1, [Define if GConf bridge should be built])],
-	    [build_gconf_bridge=false])
-fi
-AM_CONDITIONAL(BUILD_GCONF_BRIDGE, test "x$build_gconf_bridge" = "xtrue")
-
-AC_SUBST(GCONF_CFLAGS)
-AC_SUBST(GCONF_LIBS)
-
 dnl ==============================================
 dnl PackageKit section
 dnl ==============================================
@@ -503,7 +477,6 @@ plugins/cursor/Makefile
 plugins/datetime/Makefile
 plugins/dummy/Makefile
 plugins/power/Makefile
-plugins/gconf/Makefile
 plugins/housekeeping/Makefile
 plugins/keybindings/Makefile
 plugins/keyboard/Makefile
@@ -568,7 +541,6 @@ echo "
         Libnotify support:        ${have_libnotify}
         PackageKit support:       ${have_packagekit}
         Smartcard support:        ${have_smartcard_support}
-        GConf bridge support:     ${build_gconf_bridge}
         Cups support:             ${have_cups}
 ${NSS_DATABASE:+\
         System nssdb:             ${NSS_DATABASE}
diff --git a/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
index 04e3da9..a4c6ff3 100644
--- a/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
@@ -84,18 +84,6 @@
       <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
     </key>
   </schema>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.gconf" path="/org/gnome/settings-daemon/plugins/gconf/">
-    <key name="active" type="b">
-      <default>false</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
-    </key>
-    <key name="priority" type="i">
-      <default>100</default>
-      <_summary>Priority to use for this plugin</_summary>
-      <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
-    </key>
-  </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.keybindings" path="/org/gnome/settings-daemon/plugins/keybindings/">
     <key name="active" type="b">
       <default>true</default>
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 5e26811..96106a3 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -24,12 +24,6 @@ enabled_plugins =	\
 
 disabled_plugins = $(NULL)
 
-if BUILD_GCONF_BRIDGE
-enabled_plugins += gconf
-else
-disabled_plugins += gconf
-endif
-
 if HAVE_PACKAGEKIT
 enabled_plugins += updates
 else