[gnome-power-manager] Allow 'Do nothing' as an option as Xorg is still broken. Fixes #589736

[Richard Hughes <rhughes src gnome org>]

commit 00618df34dfd21203e136eb356d32ffe4da251fc
Author: Richard Hughes <richard hughsie com>
Date:   Mon Jul 12 17:10:33 2010 +0100

    Allow 'Do nothing' as an option as Xorg is still broken. Fixes #589736

 src/cc-power-panel.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/src/cc-power-panel.c b/src/cc-power-panel.c
index 45f74e4..f64d0a9 100644
--- a/src/cc-power-panel.c
+++ b/src/cc-power-panel.c
@@ -206,11 +206,8 @@ cc_power_panel_setup_action_combo (CcPowerPanel *panel, const gchar *widget_name
 			gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Ask me"));
 			g_ptr_array_add (array, GINT_TO_POINTER (policy));
 		} else if (policy == GPM_ACTION_POLICY_NOTHING) {
-			/* we only add do nothing in the GUI if the user has explicitly specified this in GConf */
-			if (value == GPM_ACTION_POLICY_NOTHING) {
-				gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Do nothing"));
-				g_ptr_array_add (array, GINT_TO_POINTER (policy));
-			}
+			gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Do nothing"));
+			g_ptr_array_add (array, GINT_TO_POINTER (policy));
 		} else {
 			g_warning ("Unknown action read from settings: %i", policy);
 		}