[gnome-keyring] [daemon] Remove gconf support as part of migration to gsettings.

[Stefan Walter <stefw src gnome org>]

commit 201ad316423a287c8552e882421acaf2dd3f3128
Author: Stef Walter <stef memberwebs com>
Date:   Sun Aug 8 09:37:22 2010 +0200

    [daemon] Remove gconf support as part of migration to gsettings.
    
     * These keys didn't seem to have any effect anyway. They were supposed
       to be used by the session manager.

 configure.in                               |    2 -
 daemon/data/Makefile.am                    |   24 +--------------
 daemon/data/gnome-keyring.schemas.in       |   46 ----------------------------
 daemon/gnome-keyring-gpg.desktop.in.in     |    1 -
 daemon/gnome-keyring-pkcs11.desktop.in.in  |    1 -
 daemon/gnome-keyring-secrets.desktop.in.in |    1 -
 daemon/gnome-keyring-ssh.desktop.in.in     |    1 -
 7 files changed, 1 insertions(+), 75 deletions(-)
---
diff --git a/configure.in b/configure.in
index e3a14ca..7c217dd 100644
--- a/configure.in
+++ b/configure.in
@@ -67,8 +67,6 @@ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.20.0)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
-AM_GCONF_SOURCE_2
-
 GETTEXT_PACKAGE=gnome-keyring
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain name])
 AC_SUBST(GETTEXT_PACKAGE)
diff --git a/daemon/data/Makefile.am b/daemon/data/Makefile.am
index 65efe87..bc8331a 100644
--- a/daemon/data/Makefile.am
+++ b/daemon/data/Makefile.am
@@ -1,23 +1,4 @@
 
- INTLTOOL_SCHEMAS_RULE@
-
-schemasdir = $(GCONF_SCHEMA_FILE_DIR)
-schemas_in_files = gnome-keyring.schemas.in
-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
-	@GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 \
-		--makefile-install-rule $(schemas_DATA) || \
-		(echo ;\
-		echo "*****************************************************"; \
-		echo "Installation of schemas failed, install them manually"; \
-		echo "*****************************************************";)
-	@true
-else
-install-data-local:
-endif
-
 introspectdir = $(datadir)/gnome-keyring/introspect
 
 introspect_DATA = \
@@ -27,8 +8,5 @@ introspect_DATA = \
 	introspect-service.xml \
 	introspect-session.xml
 
-EXTRA_DIST = \
-	$(schemas_in_files) \
+EXTRA_DIST =
 	$(introspect_DATA)
-
-CLEANFILES = $(schemas_DATA)
diff --git a/daemon/gnome-keyring-gpg.desktop.in.in b/daemon/gnome-keyring-gpg.desktop.in.in
index 26af498..c25ddd2 100644
--- a/daemon/gnome-keyring-gpg.desktop.in.in
+++ b/daemon/gnome-keyring-gpg.desktop.in.in
@@ -4,7 +4,6 @@ _Name=GPG Password Agent
 _Comment=GNOME Keyring: GPG Agent
 Exec= VALGRIND_RUN@ gnome-keyring-daemon --start --components=gpg
 OnlyShowIn=GNOME;LXDE;
-AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/gpg
 X-GNOME-Autostart-Phase=Initialization
 X-GNOME-AutoRestart=false
 X-GNOME-Autostart-Notify=true
diff --git a/daemon/gnome-keyring-pkcs11.desktop.in.in b/daemon/gnome-keyring-pkcs11.desktop.in.in
index ab96585..98f72f9 100644
--- a/daemon/gnome-keyring-pkcs11.desktop.in.in
+++ b/daemon/gnome-keyring-pkcs11.desktop.in.in
@@ -4,7 +4,6 @@ _Name=Certificate and Key Storage
 _Comment=GNOME Keyring: PKCS#11 Component
 Exec= VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --components=pkcs11
 OnlyShowIn=GNOME;LXDE;
-AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/pkcs11
 X-GNOME-Autostart-Phase=Initialization
 X-GNOME-AutoRestart=false
 X-GNOME-Autostart-Notify=true
diff --git a/daemon/gnome-keyring-secrets.desktop.in.in b/daemon/gnome-keyring-secrets.desktop.in.in
index 3235d65..5779435 100644
--- a/daemon/gnome-keyring-secrets.desktop.in.in
+++ b/daemon/gnome-keyring-secrets.desktop.in.in
@@ -4,7 +4,6 @@ _Name=Secret Storage Service
 _Comment=GNOME Keyring: Secret Service
 Exec= VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --components=secrets
 OnlyShowIn=GNOME;LXDE;
-AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/secrets
 X-GNOME-Autostart-Phase=Initialization
 X-GNOME-AutoRestart=false
 X-GNOME-Autostart-Notify=true
diff --git a/daemon/gnome-keyring-ssh.desktop.in.in b/daemon/gnome-keyring-ssh.desktop.in.in
index 5dd59b2..5379f4d 100644
--- a/daemon/gnome-keyring-ssh.desktop.in.in
+++ b/daemon/gnome-keyring-ssh.desktop.in.in
@@ -4,7 +4,6 @@ _Name=SSH Key Agent
 _Comment=GNOME Keyring: SSH Agent
 Exec= VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --components=ssh
 OnlyShowIn=GNOME;LXDE;
-AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/ssh
 X-GNOME-Autostart-Phase=Initialization
 X-GNOME-AutoRestart=false
 X-GNOME-Autostart-Notify=true