From 94daae3dba8e86e88f69320bc82795fe660ec9cd Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Fri, 15 Jun 2012 09:04:08 +0200
Subject: Remove the last remaining usage of GConf

---
 modules/spamassassin/Makefile.am                   | 34 ----------------------
 modules/spamassassin/evolution-spamassassin.c      |  4 ---
 .../spamassassin/evolution-spamassassin.schemas.in | 33 ---------------------
 3 files changed, 71 deletions(-)
 delete mode 100644 modules/spamassassin/evolution-spamassassin.schemas.in

(limited to 'modules/spamassassin')

diff --git a/modules/spamassassin/Makefile.am b/modules/spamassassin/Makefile.am
index cb8f5778fa..8475660319 100644
--- a/modules/spamassassin/Makefile.am
+++ b/modules/spamassassin/Makefile.am
@@ -22,38 +22,4 @@ module_spamassassin_la_LIBADD = \
 module_spamassassin_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = evolution-spamassassin.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-
-@INTLTOOL_SCHEMAS_RULE@
-
-if GCONF_SCHEMAS_INSTALL
-
-if OS_WIN32
-install-data-local:
-	if test -z "$(DESTDIR)" ; then							\
-		for p in $(schema_DATA) ; do						\
-			(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE);	\
-			 echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat;	\
-			cmd /c _temp.bat; 						\
-			rm _temp.bat;							\
-		done									\
-	fi
-else
-install-data-local:
-	if test -z "$(DESTDIR)" ; then							\
-		for p in $(schema_DATA) ; do						\
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) 		\
-				$(GCONFTOOL) --makefile-install-rule $$p;		\
-		done									\
-	fi
-endif
-
-endif
-
-DISTCLEANFILES = $(schema_DATA)
-
-EXTRA_DIST = $(schema_in_files)
-
 -include $(top_srcdir)/git.mk
diff --git a/modules/spamassassin/evolution-spamassassin.c b/modules/spamassassin/evolution-spamassassin.c
index 7f595caf32..275e921398 100644
--- a/modules/spamassassin/evolution-spamassassin.c
+++ b/modules/spamassassin/evolution-spamassassin.c
@@ -1145,10 +1145,6 @@ e_spam_assassin_init (ESpamAssassin *extension)
 
 	extension->socket_path_mutex = g_mutex_new ();
 
-	/* XXX Once we move to GSettings these probably don't
-	 *     need to be properties anymore.  GConfBridge is
-	 *     just easier to deal with than GConfClient. */
-
 	settings = g_settings_new ("org.gnome.evolution.spamassassin");
 
 	g_settings_bind (
diff --git a/modules/spamassassin/evolution-spamassassin.schemas.in b/modules/spamassassin/evolution-spamassassin.schemas.in
deleted file mode 100644
index b344d1bffd..0000000000
--- a/modules/spamassassin/evolution-spamassassin.schemas.in
+++ /dev/null
@@ -1,33 +0,0 @@
-<gconfschemafile>
-  <schemalist>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/junk/sa/local_only</key>
-      <applyto>/apps/evolution/mail/junk/sa/local_only</applyto>
-      <owner>evolution-spamassassin</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Use only local spam tests.</short>
-         <long>
-           Use only the local spam tests (no DNS).
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/junk/sa/use_daemon</key>
-      <applyto>/apps/evolution/mail/junk/sa/use_daemon</applyto>
-      <owner>evolution-spamassassin</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Use SpamAssassin daemon and client</short>
-         <long>
-            Use SpamAssassin daemon and client (spamc/spamd).
-         </long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>
-- 
cgit v1.2.3