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/face | |
| 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/face')
| -rw-r--r-- | plugins/face/Makefile.am | 37 | ||||
| -rw-r--r-- | plugins/face/apps_evolution_eplugin_face.schemas.in | 17 |
2 files changed, 1 insertions, 53 deletions
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> |