diff options
| author | Milan Crha <mcrha@redhat.com> | 2012-06-15 15:04:08 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2012-06-15 15:04:08 +0800 |
| commit | 94daae3dba8e86e88f69320bc82795fe660ec9cd (patch) | |
| tree | 9965d4f6dfc6d48adecd0b9084442185d73d58c7 /plugins/templates | |
| parent | 08dedf0a8a520b55c51a8117dc015915ec39f7fe (diff) | |
| download | gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar.gz gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar.bz2 gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar.lz gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar.xz gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar.zst gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.zip | |
Remove the last remaining usage of GConf
Diffstat (limited to 'plugins/templates')
| -rw-r--r-- | plugins/templates/Makefile.am | 35 | ||||
| -rw-r--r-- | plugins/templates/apps-evolution-template-placeholders.schemas.in | 26 |
2 files changed, 1 insertions, 60 deletions
diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am index c899a44368..d4a637d0c3 100644 --- a/plugins/templates/Makefile.am +++ b/plugins/templates/Makefile.am @@ -29,43 +29,10 @@ liborg_gnome_templates_la_LIBADD = \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) -schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_in_files = apps-evolution-template-placeholders.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-templates.eplug.xml \ - $(schema_in_files) +EXTRA_DIST = org-gnome-templates.eplug.xml BUILT_SOURCES = org-gnome-templates.eplug CLEANFILES = $(BUILT_SOURCES) -DISTCLEANFILES = $(schema_DATA) - -include $(top_srcdir)/git.mk diff --git a/plugins/templates/apps-evolution-template-placeholders.schemas.in b/plugins/templates/apps-evolution-template-placeholders.schemas.in deleted file mode 100644 index c6a1f4d07d..0000000000 --- a/plugins/templates/apps-evolution-template-placeholders.schemas.in +++ /dev/null @@ -1,26 +0,0 @@ -<gconfschemafile> - <schemalist> - <schema> - <key>/schemas/apps/evolution/mail/template_placeholders</key> - <applyto>/apps/evolution/mail/template_placeholders</applyto> - <owner>evolution-mail</owner> - <type>list</type> - <list_type>string</list_type> - - <!-- The following are the keyword/value pairs used by the plugin to - substitute the messages stored under the Templates folder. The list can - have any number of such pairs.--> - - <default>[myphone=012345,myplace=Abcd,myname=Alice]</default> - <locale name="C"> - <short>List of keyword/value pairs for the Templates plugin to - substitute in a message body.</short> - <long> - List of keyword/value pairs for the Templates plugin to - substitute in a message body. - </long> - </locale> - </schema> - </schemalist> -</gconfschemafile> - |