diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 56 | ||||
| -rw-r--r-- | data/evince.schemas.in | 15 | ||||
| -rw-r--r-- | data/org.gnome.Evince.gschema.xml.in | 9 |
3 files changed, 24 insertions, 56 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 7966025..feb5230 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,8 +1,7 @@ SUBDIRS = icons NULL= -install-data-local: install-schemas update-icon-cache -uninstall-local: uninstall-schemas +install-data-local: update-icon-cache # # man file @@ -49,45 +48,20 @@ $(service_DATA): $(service_in_files) Makefile endif # -# GConf schema +# GSettings schema # -if WITH_GCONF -@INTLTOOL_SCHEMAS_RULE@ - -schema_in_files = evince.schemas.in -schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -install-schemas: $(schema_DATA) -if GCONF_SCHEMAS_INSTALL - if test -z "$(DESTDIR)" ; then \ - for p in $^ ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ - $(GCONFTOOL) \ - --makefile-install-rule \ - $(top_builddir)/data/$$p; \ - done \ - fi -endif - -uninstall-schemas: $(schema_DATA) -if GCONF_SCHEMAS_INSTALL - if test -z "$(DESTDIR)" ; then \ - for p in $^ ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ - $(GCONFTOOL) \ - --makefile-uninstall-rule \ - $(top_builddir)/data/$$p; \ - done \ - fi -endif - -else - -install-schemas: -uninstall-schemas: - +# gsettingsschemadir and gschema_compile are defined by the GLIB_GSETTINGS +# macro in configure.ac +gsettingsschema_in_files = org.gnome.Evince.gschema.xml.in +gsettingsschema_DATA = $(gsettingsschema_in_files:.xml.in=.xml) +@INTLTOOL_XML_NOMERGE_RULE@ +# This rule will check your schemas for validity before installation +# Uncomment when porting is done +# GSETTINGS_CHECK_RULE +if GSETTINGS_SCHEMAS_INSTALL +install-data-hook: + $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --allow-any-name $(DESTDIR)$(gsettingsschemadir) --targetdir=$(DESTDIR)$(gsettingsschemadir) endif # @@ -116,7 +90,7 @@ update-icon-cache: EXTRA_DIST = \ $(ui_DATA) \ $(DESKTOP_IN_FILES) \ - $(schema_in_files) \ + $(gsettingsschema_in_files) \ org.gnome.evince.Daemon.service.in \ $(man_MANS) \ evince.ico \ @@ -128,7 +102,7 @@ EXTRA_DIST = \ DISTCLEANFILES = \ $(DESKTOP_FILES) \ - $(schema_DATA) \ + $(gsettingsschema_DATA) \ $(service_DATA) -include $(top_srcdir)/git.mk diff --git a/data/evince.schemas.in b/data/evince.schemas.in deleted file mode 100644 index cbad422..0000000 --- a/data/evince.schemas.in +++ /dev/null @@ -1,15 +0,0 @@ -<gconfschemafile> - <schemalist> - <schema> - <key>/schemas/apps/evince/override_restrictions</key> - <applyto>/apps/evince/override_restrictions</applyto> - <owner>evince</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Override document restrictions</short> - <long>Override document restrictions, like restriction to copy or to print.</long> - </locale> - </schema> - </schemalist> -</gconfschemafile> diff --git a/data/org.gnome.Evince.gschema.xml.in b/data/org.gnome.Evince.gschema.xml.in new file mode 100644 index 0000000..dfccd85 --- /dev/null +++ b/data/org.gnome.Evince.gschema.xml.in @@ -0,0 +1,9 @@ +<schemalist> + <schema id="org.gnome.Evince" path="/apps/evince/" gettext-domain="evince"> + <key name="override_restrictions" type="b"> + <default>true</default> + <summary>Override document restrictions</summary> + <description>Override document restrictions, like restriction to copy or to print.</description> + </key> + </schema> +</schemalist> |