summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-11-08 00:34:47 +0100
committerStefano Karapetsas <[email protected]>2012-11-08 00:34:47 +0100
commit4dcaeb1ce70903034ae8541a773277243dccaa8b (patch)
tree7309197e6059cc80bd54dc2c6a9e7a107eefb185 /src
parentae9f45b112c22538465e060c61b2ed2fb1b0544c (diff)
downloadmate-power-manager-4dcaeb1ce70903034ae8541a773277243dccaa8b.tar.bz2
mate-power-manager-4dcaeb1ce70903034ae8541a773277243dccaa8b.tar.xz
show always "do nothing" option
Diffstat (limited to 'src')
-rw-r--r--src/gpm-prefs-core.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/gpm-prefs-core.c b/src/gpm-prefs-core.c
index 790427b..da985c1 100644
--- a/src/gpm-prefs-core.c
+++ b/src/gpm-prefs-core.c
@@ -306,16 +306,13 @@ gpm_prefs_setup_action_combo (GpmPrefs *prefs, const gchar *widget_name,
g_ptr_array_add (array, GINT_TO_POINTER (policy));
#endif
} else if (policy == GPM_ACTION_POLICY_NOTHING) {
- /* we only add do nothing in the GUI if the user has explicitly specified this in the settings */
- if (value == GPM_ACTION_POLICY_NOTHING) {
- #if GTK_CHECK_VERSION (2, 24, 0)
- gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT (widget), _("Do nothing"));
- g_ptr_array_add(array, GINT_TO_POINTER (policy));
- #else
- gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Do nothing"));
- g_ptr_array_add (array, GINT_TO_POINTER (policy));
- #endif
- }
+ #if GTK_CHECK_VERSION (2, 24, 0)
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT (widget), _("Do nothing"));
+ g_ptr_array_add(array, GINT_TO_POINTER (policy));
+ #else
+ gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Do nothing"));
+ g_ptr_array_add (array, GINT_TO_POINTER (policy));
+ #endif
} else {
egg_warning ("Unknown action read from settings: %i", policy);
}