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/mail-notification/Makefile.am              | 35 +----------
 .../apps-evolution-mail-notification.schemas.in    | 73 ----------------------
 2 files changed, 1 insertion(+), 107 deletions(-)
 delete mode 100644 plugins/mail-notification/apps-evolution-mail-notification.schemas.in

(limited to 'plugins/mail-notification')

diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am
index 65b3acbdc3..042dcd0c9e 100644
--- a/plugins/mail-notification/Makefile.am
+++ b/plugins/mail-notification/Makefile.am
@@ -37,44 +37,11 @@ liborg_gnome_mail_notification_la_LIBADD = 			\
 	$(CANBERRA_LIBS)					\
 	$(GTKHTML_LIBS)
 
-schemadir       = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps-evolution-mail-notification.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
-
 BUILT_SOURCES = $(plugin_DATA)
 
 CLEANFILES = $(BUILT_SOURCES)
 
-DISTCLEANFILES = $(schema_DATA)
-
 EXTRA_DIST = 					\
-	org-gnome-mail-notification.eplug.xml	\
-	$(schema_in_files)
+	org-gnome-mail-notification.eplug.xml
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/mail-notification/apps-evolution-mail-notification.schemas.in b/plugins/mail-notification/apps-evolution-mail-notification.schemas.in
deleted file mode 100644
index 03d742b718..0000000000
--- a/plugins/mail-notification/apps-evolution-mail-notification.schemas.in
+++ /dev/null
@@ -1,73 +0,0 @@
-<gconfschemafile>
-  <schemalist>
-    <schema>
-      <key>/schemas/apps/evolution/eplugin/mail-notification/notify-only-inbox</key>
-      <applyto>/apps/evolution/eplugin/mail-notification/notify-only-inbox</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Notify new messages for Inbox only.</short>
-        <long>Whether to notify new messages in Inbox folder only.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/eplugin/mail-notification/status-enabled</key>
-      <applyto>/apps/evolution/eplugin/mail-notification/status-enabled</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Enable icon in notification area.</short>
-        <long>Show new mail icon in notification area when new messages arrive.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/eplugin/mail-notification/sound-enabled</key>
-      <applyto>/apps/evolution/eplugin/mail-notification/sound-enabled</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Play sound when new messages arrive.</short>
-        <long>Whether play sound or beep when new messages arrive.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/evolution/eplugin/mail-notification/sound-beep</key>
-      <applyto>/apps/evolution/eplugin/mail-notification/sound-beep</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Beep or play sound file.</short>
-        <long>If "true", then beep, otherwise will play sound file when new messages arrive.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/evolution/eplugin/mail-notification/sound-file</key>
-      <applyto>/apps/evolution/eplugin/mail-notification/sound-file</applyto>
-      <owner>evolution-mail</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>Sound filename to be played.</short>
-        <long>Sound file to be played when new messages arrive, if not in beep mode.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/evolution/eplugin/mail-notification/sound-use-theme</key>
-      <applyto>/apps/evolution/eplugin/mail-notification/sound-use-theme</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>false</default>	
-      <locale name="C">
-        <short>Use sound theme</short>
-        <long>Play themed sound when new messages arrive, if not in beep mode.</long>
-      </locale>
-    </schema>	
-  </schemalist>
-</gconfschemafile>
-
-- 
cgit v1.2.3