summaryrefslogtreecommitdiff
path: root/timerapplet
diff options
context:
space:
mode:
authorinfirit <[email protected]>2015-09-06 21:55:35 +0200
committerinfirit <[email protected]>2015-09-06 21:55:35 +0200
commitdf7a7488950139e3884972e2363294051e33d45d (patch)
treec442d94aba98b29a69a743701bf9a7d7a1086950 /timerapplet
parent6bfc67fc80ba929a740d20edd9ba34927dfefafe (diff)
downloadmate-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 'timerapplet')
-rw-r--r--timerapplet/Makefile.am10
-rw-r--r--timerapplet/org.mate.panel.applet.timer.gschema.xml.in (renamed from timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in)8
2 files changed, 8 insertions, 10 deletions
diff --git a/timerapplet/Makefile.am b/timerapplet/Makefile.am
index 5ace281b..bc276f69 100644
--- a/timerapplet/Makefile.am
+++ b/timerapplet/Makefile.am
@@ -33,15 +33,13 @@ org.mate.panel.applet.TimerAppletFactory.service: $(service_in_files)
$< > $@
@INTLTOOL_XML_NOMERGE_RULE@
-gsettings_SCHEMAS = org.mate.panel.applet.timer.gschema.xml
+timer_gschema_in_files = org.mate.panel.applet.timer.gschema.xml.in
+gsettings_SCHEMAS = $(timer_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' < $< > $@
-
EXTRA_DIST = \
$(applets_in_files).in \
$(service_in_files) \
- $(gsettings_SCHEMAS).in.in
+ $(timer_gschema_in_files)
-CLEANFILES = $(applets_DATA) $(applets_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) *.gschema.valid
+CLEANFILES = $(applets_DATA) $(applets_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
diff --git a/timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in b/timerapplet/org.mate.panel.applet.timer.gschema.xml.in
index 8e2b40b9..1201c8a6 100644
--- a/timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in
+++ b/timerapplet/org.mate.panel.applet.timer.gschema.xml.in
@@ -2,19 +2,19 @@
<schema id="org.mate.panel.applet.timer">
<key name="name" type="s">
<default>'Timer'</default>
- <_summary>Name of timer</_summary>
+ <summary>Name of timer</summary>
</key>
<key name="duration" type="i">
<default>10</default>
- <_summary>Duration of timer in seconds</_summary>
+ <summary>Duration of timer in seconds</summary>
</key>
<key name="show-notification" type="b">
<default>true</default>
- <_summary>Show notification popup when timer finish</_summary>
+ <summary>Show notification popup when timer finish</summary>
</key>
<key name="show-dialog" type="b">
<default>false</default>
- <_summary>Show dialog window when timer finish</_summary>
+ <summary>Show dialog window when timer finish</summary>
</key>
</schema>
</schemalist>