--- a/common/xfpm-enum-glib.h 2020-01-29 18:14:59.361752832 +0100
+++ b/common/xfpm-enum-glib.h 2020-01-29 18:13:44.699897354 +0100
@@ -43,7 +43,6 @@
XFPM_DO_NOTHING,
XFPM_DO_SUSPEND,
XFPM_DO_HIBERNATE,
- XFPM_DO_HYBRID_SLEEP,
XFPM_ASK,
XFPM_DO_SHUTDOWN
} XfpmShutdownRequest;
@@ -52,7 +51,6 @@
{
LID_TRIGGER_NOTHING,
LID_TRIGGER_SUSPEND,
- LID_TRIGGER_HYBRID_SLEEP,
LID_TRIGGER_HIBERNATE,
LID_TRIGGER_LOCK_SCREEN,
} XfpmLidTriggerAction;
--- a/settings/xfpm-settings-app.c 2020-01-29 18:20:13.809183210 +0100
+++ b/settings/xfpm-settings-app.c 2020-01-29 18:13:44.728313014 +0100
@@ -131,9 +131,7 @@
gboolean has_battery;
gboolean auth_suspend;
gboolean auth_hibernate;
- gboolean auth_hybrid_sleep;
gboolean can_suspend;
- gboolean can_hybrid_sleep;
gboolean can_hibernate;
gboolean can_shutdown;
gboolean has_lcd_brightness;
@@ -244,11 +242,9 @@
has_battery = xfpm_string_to_bool (g_hash_table_lookup (hash, "has-battery"));
has_lid = xfpm_string_to_bool (g_hash_table_lookup (hash, "has-lid"));
can_suspend = xfpm_string_to_bool (g_hash_table_lookup (hash, "can-suspend"));
- can_hybrid_sleep = xfpm_string_to_bool (g_hash_table_lookup (hash, "can-hybrid-sleep"));
can_hibernate = xfpm_string_to_bool (g_hash_table_lookup (hash, "can-hibernate"));
auth_suspend = xfpm_string_to_bool (g_hash_table_lookup (hash, "auth-suspend"));
auth_hibernate = xfpm_string_to_bool (g_hash_table_lookup (hash, "auth-hibernate"));
- auth_hybrid_sleep = xfpm_string_to_bool (g_hash_table_lookup (hash, "auth-hybrid-sleep"));
has_lcd_brightness = xfpm_string_to_bool (g_hash_table_lookup (hash, "has-brightness"));
has_sleep_button = xfpm_string_to_bool (g_hash_table_lookup (hash, "sleep-button"));
has_power_button = xfpm_string_to_bool (g_hash_table_lookup (hash, "power-button"));
@@ -259,10 +255,9 @@
DBG("socket_id %i", (int)priv->socket_id);
DBG("device id %s", priv->device_id);
- dialog = xfpm_settings_dialog_new (channel, auth_suspend, auth_hybrid_sleep, auth_hibernate,
- can_suspend, can_hybrid_sleep, can_hibernate, can_shutdown,
- has_battery, has_lcd_brightness,has_lid, has_sleep_button,
- has_hibernate_button, has_power_button, has_battery_button,
+ dialog = xfpm_settings_dialog_new (channel, auth_suspend, auth_hibernate,
+ can_suspend, can_hibernate, can_shutdown, has_battery, has_lcd_brightness,
+ has_lid, has_sleep_button, has_hibernate_button, has_power_button, has_battery_button,
priv->socket_id, priv->device_id, GTK_APPLICATION (app));
g_hash_table_destroy (hash);
--- a/settings/xfpm-settings.c 2020-01-29 18:52:24.467128564 +0100
+++ b/settings/xfpm-settings.c 2020-01-29 18:13:44.728313014 +0100
@@ -875,8 +875,7 @@
static void
xfpm_settings_on_battery (XfconfChannel *channel, gboolean auth_suspend,
- gboolean auth_hybrid_sleep, gboolean auth_hibernate,
- gboolean can_suspend, gboolean can_hybrid_sleep,
+ gboolean auth_hibernate, gboolean can_suspend,
gboolean can_hibernate, gboolean can_shutdown,
gboolean has_lcd_brightness, gboolean has_lid)
{
@@ -912,20 +911,6 @@
gtk_widget_set_tooltip_text (inact_action, _("Suspend operation not supported"));
}
- if ( can_hybrid_sleep )
- {
- gtk_list_store_append (list_store, &iter);
- gtk_list_store_set (list_store, &iter, 0, _("Hybrid Sleep"), 1, XFPM_DO_HYBRID_SLEEP, -1);
- }
- else if ( !auth_hybrid_sleep )
- {
- gtk_widget_set_tooltip_text (inact_action, _("Hybrid Sleep not permitted"));
- }
- else
- {
- gtk_widget_set_tooltip_text (inact_action, _("Hybrid Sleep not supported"));
- }
-
if ( can_hibernate )
{
gtk_list_store_append (list_store, &iter);
@@ -997,12 +982,6 @@
gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, XFPM_DO_SUSPEND, -1);
}
- if ( can_hybrid_sleep && auth_hybrid_sleep )
- {
- gtk_list_store_append(list_store, &iter);
- gtk_list_store_set (list_store, &iter, 0, _("Hybrid Sleep"), 1, XFPM_DO_HYBRID_SLEEP, -1);
- }
-
if ( can_hibernate && auth_hibernate )
{
gtk_list_store_append(list_store, &iter);
@@ -1065,12 +1044,6 @@
gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, LID_TRIGGER_SUSPEND, -1);
}
- if ( can_hybrid_sleep && auth_hybrid_sleep )
- {
- gtk_list_store_append(list_store, &iter);
- gtk_list_store_set (list_store, &iter, 0, _("Hybrid Sleep"), 1, LID_TRIGGER_HYBRID_SLEEP, -1);
- }
-
if ( can_hibernate && auth_hibernate)
{
gtk_list_store_append(list_store, &iter);
@@ -1140,8 +1113,7 @@
static void
xfpm_settings_on_ac (XfconfChannel *channel, gboolean auth_suspend,
- gboolean auth_hibernate, gboolean auth_hybrid_sleep,
- gboolean can_suspend, gboolean can_hybrid_sleep,
+ gboolean auth_hibernate, gboolean can_suspend,
gboolean can_hibernate, gboolean has_lcd_brightness,
gboolean has_lid)
{
@@ -1176,20 +1148,6 @@
gtk_widget_set_tooltip_text (inact_action, _("Suspend operation not supported"));
}
- if ( can_hybrid_sleep )
- {
- gtk_list_store_append (list_store, &iter);
- gtk_list_store_set (list_store, &iter, 0, _("Hybrid Sleep"), 1, XFPM_DO_HYBRID_SLEEP, -1);
- }
- else if ( !auth_hybrid_sleep )
- {
- gtk_widget_set_tooltip_text (inact_action, _("Hybrid Sleep not permitted"));
- }
- else
- {
- gtk_widget_set_tooltip_text (inact_action, _("Hybrid Sleep not supported"));
- }
-
if ( can_hibernate )
{
gtk_list_store_append (list_store, &iter);
@@ -1274,12 +1232,6 @@
gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, LID_TRIGGER_SUSPEND, -1);
}
- if ( can_hybrid_sleep && auth_hybrid_sleep )
- {
- gtk_list_store_append(list_store, &iter);
- gtk_list_store_set (list_store, &iter, 0, _("Hybrid Sleep"), 1, LID_TRIGGER_HYBRID_SLEEP, -1);
- }
-
if ( can_hibernate && auth_hibernate )
{
gtk_list_store_append(list_store, &iter);
@@ -1348,8 +1300,7 @@
static void
xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
- gboolean auth_hibernate, gboolean auth_hybrid_sleep,
- gboolean can_suspend, gboolean can_hybrid_sleep,
+ gboolean auth_hibernate, gboolean can_suspend,
gboolean can_hibernate, gboolean can_shutdown,
gboolean has_sleep_button, gboolean has_hibernate_button,
gboolean has_power_button, gboolean has_battery_button)
@@ -1400,12 +1351,6 @@
gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, XFPM_DO_SUSPEND, -1);
}
- if ( can_hybrid_sleep && auth_hybrid_sleep )
- {
- gtk_list_store_append(list_store, &iter);
- gtk_list_store_set (list_store, &iter, 0, _("Hybrid Sleep"), 1, XFPM_DO_HYBRID_SLEEP, -1);
- }
-
if ( can_hibernate && auth_hibernate )
{
gtk_list_store_append (list_store, &iter);
@@ -1464,12 +1409,6 @@
gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, XFPM_DO_SUSPEND, -1);
}
- if ( can_hybrid_sleep && auth_hybrid_sleep )
- {
- gtk_list_store_append(list_store, &iter);
- gtk_list_store_set (list_store, &iter, 0, _("Hybrid Sleep"), 1, XFPM_DO_HYBRID_SLEEP, -1);
- }
-
if ( can_hibernate && auth_hibernate )
{
gtk_list_store_append (list_store, &iter);
@@ -1522,12 +1461,6 @@
gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, XFPM_DO_SUSPEND, -1);
}
- if ( can_hybrid_sleep && auth_hybrid_sleep )
- {
- gtk_list_store_append (list_store, &iter);
- gtk_list_store_set (list_store, &iter, 0, _("Hybrid Sleep"), 1, XFPM_DO_HYBRID_SLEEP, -1);
- }
-
if ( can_hibernate && auth_hibernate)
{
gtk_list_store_append (list_store, &iter);
@@ -1579,12 +1512,6 @@
gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, XFPM_DO_SUSPEND, -1);
}
- if ( can_hybrid_sleep && auth_hybrid_sleep )
- {
- gtk_list_store_append (list_store, &iter);
- gtk_list_store_set (list_store, &iter, 0, _("Hybrid Sleep"), 1, XFPM_DO_HYBRID_SLEEP, -1);
- }
-
if ( can_hibernate && auth_hibernate)
{
gtk_list_store_append (list_store, &iter);
@@ -1646,9 +1573,8 @@
static void
xfpm_settings_advanced (XfconfChannel *channel, gboolean auth_suspend,
- gboolean auth_hibernate, gboolean auth_hybrid_sleep,
- gboolean can_suspend, gboolean can_hibernate,
- gboolean can_hybrid_sleep, gboolean has_battery)
+ gboolean auth_hibernate, gboolean can_suspend,
+ gboolean can_hibernate, gboolean has_battery)
{
guint val;
GtkWidget *critical_level;
@@ -1797,10 +1723,8 @@
}
static void xfpm_settings_light_locker (XfconfChannel *channel,
- gboolean auth_suspend, gboolean auth_hybrid_sleep,
- gboolean auth_hibernate,
- gboolean can_suspend, gboolean can_hybrid_sleep,
- gboolean can_hibernate)
+ gboolean auth_suspend, gboolean auth_hibernate,
+ gboolean can_suspend, gboolean can_hibernate)
{
GSettingsSchemaSource *schema_source;
GSettingsSchema *schema;
@@ -2434,8 +2358,7 @@
GtkWidget *
xfpm_settings_dialog_new (XfconfChannel *channel, gboolean auth_suspend,
- gboolean auth_hybrid_sleep, gboolean auth_hibernate,
- gboolean can_suspend, gboolean can_hybrid_sleep,
+ gboolean auth_hibernate, gboolean can_suspend,
gboolean can_hibernate, gboolean can_shutdown,
gboolean has_battery, gboolean has_lcd_brightness,
gboolean has_lid, gboolean has_sleep_button,
@@ -2464,10 +2387,8 @@
"has_battery=%s has_lcd_brightness=%s has_lid=%s has_sleep_button=%s " \
"has_hibernate_button=%s has_power_button=%s has_battery_button=%s",
xfpm_bool_to_string (has_battery), xfpm_bool_to_string (auth_hibernate),
- xfpm_bool_to_string (auth_hybrid_sleep),
xfpm_bool_to_string (can_shutdown), xfpm_bool_to_string (auth_suspend),
- xfpm_bool_to_string (can_suspend),
- xfpm_bool_to_string (can_hybrid_sleep), xfpm_bool_to_string (can_hibernate),
+ xfpm_bool_to_string (can_suspend), xfpm_bool_to_string (can_hibernate),
xfpm_bool_to_string (has_lcd_brightness), xfpm_bool_to_string (has_lid),
xfpm_bool_to_string (has_sleep_button), xfpm_bool_to_string (has_hibernate_button),
xfpm_bool_to_string (has_power_button), xfpm_bool_to_string (has_battery_button));
@@ -2580,10 +2501,8 @@
xfpm_settings_on_ac (channel,
auth_suspend,
- auth_hybrid_sleep,
auth_hibernate,
can_suspend,
- can_hybrid_sleep,
can_hibernate,
has_lcd_brightness,
has_lid);
@@ -2591,11 +2510,9 @@
if ( has_battery )
xfpm_settings_on_battery (channel,
auth_suspend,
- auth_hybrid_sleep,
auth_hibernate,
can_suspend,
can_hibernate,
- can_hybrid_sleep,
can_shutdown,
has_lcd_brightness,
has_lid);
@@ -2610,16 +2527,13 @@
gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (xml ,"display-stack-switcher")));
}
- xfpm_settings_general (channel, auth_suspend, auth_hybrid_sleep, auth_hibernate, can_suspend,
- can_hybrid_sleep, can_hibernate, can_shutdown,
+ xfpm_settings_general (channel, auth_suspend, auth_hibernate, can_suspend, can_hibernate, can_shutdown,
has_sleep_button, has_hibernate_button, has_power_button, has_battery_button);
- xfpm_settings_advanced (channel, auth_suspend, auth_hybrid_sleep, auth_hibernate,
- can_suspend, can_hybrid_sleep, can_hibernate, has_battery);
+ xfpm_settings_advanced (channel, auth_suspend, auth_hibernate, can_suspend, can_hibernate, has_battery);
/* Light Locker Integration */
- xfpm_settings_light_locker (channel, auth_suspend, auth_hybrid_sleep, auth_hibernate,
- can_suspend, can_hybrid_sleep, can_hibernate);
+ xfpm_settings_light_locker (channel, auth_suspend, auth_hibernate, can_suspend, can_hibernate);
/* END Light Locker Integration */
if ( !has_lcd_brightness )
--- a/settings/xfpm-settings.h 2020-01-29 18:53:42.308902481 +0100
+++ b/settings/xfpm-settings.h 2020-01-29 18:13:44.728313014 +0100
@@ -26,10 +26,8 @@
GtkWidget *xfpm_settings_dialog_new (XfconfChannel *channel,
gboolean auth_suspend,
- gboolean auth_hybrid_sleep,
gboolean auth_hibernate,
gboolean can_suspend,
- gboolean can_hybrid_sleep,
gboolean can_hibernate,
gboolean can_shutdown,
gboolean has_battery,
--- a/src/xfpm-pm-helper.c 2020-01-29 19:54:58.821962976 +0100
+++ b/src/xfpm-pm-helper.c 2020-01-29 18:13:44.731062916 +0100
@@ -60,9 +60,6 @@
#ifdef UP_BACKEND_SUSPEND_COMMAND
#undef UP_BACKEND_SUSPEND_COMMAND
#endif
-#ifdef UP_BACKEND_HYBRID_SLEEP_COMMAND
-#undef UP_BACKEND_HYBRID_SLEEP_COMMAND
-#endif
#ifdef UP_BACKEND_HIBERNATE_COMMAND
#undef UP_BACKEND_HIBERNATE_COMMAND
#endif
@@ -70,17 +67,14 @@
#ifdef BACKEND_TYPE_FREEBSD
#define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/acpiconf -s 3"
-#define UP_BACKEND_HYBRID_SLEEP_COMMAND "/usr/sbin/acpiconf -s 4"
#define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/acpiconf -s 4"
#endif
#ifdef BACKEND_TYPE_LINUX
#define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/pm-suspend"
-#define UP_BACKEND_HYBRID_SLEEP_COMMAND "/usr/sbin/pm-suspend-hybrid"
#define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/pm-hibernate"
#endif
#ifdef BACKEND_TYPE_OPENBSD
#define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/zzz"
-#define UP_BACKEND_HYBRID_SLEEP_COMMAND "/usr/sbin/ZZZ"
#define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/ZZZ"
#endif
@@ -142,12 +136,10 @@
gint euid;
const gchar *pkexec_uid_str;
gboolean suspend = FALSE;
- gboolean hybridsleep = FALSE;
gboolean hibernate = FALSE;
const GOptionEntry options[] = {
{ "suspend", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &suspend, "Suspend the system", NULL },
- { "hybridsleep", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &hybridsleep, "Hybrid Suspend/sleep the system", NULL },
{ "hibernate", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &hibernate, "Hibernate the system", NULL },
{ NULL }
};
@@ -159,7 +151,7 @@
g_option_context_free (context);
/* no input */
- if (!suspend && !hybridsleep && !hibernate)
+ if (!suspend && !hibernate)
{
puts ("No valid option was specified");
return EXIT_CODE_ARGUMENTS_INVALID;
@@ -189,17 +181,6 @@
{
return EXIT_CODE_SUCCESS;
}
- else
- {
- return EXIT_CODE_FAILED;
- }
- }
- else if (hybridsleep)
- {
- if(run (UP_BACKEND_HYBRID_SLEEP_COMMAND))
- {
- return EXIT_CODE_SUCCESS;
- }
else
{
return EXIT_CODE_FAILED;
--- a/src/xfpm-power.c 2020-01-29 19:28:04.153710277 +0100
+++ b/src/xfpm-power.c 2020-01-29 18:13:44.731062916 +0100
@@ -115,7 +115,6 @@
XfpmPolkit *polkit;
#endif
gboolean auth_suspend;
- gboolean auth_hybrid_sleep;
gboolean auth_hibernate;
/* Properties */
@@ -125,7 +124,6 @@
gboolean on_battery;
gchar *daemon_version;
gboolean can_suspend;
- gboolean can_hybrid_sleep;
gboolean can_hibernate;
/**
@@ -141,10 +139,8 @@
PROP_ON_LOW_BATTERY,
PROP_ON_BATTERY,
PROP_AUTH_SUSPEND,
- PROP_AUTH_HYBRID_SLEEP,
PROP_AUTH_HIBERNATE,
PROP_CAN_SUSPEND,
- PROP_CAN_HYBRID_SLEEP,
PROP_CAN_HIBERNATE,
PROP_HAS_LID,
PROP_PRESENTATION_MODE,
@@ -179,7 +175,7 @@
check_for_consolekit2 (XfpmPower *power)
{
XfpmConsoleKit *console;
- gboolean can_suspend; gboolean can_hybrid_sleep; gboolean can_hibernate;
+ gboolean can_suspend, can_hibernate;
g_return_val_if_fail (XFPM_IS_POWER (power), FALSE);
@@ -192,14 +188,11 @@
"can-suspend", &can_suspend,
NULL);
g_object_get (G_OBJECT (console),
- "can-hybrid-sleep", &can_hybrid_sleep,
- NULL);
- g_object_get (G_OBJECT (console),
"can-hibernate", &can_hibernate,
NULL);
/* ConsoleKit2 supports suspend and hibernate */
- if (can_suspend || can_hybrid_sleep || can_hibernate)
+ if (can_suspend || can_hibernate)
{
return TRUE;
}
@@ -211,12 +204,11 @@
static void
xfpm_power_check_polkit_auth (XfpmPower *power)
{
- const char *suspend = NULL, *hybrid_sleep = NULL, *hibernate = NULL;
+ const char *suspend = NULL, *hibernate = NULL;
if (LOGIND_RUNNING())
{
XFPM_DEBUG ("using logind suspend backend");
suspend = POLKIT_AUTH_SUSPEND_LOGIND;
- hybrid_sleep = POLKIT_AUTH_HIBERNATE_LOGIND;
hibernate = POLKIT_AUTH_HIBERNATE_LOGIND;
}
else
@@ -228,14 +220,12 @@
{
XFPM_DEBUG ("using consolekit2 suspend backend");
suspend = POLKIT_AUTH_SUSPEND_CONSOLEKIT2;
- hybrid_sleep = POLKIT_AUTH_HIBERNATE_CONSOLEKIT2;
hibernate = POLKIT_AUTH_HIBERNATE_CONSOLEKIT2;
}
else
{
XFPM_DEBUG ("using xfpm internal suspend backend");
suspend = POLKIT_AUTH_SUSPEND_XFPM;
- hybrid_sleep = POLKIT_AUTH_HIBERNATE_XFPM;
hibernate = POLKIT_AUTH_HIBERNATE_XFPM;
}
}
@@ -243,9 +233,6 @@
power->priv->auth_suspend = xfpm_polkit_check_auth (power->priv->polkit,
suspend);
- power->priv->auth_hybrid_sleep = xfpm_polkit_check_auth (power->priv->polkit,
- hibernate);
-
power->priv->auth_hibernate = xfpm_polkit_check_auth (power->priv->polkit,
hibernate);
}
@@ -298,7 +285,6 @@
*
* DaemonVersion 's'
* CanSuspend' 'b'
- * CanHybridSleep' 'b'
* CanHibernate' 'b'
* OnBattery' 'b'
* OnLowBattery' 'b'
@@ -318,9 +304,6 @@
"can-suspend", &power->priv->can_suspend,
NULL);
g_object_get (G_OBJECT (power->priv->systemd),
- "can-hybrid-sleep", &power->priv->can_hybrid_sleep,
- NULL);
- g_object_get (G_OBJECT (power->priv->systemd),
"can-hibernate", &power->priv->can_hibernate,
NULL);
}
@@ -332,16 +315,12 @@
"can-suspend", &power->priv->can_suspend,
NULL);
g_object_get (G_OBJECT (power->priv->console),
- "can-hybrid-sleep", &power->priv->can_hybrid_sleep,
- NULL);
- g_object_get (G_OBJECT (power->priv->console),
"can-hibernate", &power->priv->can_hibernate,
NULL);
}
else
{
power->priv->can_suspend = xfpm_suspend_can_suspend ();
- power->priv->can_hybrid_sleep = xfpm_suspend_can_hybrid_sleep ();
power->priv->can_hibernate = xfpm_suspend_can_hibernate ();
}
}
@@ -1154,20 +1133,6 @@
G_PARAM_READABLE));
g_object_class_install_property (object_class,
- PROP_CAN_HYBRID_SLEEP,
- g_param_spec_boolean ("can-hybrid-sleep",
- NULL, NULL,
- FALSE,
- G_PARAM_READABLE));
-
- g_object_class_install_property (object_class,
- PROP_AUTH_HYBRID_SLEEP,
- g_param_spec_boolean ("auth-hybrid-sleep",
- NULL, NULL,
- FALSE,
- G_PARAM_READABLE));
-
- g_object_class_install_property (object_class,
PROP_HAS_LID,
g_param_spec_boolean ("has-lid",
NULL, NULL,
@@ -1297,18 +1262,12 @@
case PROP_AUTH_HIBERNATE:
g_value_set_boolean (value, power->priv->auth_hibernate);
break;
- case PROP_AUTH_HYBRID_SLEEP:
- g_value_set_boolean (value, power->priv->auth_hybrid_sleep);
- break;
case PROP_AUTH_SUSPEND:
g_value_set_boolean (value, power->priv->auth_suspend);
break;
case PROP_CAN_SUSPEND:
g_value_set_boolean (value, power->priv->can_suspend);
break;
- case PROP_CAN_HYBRID_SLEEP:
- g_value_set_boolean (value, power->priv->can_hybrid_sleep);
- break;
case PROP_CAN_HIBERNATE:
g_value_set_boolean (value, power->priv->can_hibernate);
break;
@@ -1434,11 +1393,6 @@
xfpm_power_sleep (power, "Suspend", force);
}
-void xfpm_power_hybrid_sleep (XfpmPower *power, gboolean force)
-{
- xfpm_power_sleep (power, "HybridSleep", force);
-}
-
void xfpm_power_hibernate (XfpmPower *power, gboolean force)
{
xfpm_power_sleep (power, "Hibernate", force);
--- a/src/xfpm-power.h 2020-01-29 19:30:01.554798688 +0100
+++ b/src/xfpm-power.h 2020-01-29 18:13:44.731062916 +0100
@@ -58,8 +58,6 @@
XfpmPower *xfpm_power_get (void);
void xfpm_power_suspend (XfpmPower *power,
gboolean force);
-void xfpm_power_hybrid_sleep (XfpmPower *power,
- gboolean force);
void xfpm_power_hibernate (XfpmPower *power,
gboolean force);
gboolean xfpm_power_has_battery (XfpmPower *power);
--- a/src/xfpm-suspend.h 2020-01-29 19:31:23.921928236 +0100
+++ b/src/xfpm-suspend.h 2020-01-29 18:13:44.731062916 +0100
@@ -26,12 +26,10 @@
{
XFPM_ASK_0 = 0,
XFPM_SUSPEND,
- XFPM_HYBRID_SLEEP,
XFPM_HIBERNATE,
} XfpmActionType;
gboolean xfpm_suspend_can_suspend (void);
-gboolean xfpm_suspend_can_hybrid_sleep (void);
gboolean xfpm_suspend_can_hibernate (void);
gboolean xfpm_suspend_try_action (XfpmActionType type);
--- a/src/xfpm-suspend.c 2020-01-29 19:33:52.504585585 +0100
+++ b/src/xfpm-suspend.c 2020-01-29 18:13:44.731062916 +0100
@@ -154,24 +154,6 @@
}
gboolean
-xfpm_suspend_can_hybrid_sleep (void)
-{
- XFPM_DEBUG("entering");
-#ifdef BACKEND_TYPE_FREEBSD
- return freebsd_supports_sleep_state ("S3");
-#endif
-/* pm-utils pm-is-supported uses suspend-hybrid not hybridsleep */
-#ifdef BACKEND_TYPE_LINUX
- return linux_supports_sleep_state ("suspend-hybrid");
-#endif
-#ifdef BACKEND_TYPE_OPENBSD
- return TRUE;
-#endif
-
- return FALSE;
-}
-
-gboolean
xfpm_suspend_can_hibernate (void)
{
XFPM_DEBUG("entering");
@@ -201,8 +183,6 @@
if (type == XFPM_SUSPEND)
action = "suspend";
- else if (type == XFPM_HYBRID_SLEEP)
- action = "hybridsleep";
else if (type == XFPM_HIBERNATE)
action = "hibernate";
else
--- a/src/xfpm-systemd.c 2020-01-29 19:41:04.146203597 +0100
+++ b/src/xfpm-systemd.c 2020-01-29 18:13:44.731979550 +0100
@@ -48,7 +48,6 @@
gboolean can_shutdown;
gboolean can_restart;
gboolean can_suspend;
- gboolean can_hybrid_sleep;
gboolean can_hibernate;
#ifdef ENABLE_POLKIT
XfpmPolkit *polkit;
@@ -61,7 +60,6 @@
PROP_CAN_RESTART,
PROP_CAN_SHUTDOWN,
PROP_CAN_SUSPEND,
- PROP_CAN_HYBRID_SLEEP,
PROP_CAN_HIBERNATE,
};
@@ -75,7 +73,6 @@
#define SYSTEMD_REBOOT_TEST "org.freedesktop.login1.reboot"
#define SYSTEMD_POWEROFF_TEST "org.freedesktop.login1.power-off"
#define SYSTEMD_SUSPEND_TEST "org.freedesktop.login1.suspend"
-#define SYSTEMD_HYBRID_SLEEP_TEST "org.freedesktop.login1.hibernate"
#define SYSTEMD_HIBERNATE_TEST "org.freedesktop.login1.hibernate"
static void
@@ -109,13 +106,6 @@
G_PARAM_READABLE));
g_object_class_install_property (object_class,
- PROP_CAN_HYBRID_SLEEP,
- g_param_spec_boolean ("can-hybrid-sleep",
- NULL, NULL,
- FALSE,
- G_PARAM_READABLE));
-
- g_object_class_install_property (object_class,
PROP_CAN_HIBERNATE,
g_param_spec_boolean ("can-hibernate",
NULL, NULL,
@@ -159,9 +149,6 @@
&systemd->priv->can_suspend,
SYSTEMD_SUSPEND_TEST);
xfpm_systemd_can_method (systemd,
- &systemd->priv->can_hybrid_sleep,
- SYSTEMD_HYBRID_SLEEP_TEST);
- xfpm_systemd_can_method (systemd,
&systemd->priv->can_hibernate,
SYSTEMD_HIBERNATE_TEST);
}
@@ -185,9 +172,6 @@
case PROP_CAN_SUSPEND:
g_value_set_boolean (value, systemd->priv->can_suspend);
break;
- case PROP_CAN_HYBRID_SLEEP:
- g_value_set_boolean (value, systemd->priv->can_hybrid_sleep);
- break;
case PROP_CAN_HIBERNATE:
g_value_set_boolean (value, systemd->priv->can_hibernate);
break;
--- a/src/xfpm-manager.c 2020-01-29 20:00:16.364571394 +0100
+++ b/src/xfpm-manager.c 2020-01-29 18:13:44.730146282 +0100
@@ -336,9 +336,6 @@
case XFPM_DO_SUSPEND:
xfpm_power_suspend (manager->priv->power, force);
break;
- case XFPM_DO_HYBRID_SLEEP:
- xfpm_power_hybrid_sleep (manager->priv->power, force);
- break;
case XFPM_DO_HIBERNATE:
xfpm_power_hibernate (manager->priv->power, force);
break;
@@ -944,10 +941,8 @@
guint16 mapped_buttons;
gboolean auth_hibernate = FALSE;
- gboolean auth_hybrid_sleep = FALSE;
gboolean auth_suspend = FALSE;
gboolean can_suspend = FALSE;
- gboolean can_hybrid_sleep = FALSE;
gboolean can_hibernate = FALSE;
gboolean has_sleep_button = FALSE;
gboolean has_hibernate_button = FALSE;
@@ -975,10 +970,8 @@
g_object_get (G_OBJECT (manager->priv->power),
"auth-suspend", &auth_suspend,
- "auth-hybrid-sleep", &auth_hybrid_sleep,
"auth-hibernate", &auth_hibernate,
"can-suspend", &can_suspend,
- "can-hybrid-sleep", &can_hybrid_sleep,
"can-hibernate", &can_hibernate,
"has-lid", &has_lid,
NULL);
@@ -1002,10 +995,8 @@
g_hash_table_insert (hash, g_strdup ("hibernate-button"), g_strdup (xfpm_bool_to_string (has_hibernate_button)));
g_hash_table_insert (hash, g_strdup ("battery-button"), g_strdup (xfpm_bool_to_string (has_battery_button)));
g_hash_table_insert (hash, g_strdup ("auth-suspend"), g_strdup (xfpm_bool_to_string (auth_suspend)));
- g_hash_table_insert (hash, g_strdup ("auth-hybrid-sleep"), g_strdup (xfpm_bool_to_string (auth_hybrid_sleep)));
g_hash_table_insert (hash, g_strdup ("auth-hibernate"), g_strdup (xfpm_bool_to_string (auth_hibernate)));
g_hash_table_insert (hash, g_strdup ("can-suspend"), g_strdup (xfpm_bool_to_string (can_suspend)));
- g_hash_table_insert (hash, g_strdup ("can-hybrid-sleep"), g_strdup (xfpm_bool_to_string (can_hybrid_sleep)));
g_hash_table_insert (hash, g_strdup ("can-hibernate"), g_strdup (xfpm_bool_to_string (can_hibernate)));
g_hash_table_insert (hash, g_strdup ("can-shutdown"), g_strdup (xfpm_bool_to_string (can_shutdown)));
--- a/src/xfpm-console-kit.c 2020-01-29 20:12:41.489693886 +0100
+++ b/src/xfpm-console-kit.c 2020-01-29 18:13:44.730146282 +0100
@@ -51,7 +51,6 @@
gboolean can_shutdown;
gboolean can_restart;
gboolean can_suspend;
- gboolean can_hybrid_sleep;
gboolean can_hibernate;
};
@@ -61,7 +60,6 @@
PROP_CAN_RESTART,
PROP_CAN_SHUTDOWN,
PROP_CAN_SUSPEND,
- PROP_CAN_HYBRID_SLEEP,
PROP_CAN_HIBERNATE
};
@@ -198,13 +196,6 @@
G_PARAM_READABLE));
g_object_class_install_property (object_class,
- PROP_CAN_HYBRID_SLEEP,
- g_param_spec_boolean ("can-hybrid-sleep",
- NULL, NULL,
- FALSE,
- G_PARAM_READABLE));
-
- g_object_class_install_property (object_class,
PROP_CAN_HIBERNATE,
g_param_spec_boolean ("can-hibernate",
NULL, NULL,
@@ -271,9 +262,6 @@
case PROP_CAN_SUSPEND:
g_value_set_boolean (value, console->priv->can_suspend);
break;
- case PROP_CAN_HYBRID_SLEEP:
- g_value_set_boolean (value, console->priv->can_hybrid_sleep);
- break;
case PROP_CAN_HIBERNATE:
g_value_set_boolean (value, console->priv->can_hibernate);
break;
--- a/src/xfpm-main.c 2020-01-29 20:08:14.128905559 +0100
+++ b/src/xfpm-main.c 2020-01-29 18:13:44.730146282 +0100
@@ -82,10 +82,8 @@
{
gboolean has_battery;
gboolean auth_suspend;
- gboolean auth_hybrid_sleep;
gboolean auth_hibernate;
gboolean can_suspend;
- gboolean can_hybrid_sleep;
gboolean can_hibernate;
gboolean can_shutdown;
gboolean has_lcd_brightness;
@@ -98,10 +96,8 @@
has_battery = xfpm_string_to_bool (g_hash_table_lookup (hash, "has-battery"));
has_lid = xfpm_string_to_bool (g_hash_table_lookup (hash, "has-lid"));
can_suspend = xfpm_string_to_bool (g_hash_table_lookup (hash, "can-suspend"));
- can_hybrid_sleep = xfpm_string_to_bool (g_hash_table_lookup (hash, "can-hybrid-sleep"));
can_hibernate = xfpm_string_to_bool (g_hash_table_lookup (hash, "can-hibernate"));
auth_suspend = xfpm_string_to_bool (g_hash_table_lookup (hash, "auth-suspend"));
- auth_hybrid_sleep = xfpm_string_to_bool (g_hash_table_lookup (hash, "auth-hybrid-sleep"));
auth_hibernate = xfpm_string_to_bool (g_hash_table_lookup (hash, "auth-hibernate"));
has_lcd_brightness = xfpm_string_to_bool (g_hash_table_lookup (hash, "has-brightness"));
has_sleep_button = xfpm_string_to_bool (g_hash_table_lookup (hash, "sleep-button"));
@@ -137,16 +133,12 @@
"%s: %s\n",
_("Can suspend"),
xfpm_bool_to_local_string (can_suspend),
- _("Can hybrid sleep"),
- xfpm_bool_to_local_string (can_hybrid_sleep),
_("Can hibernate"),
xfpm_bool_to_local_string (can_hibernate),
_("Authorized to suspend"),
xfpm_bool_to_local_string (auth_suspend),
_("Authorized to hibernate"),
xfpm_bool_to_local_string (auth_hibernate),
- _("Authorized to hybrid sleep"),
- xfpm_bool_to_local_string (auth_hybrid_sleep),
_("Authorized to shutdown"),
xfpm_bool_to_local_string (can_shutdown),
_("Has battery"),
--- a/src/org.freedesktop.PowerManagement.xml 2020-01-29 20:09:41.138558995 +0100
+++ b/src/org.freedesktop.PowerManagement.xml 2020-01-29 18:13:44.728313014 +0100
@@ -9,9 +9,6 @@
-
-
-
@@ -30,10 +27,6 @@
-
-
-
-