diff options
| author | infirit <[email protected]> | 2015-09-06 21:55:35 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-09-06 21:55:35 +0200 |
| commit | df7a7488950139e3884972e2363294051e33d45d (patch) | |
| tree | c442d94aba98b29a69a743701bf9a7d7a1086950 /geyes | |
| parent | 6bfc67fc80ba929a740d20edd9ba34927dfefafe (diff) | |
| download | mate-applets-df7a7488950139e3884972e2363294051e33d45d.tar.bz2 mate-applets-df7a7488950139e3884972e2363294051e33d45d.tar.xz | |
Rework gsettings schema building
* Bump intltool required version for gsettings support
* Extract strings with intltool directly
* Let autoconf generate the xml files
Diffstat (limited to 'geyes')
| -rw-r--r-- | geyes/Makefile.am | 10 | ||||
| -rw-r--r-- | geyes/org.mate.panel.applet.geyes.gschema.xml.in (renamed from geyes/org.mate.panel.applet.geyes.gschema.xml.in.in) | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/geyes/Makefile.am b/geyes/Makefile.am index 09eaabf0..f8bb8c28 100644 --- a/geyes/Makefile.am +++ b/geyes/Makefile.am @@ -46,12 +46,10 @@ uidir = $(datadir)/mate/ui ui_DATA = geyes-applet-menu.xml @INTLTOOL_XML_NOMERGE_RULE@ -gsettings_SCHEMAS = org.mate.panel.applet.geyes.gschema.xml +geyes_gschema_in_files = org.mate.panel.applet.geyes.gschema.xml.in +gsettings_SCHEMAS = $(geyes_gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ - themesdir = $(pkgdatadir)/geyes icons = \ @@ -61,13 +59,13 @@ icons = \ mate-eyes-applet.22.png \ mate-eyes-applet.16.png -CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) *.gschema.valid +CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid EXTRA_DIST = \ README.themes \ org.mate.applets.GeyesApplet.mate-panel-applet.in.in \ $(service_in_files) \ - $(gsettings_SCHEMAS).in.in \ + $(geyes_gschema_in_files) \ $(ui_DATA) \ $(icons) diff --git a/geyes/org.mate.panel.applet.geyes.gschema.xml.in.in b/geyes/org.mate.panel.applet.geyes.gschema.xml.in index c551fb6a..aad28f71 100644 --- a/geyes/org.mate.panel.applet.geyes.gschema.xml.in.in +++ b/geyes/org.mate.panel.applet.geyes.gschema.xml.in @@ -2,8 +2,8 @@ <schema id="org.mate.panel.applet.geyes"> <key name="theme-path" type="s"> <default>''</default> - <_summary>Directory in which the theme is located</_summary> - <_description>Directory in which the theme is located</_description> + <summary>Directory in which the theme is located</summary> + <description>Directory in which the theme is located</description> </key> </schema> </schemalist> |