[gnome-control-center/gnome-3-2] Revert "power: Use the correct item in the combo boxes when sleep-when-inactive is disabled"

[Richard Hughes <rhughes src gnome org>]

commit 9dd7e8f07aad5449d4d8dd860aaf588dfc2741a5
Author: Richard Hughes <richard hughsie com>
Date:   Thu Sep 29 15:00:19 2011 +0100

    Revert "power: Use the correct item in the combo boxes when sleep-when-inactive is disabled"
    
    Basically, nothing reads the boolean keys, and it's better just to fix the
    default setting in g-s-d so the comboboxes do the right thing.
    
    Apologies Rodrigo, for previously telling you the fix was okay.
    
    This reverts commit 7929a519af5119e6c78b93107cb5de9405f7d01f.

 panels/power/cc-power-panel.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
index 92b2e85..c069187 100644
--- a/panels/power/cc-power-panel.c
+++ b/panels/power/cc-power-panel.c
@@ -602,10 +602,6 @@ cc_power_panel_init (CcPowerPanel *self)
 
   /* auto-sleep time */
   value = g_settings_get_int (self->priv->gsd_settings, "sleep-inactive-ac-timeout");
-  if (!g_settings_get_boolean (self->priv->gsd_settings, "sleep-inactive-ac"))
-    {
-      value = 0;
-    }
   widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
                                                "combobox_sleep_ac"));
   set_value_for_combo (GTK_COMBO_BOX (widget), value);
@@ -614,10 +610,6 @@ cc_power_panel_init (CcPowerPanel *self)
                     G_CALLBACK (combo_time_changed_cb),
                     self);
   value = g_settings_get_int (self->priv->gsd_settings, "sleep-inactive-battery-timeout");
-  if (!g_settings_get_boolean (self->priv->gsd_settings, "sleep-inactive-battery"))
-    {
-      value = 0;
-    }
   widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
                                                "combobox_sleep_battery"));
   set_value_for_combo (GTK_COMBO_BOX (widget), value);