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/external-editor/Makefile.am                | 35 +---------------------
 .../apps-evolution-external-editor.schemas.in      | 28 -----------------
 2 files changed, 1 insertion(+), 62 deletions(-)
 delete mode 100644 plugins/external-editor/apps-evolution-external-editor.schemas.in

(limited to 'plugins/external-editor')

diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am
index 070599347a..f0ffd1ac67 100644
--- a/plugins/external-editor/Makefile.am
+++ b/plugins/external-editor/Makefile.am
@@ -48,46 +48,13 @@ liborg_gnome_external_editor_la_LIBADD = 			\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(GTKHTML_LIBS)
 
-schemadir       = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps-evolution-external-editor.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
-
 EXTRA_DIST = 					\
 	org-gnome-external-editor.eplug.xml	\
-	org-gnome-external-editor.error.xml	\
-	$(schema_in_files)
+	org-gnome-external-editor.error.xml
 
 BUILT_SOURCES = org-gnome-external-editor.eplug \
 		org-gnome-external-editor.error
 
 CLEANFILES = $(BUILT_SOURCES)
 
-DISTCLEANFILES = $(schema_DATA)
-
 -include $(top_srcdir)/git.mk
diff --git a/plugins/external-editor/apps-evolution-external-editor.schemas.in b/plugins/external-editor/apps-evolution-external-editor.schemas.in
deleted file mode 100644
index 0f7db301e8..0000000000
--- a/plugins/external-editor/apps-evolution-external-editor.schemas.in
+++ /dev/null
@@ -1,28 +0,0 @@
-<gconfschemafile>
- <schemalist>
-   <schema>
-      <key>/schemas/apps/evolution/eplugin/external-editor/editor-command</key>
-      <applyto>/apps/evolution/eplugin/external-editor/editor-command</applyto>
-      <owner>evolution-mail</owner>
-      <type>string</type>
-      <default>gedit</default>
-      <locale name="C">
-        <short>Default External Editor</short>
-        <long>The default command that must be used as the editor.</long>
-      </locale>
-   </schema>
-
-   <schema>
-      <key>/schemas/apps/evolution/eplugin/external-editor/launch-on-key-press</key>
-      <applyto>/apps/evolution/eplugin/external-editor/launch-on-key-press</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Automatically launch when a new mail is edited</short>
-        <long>Automatically launch editor when key is pressed in the mail composer</long>
-      </locale>
-    </schema>
-  </schemalist>
-</gconfschemafile>
-
-- 
cgit v1.2.3