=== modified file 'data/com.canonical.unity-greeter.gschema.xml'
--- data/com.canonical.unity-greeter.gschema.xml	2012-03-15 09:37:28 +0000
+++ data/com.canonical.unity-greeter.gschema.xml	2012-03-20 13:45:55 +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-15 09:37:28 +0000
+++ src/settings.vala	2012-03-20 13:43:36 +0000
@@ -35,6 +35,7 @@ public class UGSettings
     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-15 09:37:28 +0000
+++ src/unity-greeter.vala	2012-03-20 13:44:58 +0000
@@ -310,7 +310,9 @@ public class UnityGreeter
 
         /* 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,