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 /mate-window-picker-applet | |
| 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 'mate-window-picker-applet')
| -rw-r--r-- | mate-window-picker-applet/Makefile.am | 11 | ||||
| -rw-r--r-- | mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in (renamed from mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in.in) | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/mate-window-picker-applet/Makefile.am b/mate-window-picker-applet/Makefile.am index 0ecd7b4..71bfd50 100644 --- a/mate-window-picker-applet/Makefile.am +++ b/mate-window-picker-applet/Makefile.am @@ -47,14 +47,11 @@ org.mate.panel.applet.MateWindowPickerFactory.service: $(service_in_files) $< > $@ @INTLTOOL_XML_NOMERGE_RULE@ -gsettings_SCHEMAS = org.mate.panel.applet.mate-window-picker-applet.gschema.xml +gsettingsschema_in_files = org.mate.panel.applet.mate-window-picker-applet.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' < $< > $@ - xmluidir = $(datadir)/mate-panel/ui xmlui_DATA = mate-window-picker-applet-menu.xml @@ -63,14 +60,14 @@ EXTRA_DIST = \ $(service_in_files) \ $(ui_DATA) \ $(convert_DATA) \ - $(gsettings_SCHEMAS_in_in) \ + $(gsettingsschema_in_files) \ $(xmlui_DATA) CLEANFILES = \ $(applet_DATA) \ $(applet_DATA).in \ - $(gsettings_SCHEMAS_in) \ $(gsettings_SCHEMAS) \ + *.gschema.valid \ $(service_DATA) clean: diff --git a/mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in.in b/mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in index 88964f1..71f3bd2 100644 --- a/mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in.in +++ b/mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in @@ -2,8 +2,8 @@ <schema id="org.mate.panel.applet.mate-window-picker-applet"> <key name="show-all-windows" type="b"> <default>true</default> - <_summary>Show windows from all workspaces.</_summary> - <_description>Show windows from all workspaces.</_description> + <summary>Show windows from all workspaces.</summary> + <description>Show windows from all workspaces.</description> </key> </schema> </schemalist> |