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

---
 plugins/face/Makefile.am                           | 37 +---------------------
 .../face/apps_evolution_eplugin_face.schemas.in    | 17 ----------
 2 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 plugins/face/apps_evolution_eplugin_face.schemas.in

(limited to 'plugins/face')

diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am
index f266a410b7..0522cc0f82 100644
--- a/plugins/face/Makefile.am
+++ b/plugins/face/Makefile.am
@@ -34,18 +34,9 @@ error_DATA = org-gnome-face.error
 
 errordir = $(privdatadir)/errors
 
-# GConf schemas
-
-schemadir   = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps_evolution_eplugin_face.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-
-@INTLTOOL_SCHEMAS_RULE@
-
 EXTRA_DIST = 				\
 	org-gnome-face.eplug.xml	\
-	org-gnome-face.error.xml	\
-	$(schema_in_files)
+	org-gnome-face.error.xml
 
 BUILT_SOURCES = 			\
 	org-gnome-face.eplug 		\
@@ -53,30 +44,4 @@ BUILT_SOURCES = 			\
 
 CLEANFILES = $(BUILT_SOURCES)
 
-DISTCLEANFILES = $(schema_DATA)
-
-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
-
 -include $(top_srcdir)/git.mk
diff --git a/plugins/face/apps_evolution_eplugin_face.schemas.in b/plugins/face/apps_evolution_eplugin_face.schemas.in
deleted file mode 100644
index 7583172f22..0000000000
--- a/plugins/face/apps_evolution_eplugin_face.schemas.in
+++ /dev/null
@@ -1,17 +0,0 @@
-<gconfschemafile>
-  <schemalist>
-
-    <schema>
-      <key>/schemas/apps/evolution/eplugin/face/insert_by_default</key>
-      <applyto>/apps/evolution/eplugin/face/insert_by_default</applyto>
-      <owner>org.gnome.evolution.plugins.face</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Insert Face picture by default</short>
-        <long>Whether insert Face picture to outgoing messages by default. The picture should be set before checking this, otherwise nothing happens.</long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>
-- 
cgit v1.2.3