[gnome-power-manager] Do not handle the action on lid close, it's moved to gnome-settings-daemon
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-power-manager] Do not handle the action on lid close, it's moved to gnome-settings-daemon
- Date: Mon, 25 Jul 2011 13:21:29 +0000 (UTC)
commit 911d824b38b410c4a15355b6d349ed34c2e206d6
Author: Richard Hughes <richard hughsie com>
Date: Mon Jul 4 12:21:13 2011 +0100
Do not handle the action on lid close, it's moved to gnome-settings-daemon
src/gpm-manager.c | 51 ---------------------------------------------------
1 files changed, 0 insertions(+), 51 deletions(-)
---
diff --git a/src/gpm-manager.c b/src/gpm-manager.c
index fc88a89..68118db 100644
--- a/src/gpm-manager.c
+++ b/src/gpm-manager.c
@@ -902,62 +902,11 @@ gpm_manager_idle_changed_cb (GpmIdle *idle, GpmIdleMode mode, GpmManager *manage
static void
gpm_manager_lid_button_pressed (GpmManager *manager, gboolean pressed)
{
- const gchar *description;
- const gchar *policy_key;
- GpmActionPolicy policy;
-
- if (pressed)
- gpm_manager_play (manager, GPM_MANAGER_SOUND_LID_CLOSE, FALSE);
- else
- gpm_manager_play (manager, GPM_MANAGER_SOUND_LID_OPEN, FALSE);
-
/* we turn the lid dpms back on unconditionally */
if (pressed == FALSE) {
gpm_manager_unblank_screen (manager, NULL);
return;
}
-
- /* we have different settings depending on AC state */
- if (!manager->priv->on_battery) {
- policy_key = GSD_SETTINGS_BUTTON_LID_AC;
- description = "Lid closed on AC power";
- } else {
- policy_key = GSD_SETTINGS_BUTTON_LID_BATT;
- description = "Lid closed on battery power";
- }
-
- /* check that on systems that would meld when the lid is closed
- * and not asleep we set a better policy option */
- policy = g_settings_get_enum (manager->priv->settings_gsd,
- policy_key);
- if (policy != GPM_ACTION_POLICY_SUSPEND &&
- policy != GPM_ACTION_POLICY_HIBERNATE) {
-#if UP_CHECK_VERSION(0,9,9)
- if (up_client_get_lid_force_sleep (manager->priv->client)) {
- g_warning ("to prevent damage, %s is now forced to 'suspend'",
- policy_key);
- g_settings_set_enum (manager->priv->settings_gsd,
- policy_key,
- GPM_ACTION_POLICY_SUSPEND);
- }
-#else
- g_warning ("Laptop may melt if lid is closed. "
- "Update UPower and rebuild to find out!");
-#endif
- }
-
-#if UP_CHECK_VERSION(0,9,8)
- /* are we docked? */
- if (up_client_get_is_docked (manager->priv->client)) {
- g_debug ("ignoring lid closed action because we are docked");
- return;
- }
-#endif
-
- /* do action */
- gpm_manager_perform_policy (manager,
- policy_key,
- description);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]