Merge lp:~khadgaray/unity-greeter/fix-lp949782 into lp:unity-greeter

[Ritesh Khadgaray]

fix lp949782 - No way to disable start-up sound

[Robert Ancell (robert-ancell)]

Committed with the following changes:
- Change setting name from "sound-system-ready" to "play-ready-sound"
- Replacement of tab character with spaces in src/unity-greeter.vala

review: Approve

=== modified file 'data/com.canonical.unity-greeter.gschema.xml'
--- data/com.canonical.unity-greeter.gschema.xml	2012-03-01 14:17:05 +0000
+++ data/com.canonical.unity-greeter.gschema.xml	2012-04-16 08:26:28 +0000
@@ -74,5 +74,9 @@
       <default>false</default>
       <summary>Whether to enable the screen reader</summary>
     </key>
+    <key name="sound-system-ready" type="b">
+      <default>true</default>
+      <summary>Whether to play sound when greeter is ready</summary>
+    </key>
   </schema>
 </schemalist>

=== modified file 'src/settings.vala'
--- src/settings.vala	2012-03-01 14:17:05 +0000
+++ src/settings.vala	2012-04-16 08:26:28 +0000
@@ -35,6 +35,7 @@
     public static const string KEY_ONSCREEN_KEYBOARD = "onscreen-keyboard";
     public static const string KEY_HIGH_CONTRAST = "high-contrast";
     public static const string KEY_SCREEN_READER = "screen-reader";
+    public static const string KEY_SOUND_SYSTEM_READY = "sound-system-ready";
 
     public static bool get_boolean (string key)
     {

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2012-03-27 06:00:03 +0000
+++ src/unity-greeter.vala	2012-04-16 08:26:28 +0000
@@ -311,7 +311,9 @@
 
         /* Launch canberra */
         Canberra.Context.create (out canberra_context);
-        canberra_context.play (0,
+
+	if (UGSettings.get_boolean (UGSettings.KEY_SOUND_SYSTEM_READY))
+            canberra_context.play (0,
                                Canberra.PROP_CANBERRA_XDG_THEME_NAME,
                                "ubuntu",
                                Canberra.PROP_EVENT_ID,