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

[Maxime Gauduin]

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

[Danielle Foré (danrabbit)]

review: Approve

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2014-01-06 22:59:56 +0000
+++ src/Plug.vala	2014-03-01 20:52:33 +0000
@@ -128,10 +128,6 @@
 			grid.attach (scale_label, 0, 0, 1, 1);
 			grid.attach (scale, 1, 0, 1, 1);
 		
-			var lid_closed_box = new ComboBox (_("When the lid is closed:"), @"lid-close-$type-action");
-			grid.attach (lid_closed_box.label, 0, 1, 1, 1);
-			grid.attach (lid_closed_box, 1, 1, 1, 1);
-			
 			if (type != "ac") {
 				var critical_box = new ComboBox (_("When battery power is critically low:"), "critical-battery-action");
 				grid.attach (critical_box.label, 0, 2, 1, 1);
@@ -161,4 +157,4 @@
     debug ("Activating Power plug");
     var plug = new Power.Plug ();
     return plug;
-}
 \ No newline at end of file
+}