[gnome-settings-daemon/benzea/master-remove-suspend-then-hibernate: 2/2] Revert "power: Add Suspend then Hibernate"

[Benjamin Berg <bberg src gnome org>]

commit 17da9767026d24330b0cbbf672292ec774a15e78
Author: Benjamin Berg <bberg redhat com>
Date:   Thu Oct 4 12:06:31 2018 +0200

    Revert "power: Add Suspend then Hibernate"
    
    This reverts commit a6e3ee40d90294c603e1108e19ef8fe8e6af61eb.

 plugins/media-keys/gsd-media-keys-manager.c | 34 ++---------------------------
 plugins/power/gsd-power-manager.c           | 27 +----------------------
 2 files changed, 3 insertions(+), 58 deletions(-)
---
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 36441bf1..95a82758 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -2000,36 +2000,6 @@ power_action (GsdMediaKeysManager *manager,
                            NULL, NULL);
 }
 
-static void
-suspend_action (GsdMediaKeysManager *manager,
-                gboolean             allow_interaction)
-{
-        const gchar *action = "Suspend";
-        g_autoptr(GVariant) retval = NULL;
-        g_autoptr(GError) error = NULL;
-
-        retval = g_dbus_proxy_call_sync (manager->priv->logind_proxy,
-                                         "CanSuspendThenHibernate",
-                                         NULL,
-                                         G_DBUS_CALL_FLAGS_NONE,
-                                         -1,
-                                         NULL,
-                                         &error);
-        if (retval == NULL) {
-                g_warning ("Failed to query CanSuspendThenHibernate: %s", error->message);
-                g_error_free (error);
-        } else {
-                const gchar *s2h = NULL;
-
-                g_variant_get (retval, "(s)", &s2h);
-                if (g_strcmp0 (s2h, "yes") == 0)
-                        action = "SuspendThenHibernate";
-        }
-        g_debug ("Choosing suspend action: %s", action);
-
-        power_action (manager, action, allow_interaction);
-}
-
 static void
 do_config_power_action (GsdMediaKeysManager *manager,
                         GsdPowerActionType   action_type,
@@ -2037,7 +2007,7 @@ do_config_power_action (GsdMediaKeysManager *manager,
 {
         switch (action_type) {
         case GSD_POWER_ACTION_SUSPEND:
-                suspend_action (manager, !in_lock_screen);
+                power_action (manager, "Suspend", !in_lock_screen);
                 break;
         case GSD_POWER_ACTION_INTERACTIVE:
                 if (!in_lock_screen)
@@ -2075,7 +2045,7 @@ do_config_power_button_action (GsdMediaKeysManager *manager,
 
         /* Always suspend tablets */
         if (g_strcmp0 (manager->priv->chassis_type, "tablet") == 0) {
-                suspend_action (manager, !in_lock_screen);
+                power_action (manager, "Suspend", !in_lock_screen);
                 return;
         }
 
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index 6c417721..97385ca3 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -930,35 +930,12 @@ action_poweroff (GsdPowerManager *manager)
 static void
 action_suspend (GsdPowerManager *manager)
 {
-        const gchar *action = "Suspend";
-        g_autoptr(GVariant) retval = NULL;
-        g_autoptr(GError) error = NULL;
-
         if (manager->priv->logind_proxy == NULL) {
                 g_warning ("no systemd support");
                 return;
         }
-
-        retval = g_dbus_proxy_call_sync (manager->priv->logind_proxy,
-                                         "CanSuspendThenHibernate",
-                                         NULL,
-                                         G_DBUS_CALL_FLAGS_NONE,
-                                         -1,
-                                         manager->priv->cancellable,
-                                         &error);
-        if (retval == NULL) {
-                g_warning ("Failed to query CanSuspendThenHibernate: %s", error->message);
-        } else {
-                const gchar *s2h = NULL;
-
-                g_variant_get (retval, "(s)", &s2h);
-                if (g_strcmp0 (s2h, "yes") == 0)
-                        action = "SuspendThenHibernate";
-        }
-        g_debug ("Choosing suspend action: %s", action);
-
         g_dbus_proxy_call (manager->priv->logind_proxy,
-                           action,
+                           "Suspend",
                            g_variant_new ("(b)", FALSE),
                            G_DBUS_CALL_FLAGS_NONE,
                            G_MAXINT,
@@ -1114,7 +1091,6 @@ backlight_disable (GsdPowerManager *manager)
                 g_error_free (error);
         }
 
-        g_debug("Is tablet: %d", manager->priv->is_tablet);
         if (manager->priv->is_tablet)
                 action_suspend (manager);
         else
@@ -1127,7 +1103,6 @@ static void
 do_power_action_type (GsdPowerManager *manager,
                       GsdPowerActionType action_type)
 {
-        g_debug("Running power action type %d", action_type);
         switch (action_type) {
         case GSD_POWER_ACTION_SUSPEND:
                 action_suspend (manager);