From 3a1bf21052b1f9939ef574a4dfa6d4c1fe74df5d Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Tue, 10 Jan 2012 18:04:50 +0100
Subject: 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.
---
 data/Makefile.am                                |  2 +-
 data/com.canonical.indicator.sound.gschema.xml  | 38 +++++++++++++++++++++++++
 data/com.canonical.indicators.sound.gschema.xml | 38 -------------------------
 data/indicator-sound.service.in                 |  2 +-
 4 files changed, 40 insertions(+), 40 deletions(-)
 create mode 100644 data/com.canonical.indicator.sound.gschema.xml
 delete mode 100644 data/com.canonical.indicators.sound.gschema.xml

(limited to 'data')

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.indicator.sound.gschema.xml b/data/com.canonical.indicator.sound.gschema.xml
new file mode 100644
index 0000000..5d3fea8
--- /dev/null
+++ b/data/com.canonical.indicator.sound.gschema.xml
@@ -0,0 +1,38 @@
+<schemalist>
+  <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>
+      <description>
+        Each media player which abides by the MPRIS2 spec will automatically appear in the menu.
+        This array should contain the desktop file names (minus .desktop suffix) of applications which
+        do not want to be included in the sound menu.
+      </description>
+    </key>
+    <key name="interested-media-players" type="as">
+      <summary>A list of applications which at some point have registered with the sound menu</summary>
+      <default>[ 'banshee' ]</default>
+      <description>
+        Each media player which abides by the MPRIS2 spec will automatically appear in the menu.
+        This array should contain the desktop file names (minus .desktop suffix) of applications which
+        have at some point appeared in the menU. This allows the menu remember and display offlined applications.
+      </description>
+    </key>
+    <key name="global-mute" type="b">
+      <default>false</default>
+      <summary>Initial setting for global mute (mute all) on the menu </summary>
+      <description>
+        On start up volume should not be muted.
+      </description>
+    </key>
+    <key name="show-notify-osd-on-scroll" type="b">
+      <default>true</default>
+      <summary>Initial setting for showing notify-osd notification on scroll volume-change</summary>
+      <description>
+        When using the mouse scroll-wheel over the indicator-sound icon, the volume changes.
+        Enabling this setting, every scroll volume-change a notify-osd bubble with the
+        updated volume value will be shown (if supported by your notification daemon).
+      </description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/com.canonical.indicators.sound.gschema.xml b/data/com.canonical.indicators.sound.gschema.xml
deleted file mode 100644
index dc63bcb..0000000
--- a/data/com.canonical.indicators.sound.gschema.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<schemalist>
-  <schema id="com.canonical.indicators.sound" path="/apps/indicators/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>
-      <description>
-        Each media player which abides by the MPRIS2 spec will automatically appear in the menu.
-        This array should contain the desktop file names (minus .desktop suffix) of applications which
-        do not want to be included in the sound menu.
-      </description>
-    </key>
-    <key name="interested-media-players" type="as">
-      <summary>A list of applications which at some point have registered with the sound menu</summary>
-      <default>[ 'banshee' ]</default>
-      <description>
-        Each media player which abides by the MPRIS2 spec will automatically appear in the menu.
-        This array should contain the desktop file names (minus .desktop suffix) of applications which
-        have at some point appeared in the menU. This allows the menu remember and display offlined applications.
-      </description>
-    </key>
-    <key name="global-mute" type="b">
-      <default>false</default>
-      <summary>Initial setting for global mute (mute all) on the menu </summary>
-      <description>
-        On start up volume should not be muted.
-      </description>
-    </key>
-    <key name="show-notify-osd-on-scroll" type="b">
-      <default>true</default>
-      <summary>Initial setting for showing notify-osd notification on scroll volume-change</summary>
-      <description>
-        When using the mouse scroll-wheel over the indicator-sound icon, the volume changes.
-        Enabling this setting, every scroll volume-change a notify-osd bubble with the
-        updated volume value will be shown (if supported by your notification daemon).
-      </description>
-    </key>
-  </schema>
-</schemalist>
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
-- 
cgit v1.2.3