14 files changed, 76 insertions, 70 deletions
diff --git a/data/50-com.canonical.indicator.sound.AccountsService.pkla b/data/50-com.canonical.indicator.sound.AccountsService.pkla
deleted file mode 100644
index bbcca1e..0000000
--- a/data/50-com.canonical.indicator.sound.AccountsService.pkla
+++ /dev/null
@@ -1,6 +0,0 @@
-[Allow LightDM to set Unity AccountsService fields]
-Identity=unix-user:lightdm
-Action=com.canonical.indicator.sound.AccountsService.ModifyAnyUser
-ResultActive=yes
-ResultInactive=yes
-ResultAny=yes
diff --git a/data/50-org.ayatana.indicator.sound.AccountsService.pkla b/data/50-org.ayatana.indicator.sound.AccountsService.pkla
new file mode 100644
index 0000000..c1da70f
--- /dev/null
+++ b/data/50-org.ayatana.indicator.sound.AccountsService.pkla
@@ -0,0 +1,6 @@
+[Allow LightDM to set AccountsService fields]
+Identity=unix-user:lightdm
+Action=org.ayatana.indicator.sound.AccountsService.ModifyAnyUser
+ResultActive=yes
+ResultInactive=yes
+ResultAny=yes
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 8e0ba0d..270e00d 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -7,12 +7,12 @@ find_package(GSettings)
 
 set(
   INDICATOR_DIR
-  "${CMAKE_INSTALL_DATADIR}/unity/indicators"
-  CACHE FILEPATH "Indicator directory"
+  "${CMAKE_INSTALL_DATADIR}/ayatana/indicators"
+  CACHE FILEPATH "Ayatana Indicators Directory"
 )
 
 install(
-  FILES "com.canonical.indicator.sound"
+  FILES "org.ayatana.indicator.sound"
   DESTINATION "${INDICATOR_DIR}"
 )
 
@@ -21,9 +21,7 @@ install(
 ###########################
 
 # where to install
-# Uncomment when we drop Vivid
-# pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)
-set (SYSTEMD_USER_DIR "/usr/lib/systemd/user")
+pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)
 message (STATUS "${SYSTEMD_USER_DIR} is the systemd user unit file install dir")
 
 set (SYSTEMD_USER_NAME "${CMAKE_PROJECT_NAME}.service")
@@ -54,11 +52,11 @@ install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.override"
 
 set(
   INDICATOR_SOUND_CONF
-  "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.conf"
+  "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-sound.conf"
 )
 
 configure_file(
-  "indicator-sound.conf.in"
+  "ayatana-indicator-sound.conf.in"
   ${INDICATOR_SOUND_CONF}
   @ONLY
 )
@@ -72,7 +70,7 @@ install(
 # GSettings
 ###########################
 
-add_schema ("com.canonical.indicator.sound.gschema.xml")
+add_schema ("org.ayatana.indicator.sound.gschema.xml")
 
 ###########################
 # Accounts Service
@@ -84,24 +82,20 @@ set(POLKIT_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/polkit-1")
 set(DBUS_IFACE_DIR "${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces")
 set(ACCOUNTS_IFACE_DIR "${CMAKE_INSTALL_PREFIX}/share/accountsservice/interfaces")
 
-install(FILES com.canonical.indicator.sound.AccountsService.xml
+install(FILES org.ayatana.indicator.sound.AccountsService.xml
 	DESTINATION "${DBUS_IFACE_DIR}"
 )
 
 # Create accountsservice symlink for above dbus interface
 install(CODE "
 	execute_process(COMMAND mkdir -p \"\$ENV{DESTDIR}${ACCOUNTS_IFACE_DIR}\")
-	execute_process(COMMAND ln -sf ../../dbus-1/interfaces/com.canonical.indicator.sound.AccountsService.xml \"\$ENV{DESTDIR}${ACCOUNTS_IFACE_DIR}\")
+	execute_process(COMMAND ln -sf ../../dbus-1/interfaces/org.ayatana.indicator.sound.AccountsService.xml \"\$ENV{DESTDIR}${ACCOUNTS_IFACE_DIR}\")
 ")
 
-install(FILES com.canonical.indicator.sound.AccountsService.policy
+install(FILES org.ayatana.indicator.sound.AccountsService.policy
 DESTINATION "${POLKIT_DATA_DIR}/actions"
 )
 
-install(FILES 50-com.canonical.indicator.sound.AccountsService.pkla
+install(FILES 50-org.ayatana.indicator.sound.AccountsService.pkla
 DESTINATION "${POLKIT_LIB_DIR}/localauthority/10-vendor.d"
 )
-
-
-
-
diff --git a/data/ayatana-indicator-sound.conf.in b/data/ayatana-indicator-sound.conf.in
new file mode 100644
index 0000000..827b252
--- /dev/null
+++ b/data/ayatana-indicator-sound.conf.in
@@ -0,0 +1,9 @@
+description "Ayatana Indicator Sound Service"
+
+start on ayatana-indicator-services-start
+stop on desktop-end or ayatana-indicator-services-end
+
+respawn
+respawn limit 30 10
+
+exec $SNAP@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-sound/ayatana-indicator-sound-service
diff --git a/data/indicator-sound.override b/data/ayatana-indicator-sound.override
index 2905494..2905494 100644
--- a/data/indicator-sound.override
+++ b/data/ayatana-indicator-sound.override
diff --git a/data/ayatana-indicator-sound.service.in b/data/ayatana-indicator-sound.service.in
new file mode 100644
index 0000000..afb6b28
--- /dev/null
+++ b/data/ayatana-indicator-sound.service.in
@@ -0,0 +1,8 @@
+[Unit]
+Description=Ayatana Indicator Sound Service
+PartOf=graphical-session.target
+After=ayatana-indicators-pre.target
+
+[Service]
+ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-sound/ayatana-indicator-sound-service
+Restart=on-failure
diff --git a/data/com.canonical.indicator.sound b/data/com.canonical.indicator.sound
deleted file mode 100644
index ae31770..0000000
--- a/data/com.canonical.indicator.sound
+++ /dev/null
@@ -1,23 +0,0 @@
-[Indicator Service]
-Name=indicator-sound
-ObjectPath=/com/canonical/indicator/sound
-Position=30
-
-[desktop]
-ObjectPath=/com/canonical/indicator/sound/desktop
-
-[phone]
-ObjectPath=/com/canonical/indicator/sound/phone
-
-[desktop_greeter]
-ObjectPath=/com/canonical/indicator/sound/desktop_greeter
-
-[desktop_lockscreen]
-ObjectPath=/com/canonical/indicator/sound/desktop_greeter
-
-[ubiquity]
-ObjectPath=/com/canonical/indicator/sound/desktop_greeter
-
-[phone_greeter]
-ObjectPath=/com/canonical/indicator/sound/phone_greeter
-
diff --git a/data/indicator-sound.conf.in b/data/indicator-sound.conf.in
deleted file mode 100644
index eb5f6a1..0000000
--- a/data/indicator-sound.conf.in
+++ /dev/null
@@ -1,9 +0,0 @@
-description "Indicator Sound Service"
-
-start on indicator-services-start
-stop on desktop-end or indicator-services-end
-
-respawn
-respawn limit 30 10
-
-exec $SNAP@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
diff --git a/data/indicator-sound.service.in b/data/indicator-sound.service.in
deleted file mode 100644
index d0f6216..0000000
--- a/data/indicator-sound.service.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Indicator Sound Service
-PartOf=graphical-session.target
-After=indicators-pre.target
-
-[Service]
-ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
-Restart=on-failure
diff --git a/data/org.ayatana.indicator.sound b/data/org.ayatana.indicator.sound
new file mode 100644
index 0000000..f57d9d6
--- /dev/null
+++ b/data/org.ayatana.indicator.sound
@@ -0,0 +1,22 @@
+[Indicator Service]
+Name=indicator-sound
+ObjectPath=/org/ayatana/indicator/sound
+Position=30
+
+[desktop]
+ObjectPath=/org/ayatana/indicator/sound/desktop
+
+[phone]
+ObjectPath=/org/ayatana/indicator/sound/phone
+
+[desktop_greeter]
+ObjectPath=/org/ayatana/indicator/sound/desktop_greeter
+
+[desktop_lockscreen]
+ObjectPath=/org/ayatana/indicator/sound/desktop_greeter
+
+[ubiquity]
+ObjectPath=/org/ayatana/indicator/sound/desktop_greeter
+
+[phone_greeter]
+ObjectPath=/org/ayatana/indicator/sound/phone_greeter
diff --git a/data/com.canonical.indicator.sound.AccountsService.policy b/data/org.ayatana.indicator.sound.AccountsService.policy
index 4d0ee75..28e15c1 100644
--- a/data/com.canonical.indicator.sound.AccountsService.policy
+++ b/data/org.ayatana.indicator.sound.AccountsService.policy
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <policyconfig>
-        <action id="com.canonical.indicator.sound.AccountsService.ModifyOwnUser">
+        <action id="org.ayatana.indicator.sound.AccountsService.ModifyOwnUser">
                 <description>Set properties of own user</description>
                 <message>Authentication is required to set one's own indicator sound properties.</message>
                 <defaults>
@@ -11,7 +11,7 @@
                 </defaults>
         </action>
 
-        <action id="com.canonical.indicator.sound.AccountsService.ModifyAnyUser">
+        <action id="org.ayatana.indicator.sound.AccountsService.ModifyAnyUser">
                 <description>Set properties of any user</description>
                 <message>Authentication is required to set another user's indicator sound properties.</message>
                 <defaults>
diff --git a/data/com.canonical.indicator.sound.AccountsService.xml b/data/org.ayatana.indicator.sound.AccountsService.xml
index fb7e96f..7a8c2bd 100644
--- a/data/com.canonical.indicator.sound.AccountsService.xml
+++ b/data/org.ayatana.indicator.sound.AccountsService.xml
@@ -1,16 +1,16 @@
 <node>
-  <interface name="com.canonical.indicator.sound.AccountsService">
+  <interface name="org.ayatana.indicator.sound.AccountsService">
 
     <annotation name="org.freedesktop.Accounts.VendorExtension" value="true"/>
 
     <annotation name="org.freedesktop.Accounts.Authentication.ChangeOwn"
-                value="com.canonical.indicator.sound.AccountsService.ModifyOwnUser"/>
+                value="org.ayatana.indicator.sound.AccountsService.ModifyOwnUser"/>
 
     <annotation name="org.freedesktop.Accounts.Authentication.ReadAny"
-                value="com.canonical.indicator.sound.AccountsService.ModifyAnyUser"/>
+                value="org.ayatana.indicator.sound.AccountsService.ModifyAnyUser"/>
 
     <annotation name="org.freedesktop.Accounts.Authentication.ChangeAny"
-                value="com.canonical.indicator.sound.AccountsService.ModifyAnyUser"/>
+                value="org.ayatana.indicator.sound.AccountsService.ModifyAnyUser"/>
 
     <property name="Timestamp" type="t" access="readwrite">
       <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>
diff --git a/data/com.canonical.indicator.sound.gschema.xml b/data/org.ayatana.indicator.sound.gschema.xml
index 06bfe74..5255358 100644
--- a/data/com.canonical.indicator.sound.gschema.xml
+++ b/data/org.ayatana.indicator.sound.gschema.xml
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema id="com.canonical.indicator.sound" path="/com/canonical/indicator/sound/" gettext-domain="indicator-sound">
+  <schema id="org.ayatana.indicator.sound" path="/org/ayatana/indicator/sound/" gettext-domain="ayatana-indicator-sound">
     <key name="blacklisted-media-players" type="as">
       <summary>A list of applications blacklisted from the sound menu</summary>
       <default>[]</default>
@@ -32,6 +32,10 @@
         On start up volume should not be muted.
       </description>
     </key>
+    <key type="b" name="allow-amplified-volume">
+      <default>false</default>
+      <summary>Whether the volume slider allows setting the volume above 100%</summary>
+    </key>
     <key name="visible" type="b">
       <default>true</default>
       <summary>Whether or not to show the sound indicator in the menu bar.</summary>
diff --git a/data/org.ayatana.sound.gschema.xml b/data/org.ayatana.sound.gschema.xml
new file mode 100644
index 0000000..8c3bd73
--- /dev/null
+++ b/data/org.ayatana.sound.gschema.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist gettext-domain="ayatana-indicator-sound">
+    <schema path="/org/ayatana/sound/" id="org.ayatana.sound">
+    <key type="b" name="allow-amplified-volume">
+      <default>false</default>
+      <summary>Whether the volume slider allows setting the volume above 100%</summary>
+    </key>
+    </schema>
+</schemalist>