aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2018-03-26 16:07:14 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-03-26 21:07:40 +0000
commitd423c4a5492cb6ef92e6ee295b30ce9095b53c0c (patch)
tree565e3a5b18dd45c8de7a0d7ec5bda3766e89e445
parenta1d3f81143fa304f04902dec217a2e8d2bbb6466 (diff)
downloadayatana-indicator-datetime-d423c4a5492cb6ef92e6ee295b30ce9095b53c0c.tar.gz
ayatana-indicator-datetime-d423c4a5492cb6ef92e6ee295b30ce9095b53c0c.tar.bz2
ayatana-indicator-datetime-d423c4a5492cb6ef92e6ee295b30ce9095b53c0c.zip
use @FOO@ intead of ${FOO} for variable substitution when configuring files
-rw-r--r--data/org.ayatana.indicator.datetime.gschema.xml.in.in4
-rw-r--r--tests/test-eds-ics-missing-trigger.ics.in4
-rw-r--r--tests/test-eds-ics-nonrepeating-events.ics.in2
-rw-r--r--tests/test-eds-ics-repeating-events.ics.in2
4 files changed, 6 insertions, 6 deletions
diff --git a/data/org.ayatana.indicator.datetime.gschema.xml.in.in b/data/org.ayatana.indicator.datetime.gschema.xml.in.in
index 36e0641..7899389 100644
--- a/data/org.ayatana.indicator.datetime.gschema.xml.in.in
+++ b/data/org.ayatana.indicator.datetime.gschema.xml.in.in
@@ -132,14 +132,14 @@
</description>
</key>
<key name="calendar-default-sound" type="s">
- <default>'${CALENDAR_DEFAULT_SOUND}'</default>
+ <default>'@CALENDAR_DEFAULT_SOUND@'</default>
<_summary>The calendar's default sound file.</_summary>
<_description>
If a calendar or reminder event doesn't specify its own sound file, this file will be used as the fallback sound.
</_description>
</key>
<key name="alarm-default-sound" type="s">
- <default>'${ALARM_DEFAULT_SOUND}'</default>
+ <default>'@ALARM_DEFAULT_SOUND@'</default>
<summary>The alarm's default sound file.</summary>
<description>
If an alarm doesn't specify its own sound file, this file will be used as the fallback sound.
diff --git a/tests/test-eds-ics-missing-trigger.ics.in b/tests/test-eds-ics-missing-trigger.ics.in
index 6e10568..0b7881f 100644
--- a/tests/test-eds-ics-missing-trigger.ics.in
+++ b/tests/test-eds-ics-missing-trigger.ics.in
@@ -14,7 +14,7 @@ LAST-MODIFIED:20150617T211838Z
BEGIN:VALARM
X-EVOLUTION-ALARM-UID:20150617T211838Z-6217-32011-2036-2@ubuntu-phablet
ACTION:AUDIO
-ATTACH:file://${ALARM_DEFAULT_SOUND}
+ATTACH:file://@ALARM_DEFAULT_SOUND@
END:VALARM
BEGIN:VALARM
X-EVOLUTION-ALARM-UID:20150617T211838Z-6217-32011-2036-3@ubuntu-phablet
@@ -34,7 +34,7 @@ LAST-MODIFIED:20150617T211913Z
BEGIN:VALARM
X-EVOLUTION-ALARM-UID:20150617T211913Z-6217-32011-2036-6@ubuntu-phablet
ACTION:AUDIO
-ATTACH:file://${ALARM_DEFAULT_SOUND}
+ATTACH:file://@ALARM_DEFAULT_SOUND@
END:VALARM
BEGIN:VALARM
X-EVOLUTION-ALARM-UID:20150617T211913Z-6217-32011-2036-7@ubuntu-phablet
diff --git a/tests/test-eds-ics-nonrepeating-events.ics.in b/tests/test-eds-ics-nonrepeating-events.ics.in
index 89c74ac..be95ed1 100644
--- a/tests/test-eds-ics-nonrepeating-events.ics.in
+++ b/tests/test-eds-ics-nonrepeating-events.ics.in
@@ -14,7 +14,7 @@ LAST-MODIFIED:20150520T223932Z
BEGIN:VALARM
X-EVOLUTION-ALARM-UID:20150520T223932Z-22506-32011-1771-2@ubuntu-phablet
ACTION:AUDIO
-ATTACH:file://${ALARM_DEFAULT_SOUND}
+ATTACH:file://@ALARM_DEFAULT_SOUND@
TRIGGER;VALUE=DURATION;RELATED=START:PT0S
END:VALARM
BEGIN:VALARM
diff --git a/tests/test-eds-ics-repeating-events.ics.in b/tests/test-eds-ics-repeating-events.ics.in
index 23ebf31..7c728c6 100644
--- a/tests/test-eds-ics-repeating-events.ics.in
+++ b/tests/test-eds-ics-repeating-events.ics.in
@@ -15,7 +15,7 @@ LAST-MODIFIED:20150507T211449Z
BEGIN:VALARM
X-EVOLUTION-ALARM-UID:20150507T211449Z-4262-32011-1418-2@ubuntu-phablet
ACTION:AUDIO
-ATTACH:file://${ALARM_DEFAULT_SOUND}
+ATTACH:file://@ALARM_DEFAULT_SOUND@
TRIGGER;VALUE=DURATION;RELATED=START:PT0S
END:VALARM
BEGIN:VALARM