Merge lp:~alucryd/switchboard-plug-power/fix-1279689 into lp:~elementary-apps/switchboard-plug-power/trunk

Proposed by Maxime Gauduin
Status: Merged
Approved by: Danielle Foré
Approved revision: 104
Merged at revision: 106
Proposed branch: lp:~alucryd/switchboard-plug-power/fix-1279689
Merge into: lp:~elementary-apps/switchboard-plug-power/trunk
Diff against target: 21 lines (+1/-5)
1 file modified
src/Plug.vala (+1/-5)
To merge this branch: bzr merge lp:~alucryd/switchboard-plug-power/fix-1279689
Reviewer Review Type Date Requested Status
Danielle Foré Approve
Review via email: mp+208943@code.launchpad.net

Commit message

Remove use of deprecated 'lid-close-ac-action' gsettings key

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Plug.vala'
2--- src/Plug.vala 2014-01-06 22:59:56 +0000
3+++ src/Plug.vala 2014-03-01 20:52:33 +0000
4@@ -128,10 +128,6 @@
5 grid.attach (scale_label, 0, 0, 1, 1);
6 grid.attach (scale, 1, 0, 1, 1);
7
8- var lid_closed_box = new ComboBox (_("When the lid is closed:"), @"lid-close-$type-action");
9- grid.attach (lid_closed_box.label, 0, 1, 1, 1);
10- grid.attach (lid_closed_box, 1, 1, 1, 1);
11-
12 if (type != "ac") {
13 var critical_box = new ComboBox (_("When battery power is critically low:"), "critical-battery-action");
14 grid.attach (critical_box.label, 0, 2, 1, 1);
15@@ -161,4 +157,4 @@
16 debug ("Activating Power plug");
17 var plug = new Power.Plug ();
18 return plug;
19-}
20\ No newline at end of file
21+}

Subscribers

People subscribed via source and target branches

to all changes: