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

Proposed by Ritesh Khadgaray on 2012-04-16
Status: Merged
Merge reported by: Robert Ancell
Merged at revision: not available
Proposed branch: lp:~khadgaray/unity-greeter/fix-lp949782
Merge into: lp:unity-greeter
Diff against target: 40 lines (+8/-1)
3 files modified
data/com.canonical.unity-greeter.gschema.xml (+4/-0)
src/settings.vala (+1/-0)
src/unity-greeter.vala (+3/-1)
To merge this branch: bzr merge lp:~khadgaray/unity-greeter/fix-lp949782
Reviewer Review Type Date Requested Status
Robert Ancell 2012-04-16 Approve on 2012-04-17
Review via email: mp+102065@code.launchpad.net

Description of the change

fix lp949782 - No way to disable start-up sound

To post a comment you must log in.
Robert Ancell (robert-ancell) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/com.canonical.unity-greeter.gschema.xml'
2--- data/com.canonical.unity-greeter.gschema.xml 2012-03-01 14:17:05 +0000
3+++ data/com.canonical.unity-greeter.gschema.xml 2012-04-16 08:26:28 +0000
4@@ -74,5 +74,9 @@
5 <default>false</default>
6 <summary>Whether to enable the screen reader</summary>
7 </key>
8+ <key name="sound-system-ready" type="b">
9+ <default>true</default>
10+ <summary>Whether to play sound when greeter is ready</summary>
11+ </key>
12 </schema>
13 </schemalist>
14
15=== modified file 'src/settings.vala'
16--- src/settings.vala 2012-03-01 14:17:05 +0000
17+++ src/settings.vala 2012-04-16 08:26:28 +0000
18@@ -35,6 +35,7 @@
19 public static const string KEY_ONSCREEN_KEYBOARD = "onscreen-keyboard";
20 public static const string KEY_HIGH_CONTRAST = "high-contrast";
21 public static const string KEY_SCREEN_READER = "screen-reader";
22+ public static const string KEY_SOUND_SYSTEM_READY = "sound-system-ready";
23
24 public static bool get_boolean (string key)
25 {
26
27=== modified file 'src/unity-greeter.vala'
28--- src/unity-greeter.vala 2012-03-27 06:00:03 +0000
29+++ src/unity-greeter.vala 2012-04-16 08:26:28 +0000
30@@ -311,7 +311,9 @@
31
32 /* Launch canberra */
33 Canberra.Context.create (out canberra_context);
34- canberra_context.play (0,
35+
36+ if (UGSettings.get_boolean (UGSettings.KEY_SOUND_SYSTEM_READY))
37+ canberra_context.play (0,
38 Canberra.PROP_CANBERRA_XDG_THEME_NAME,
39 "ubuntu",
40 Canberra.PROP_EVENT_ID,

Subscribers

People subscribed via source and target branches