From 44a6d9c161b3c8e24187790110a5b3c040bff522 Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Mon, 24 Feb 2014 12:57:51 +0100
Subject: Remove the new added allow-applified key, it's moved to shared
 schemas, that way the other desktop components don't need to depends on
 indicator-sound only to read that settings

---
 data/com.canonical.indicator.sound.gschema.xml | 4 ----
 debian/control                                 | 1 +
 src/service.vala                               | 4 +++-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/data/com.canonical.indicator.sound.gschema.xml b/data/com.canonical.indicator.sound.gschema.xml
index be759fa..102a1db 100644
--- a/data/com.canonical.indicator.sound.gschema.xml
+++ b/data/com.canonical.indicator.sound.gschema.xml
@@ -48,9 +48,5 @@
         Whether or not to show the sound indicator in the menu bar.
       </description>
     </key>
-    <key name="allow-amplified-volume" type="b">
-      <default>false</default>
-      <summary>Whether the volume slider allows setting the volume above 100%</summary>
-    </key>
   </schema>
 </schemalist>
diff --git a/debian/control b/debian/control
index ef7d463..c7b3ed8 100644
--- a/debian/control
+++ b/debian/control
@@ -31,6 +31,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          pulseaudio,
+         gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140224),
 Recommends: unity-control-center | gnome-control-center | ubuntu-system-settings | pavucontrol,
 Description: System sound indicator.
  System sound indicator which provides easy control of the PulseAudio sound 
diff --git a/src/service.vala b/src/service.vala
index b1b5ba9..22e5f1c 100644
--- a/src/service.vala
+++ b/src/service.vala
@@ -20,6 +20,7 @@
 public class IndicatorSound.Service: Object {
 	public Service () {
 		this.settings = new Settings ("com.canonical.indicator.sound");
+		this.sharedsettings = new Settings ("com.ubuntu.sound");
 
 		this.volume_control = new VolumeControl ();
 
@@ -55,7 +56,7 @@ public class IndicatorSound.Service: Object {
 			}
 		}
 
-		settings.bind ("allow-amplified-volume", this, "allow-amplified-volume", SettingsBindFlags.GET);
+		sharedsettings.bind ("allow-amplified-volume", this, "allow-amplified-volume", SettingsBindFlags.GET);
 	}
 
 	public int run () {
@@ -103,6 +104,7 @@ public class IndicatorSound.Service: Object {
 	SimpleActionGroup actions;
 	HashTable<string, SoundMenu> menus;
 	Settings settings;
+	Settings sharedsettings;
 	VolumeControl volume_control;
 	MediaPlayerList players;
 	uint player_action_update_id;
-- 
cgit v1.2.3