[gnome-session] Remove calls to gconf-sanity-check

[Matthias Clasen <matthiasc src gnome org>]

commit 093d319757e6131734622103f70f46687ac1a625
Author: William Jon McCann <jmccann redhat com>
Date:   Sun Apr 3 21:23:59 2011 -0400

    Remove calls to gconf-sanity-check
    
    GConf doesn't use file locking for years anyway.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=646673

 configure.ac              |   24 --------
 gnome-session/Makefile.am |    2 -
 gnome-session/gsm-gconf.c |  143 ---------------------------------------------
 gnome-session/gsm-gconf.h |   31 ----------
 gnome-session/main.c      |   11 ----
 5 files changed, 0 insertions(+), 211 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1af6c3a..ca9eb93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,30 +72,6 @@ PKG_CHECK_MODULES(EGG_SMCLIENT, gtk+-3.0)
 PKG_CHECK_MODULES(GL_TEST, xcomposite gl)
 
 dnl ====================================================================
-dnl GConf Checks
-dnl ====================================================================
-AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
-if test x"$GCONFTOOL" = xno; then
-  AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
-fi
-
-AM_GCONF_SOURCE_2
-
-GCONF_SERVERDIR=`$PKG_CONFIG --variable=gconf_serverdir gconf-2.0`
-old_path=$PATH
-if test x"$GCONF_SERVERDIR" != x; then
-   PATH=$GCONF_SERVERDIR:$PATH
-fi
-
-AC_PATH_PROG(GCONF_SANITY_CHECK, gconf-sanity-check-2, no)
-if test x"$GCONF_SANITY_CHECK" = xno; then
-  AC_MSG_ERROR([gconf-sanity-check-2 executable not found in your path - should be installed with GConf])
-fi
-
-AC_SUBST(GCONF_SANITY_CHECK)
-PATH=$old_path
-
-dnl ====================================================================
 dnl X development libraries check
 dnl ====================================================================
 
diff --git a/gnome-session/Makefile.am b/gnome-session/Makefile.am
index 2c5a36c..c035aac 100644
--- a/gnome-session/Makefile.am
+++ b/gnome-session/Makefile.am
@@ -37,8 +37,6 @@ gnome_session_SOURCES =				\
 	gs-idle-monitor.c			\
 	gsm-presence.h				\
 	gsm-presence.c				\
-	gsm-gconf.c				\
-	gsm-gconf.h				\
 	gdm.h					\
 	gdm.c					\
 	gdm-signal-handler.h			\
diff --git a/gnome-session/main.c b/gnome-session/main.c
index 154e829..f2913ab 100644
--- a/gnome-session/main.c
+++ b/gnome-session/main.c
@@ -40,7 +40,6 @@
 #include "gdm-signal-handler.h"
 #include "gdm-log.h"
 
-#include "gsm-gconf.h"
 #include "gsm-util.h"
 #include "gsm-manager.h"
 #include "gsm-session-fill.h"
@@ -336,16 +335,8 @@ main (int argc, char **argv)
 
         client_store = gsm_store_new ();
 
-
-        /* Start up gconfd if not already running. */
-        gsm_gconf_init ();
-
         xsmp_server = gsm_xsmp_server_new (client_store);
 
-        /* Now make sure they succeeded. (They'll call
-         * gsm_util_init_error() if they failed.)
-         */
-        gsm_gconf_check ();
         acquire_name ();
 
         manager = gsm_manager_new (client_store, failsafe);
@@ -386,8 +377,6 @@ main (int argc, char **argv)
                 g_object_unref (client_store);
         }
 
-        gsm_gconf_shutdown ();
-
         gdm_log_shutdown ();
 
         return 0;