power: Merge idle-dim-ac/idle-dim-battery

We have a single setting in the power panel, so it doesn't make sense
to have two separate ones here.

1 files changed, 3 insertions, 8 deletions

diff --git a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
index b16194d3..24c97bf2 100644
--- a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
@@ -15,15 +15,10 @@
       <summary>The brightness of the screen when idle</summary>
       <description>This is the laptop panel screen brightness used when the session is idle.</description>
     </key>
-    <key name="idle-dim-ac" type="b">
-      <default>false</default>
-      <summary>Dim the screen after a period of inactivity when on AC power</summary>
-      <description>If the screen should be dimmed to save power when the computer is idle when on AC power.</description>
-    </key>
-    <key name="idle-dim-battery" type="b">
+    <key name="idle-dim" type="b">
       <default>true</default>
-      <summary>Dim the screen after a period of inactivity when on battery power</summary>
-      <description>If the screen should be dimmed to save power when the computer is idle when on battery power.</description>
+      <summary>Dim the screen after a period of inactivity</summary>
+      <description>If the screen should be dimmed to save power when the computer is idle.</description>
     </key>
     <key name="idle-dim-time" type="i">
       <default>90</default>