diff options
| author | infirit <[email protected]> | 2015-09-08 12:39:43 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-09-08 12:39:43 +0200 |
| commit | ddf66032a7375c70befe4a0d72ba04d7bc6b0f15 (patch) | |
| tree | f6cc61780b35fa67e7b1cf54e318a3ecb449804b /maximus | |
| parent | eb03540f077e40956544234451975001ab2fa4f0 (diff) | |
| download | mate-netbook-ddf66032a7375c70befe4a0d72ba04d7bc6b0f15.tar.bz2 mate-netbook-ddf66032a7375c70befe4a0d72ba04d7bc6b0f15.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 'maximus')
| -rw-r--r-- | maximus/Makefile.am | 13 | ||||
| -rw-r--r-- | maximus/org.mate.maximus.gschema.xml.in | 24 | ||||
| -rw-r--r-- | maximus/org.mate.maximus.gschema.xml.in.in | 24 |
3 files changed, 28 insertions, 33 deletions
diff --git a/maximus/Makefile.am b/maximus/Makefile.am index b1994a4..3326b6b 100644 --- a/maximus/Makefile.am +++ b/maximus/Makefile.am @@ -31,14 +31,11 @@ mate_maximus_SOURCES = \ xutils.h @INTLTOOL_XML_NOMERGE_RULE@ -gsettings_SCHEMAS = org.mate.maximus.gschema.xml +gsettingsschema_in_files = org.mate.maximus.gschema.xml.in -gsettings_SCHEMAS_in_in = $(gsettings_SCHEMAS:.xml=.xml.in.in) +gsettings_SCHEMAS = $(gsettingsschema_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' < $< > $@ - convertdir = $(datadir)/MateConf/gsettings convert_DATA = mate-maximus.convert @@ -47,8 +44,6 @@ dist_desktop_DATA=mate-maximus-autostart.desktop man_MANS = mate-maximus.1 -CLEANFILES = $(gsettings_SCHEMAS) \ - $(gsettings_SCHEMAS_in) - +CLEANFILES = $(gsettings_SCHEMAS) *.gschema.valid -EXTRA_DIST = $(gsettings_SCHEMAS_in_in) $(convert_DATA) $(man_MANS) +EXTRA_DIST = $(gsettingsschema_in_files) $(convert_DATA) $(man_MANS) diff --git a/maximus/org.mate.maximus.gschema.xml.in b/maximus/org.mate.maximus.gschema.xml.in new file mode 100644 index 0000000..0fde1cc --- /dev/null +++ b/maximus/org.mate.maximus.gschema.xml.in @@ -0,0 +1,24 @@ +<schemalist gettext-domain="@GETTEXT_PACKAGE@"> + <schema id="org.mate.maximus" path="/org/mate/maximus/"> + <key name="exclude-class" type="as"> + <default>[ 'Totem' ]</default> + <summary>A list of exclusion strings which apply to the window class.</summary> + <description>A list of exclusion strings which apply to the window class</description> + </key> + <key name="binding" type="s"> + <default>'disabled'</default> + <summary>A binding</summary> + <description>A binding</description> + </key> + <key name="undecorate" type="b"> + <default>false</default> + <summary>Undecorate windows when maximized</summary> + <description>Undecorate windows when maximized</description> + </key> + <key name="no-maximize" type="b"> + <default>true</default> + <summary>Do not automatically maximize newly opened windows</summary> + <description>Do not automatically maximize newly opened windows. If undecorate is set, will still undecorate maximised windows.</description> + </key> + </schema> +</schemalist> diff --git a/maximus/org.mate.maximus.gschema.xml.in.in b/maximus/org.mate.maximus.gschema.xml.in.in deleted file mode 100644 index 8f0c635..0000000 --- a/maximus/org.mate.maximus.gschema.xml.in.in +++ /dev/null @@ -1,24 +0,0 @@ -<schemalist gettext-domain="@GETTEXT_PACKAGE@"> - <schema id="org.mate.maximus" path="/org/mate/maximus/"> - <key name="exclude-class" type="as"> - <default>[ 'Totem' ]</default> - <_summary>A list of exclusion strings which apply to the window class.</_summary> - <_description>A list of exclusion strings which apply to the window class</_description> - </key> - <key name="binding" type="s"> - <default>'disabled'</default> - <_summary>A binding</_summary> - <_description>A binding</_description> - </key> - <key name="undecorate" type="b"> - <default>false</default> - <_summary>Undecorate windows when maximized</_summary> - <_description>Undecorate windows when maximized</_description> - </key> - <key name="no-maximize" type="b"> - <default>true</default> - <_summary>Do not automatically maximize newly opened windows</_summary> - <_description>Do not automatically maximize newly opened windows. If undecorate is set, will still undecorate maximised windows.</_description> - </key> - </schema> -</schemalist> |