aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-01-10 18:04:50 +0100
committerCharles Kerr <charles.kerr@canonical.com>2012-01-10 18:04:50 +0100
commit3a1bf21052b1f9939ef574a4dfa6d4c1fe74df5d (patch)
treec3cf5fe5a75ce639de41befab9cc75da62a89d0b /data
parent3c02b69b2d0801d8a72c6016a41192b601ce4f2f (diff)
downloadayatana-indicator-sound-3a1bf21052b1f9939ef574a4dfa6d4c1fe74df5d.tar.gz
ayatana-indicator-sound-3a1bf21052b1f9939ef574a4dfa6d4c1fe74df5d.tar.bz2
ayatana-indicator-sound-3a1bf21052b1f9939ef574a4dfa6d4c1fe74df5d.zip
make indicator-sound's schema and path naming consistent with other indicators.
indicator-sound uses a different schema prefix ("/com/canonical/indicators" vs "/com/canonical/indicator") and different path prefix ("/apps/indicators" vs "/com/canonical/indicator") than other indicators use. When I asked ronoc about the latter, he confirmed it's an error and suggested that the former be fixed at the same time to make indicator naming more consistent.
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am2
-rw-r--r--data/com.canonical.indicator.sound.gschema.xml (renamed from data/com.canonical.indicators.sound.gschema.xml)2
-rw-r--r--data/indicator-sound.service.in2
3 files changed, 3 insertions, 3 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index f33b470..2891606 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = icons
gsettings_SCHEMAS = \
- com.canonical.indicators.sound.gschema.xml
+ com.canonical.indicator.sound.gschema.xml
@GSETTINGS_RULES@
dbus_servicesdir = $(DBUSSERVICEDIR)
diff --git a/data/com.canonical.indicators.sound.gschema.xml b/data/com.canonical.indicator.sound.gschema.xml
index dc63bcb..5d3fea8 100644
--- a/data/com.canonical.indicators.sound.gschema.xml
+++ b/data/com.canonical.indicator.sound.gschema.xml
@@ -1,5 +1,5 @@
<schemalist>
- <schema id="com.canonical.indicators.sound" path="/apps/indicators/sound/" gettext-domain="indicator-sound">
+ <schema id="com.canonical.indicator.sound" path="/com/canonical/indicator/sound/" gettext-domain="indicator-sound">
<key name="blacklisted-media-players" type="as">
<summary>A list of applications blacklisted from the sound menu</summary>
<default>[]</default>
diff --git a/data/indicator-sound.service.in b/data/indicator-sound.service.in
index a80cd03..4cee062 100644
--- a/data/indicator-sound.service.in
+++ b/data/indicator-sound.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
-Name=com.canonical.indicators.sound
+Name=com.canonical.indicator.sound
Exec=@libexecdir@/indicator-sound-service