From 73d367d73331808c08d88d67f8640a437869c723 Mon Sep 17 00:00:00 2001 From: Alexander Schwinn Date: Thu, 18 Apr 2019 22:53:36 +0200 Subject: [PATCH] Remove option "Ask" on critical power, since it can lead to logout on accident (bug #15158) --- settings/xfpm-settings.c | 7 +++---- src/xfpm-power.c | 16 +++------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/settings/xfpm-settings.c b/settings/xfpm-settings.c index 26dbfc1..719f6bb 100644 --- a/settings/xfpm-settings.c +++ b/settings/xfpm-settings.c @@ -982,7 +982,9 @@ xfpm_settings_on_battery (XfconfChannel *channel, gboolean auth_suspend, gtk_combo_box_set_model (GTK_COMBO_BOX(battery_critical), GTK_TREE_MODEL(list_store)); gtk_list_store_append(list_store, &iter); - gtk_list_store_set (list_store, &iter, 0, _("Do nothing"), 1, XFPM_DO_NOTHING, -1); + gtk_list_store_set (list_store, &iter, 0, _("Notify"), 1, XFPM_DO_NOTHING, -1); + /* default selection if load fails (due to XFPM_ASK not available any more) */ + gtk_combo_box_set_active_iter (GTK_COMBO_BOX (battery_critical), &iter); if ( can_suspend && auth_suspend ) { @@ -1002,9 +1004,6 @@ xfpm_settings_on_battery (XfconfChannel *channel, gboolean auth_suspend, gtk_list_store_set (list_store, &iter, 0, _("Shutdown"), 1, XFPM_DO_SHUTDOWN, -1); } - gtk_list_store_append(list_store, &iter); - gtk_list_store_set (list_store, &iter, 0, _("Ask"), 1, XFPM_ASK, -1); - val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX CRITICAL_BATT_ACTION_CFG, XFPM_DO_NOTHING); for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter); diff --git a/src/xfpm-power.c b/src/xfpm-power.c index 2aacd84..2176db1 100644 --- a/src/xfpm-power.c +++ b/src/xfpm-power.c @@ -755,9 +755,7 @@ xfpm_power_show_critical_action (XfpmPower *power, XfpmBattery *battery) static void xfpm_power_process_critical_action (XfpmPower *power, XfpmShutdownRequest req) { - if ( req == XFPM_ASK ) - g_signal_emit (G_OBJECT (power), signals [ASK_SHUTDOWN], 0); - else if ( req == XFPM_DO_SUSPEND ) + if ( req == XFPM_DO_SUSPEND ) xfpm_power_sleep (power, "Suspend", TRUE); else if ( req == XFPM_DO_HIBERNATE ) xfpm_power_sleep (power, "Hibernate", TRUE); @@ -777,7 +775,8 @@ xfpm_power_system_on_critical_power (XfpmPower *power, XfpmBattery *battery) XFPM_DEBUG ("System is running on low power"); XFPM_DEBUG_ENUM (critical_action, XFPM_TYPE_SHUTDOWN_REQUEST, "Critical battery action"); - if ( critical_action == XFPM_DO_NOTHING ) + /* For bw compatibility as well XFPM_ASK will show the warning */ + if ( critical_action == XFPM_DO_NOTHING || critical_action == XFPM_ASK ) { xfpm_power_show_critical_action (power, battery); } @@ -1065,15 +1064,6 @@ xfpm_power_class_init (XfpmPowerClass *klass) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0, G_TYPE_NONE); - signals [ASK_SHUTDOWN] = - g_signal_new ("ask-shutdown", - XFPM_TYPE_POWER, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(XfpmPowerClass, ask_shutdown), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0, G_TYPE_NONE); - signals [SHUTDOWN] = g_signal_new ("shutdown", XFPM_TYPE_POWER, -- 2.20.1