From aaf80033e5698a8a7e5899d7e04f274afd359fab Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Thu, 26 Jan 2012 06:21:21 +0000 Subject: [PATCH] add hibernate now action fix backlight to not reset to default on restarts. SVN revision: 67544 --- src/bin/e_actions.c | 9 +++++++++ src/bin/e_backlight.c | 9 ++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c index b95815083..44c89beeb 100644 --- a/src/bin/e_actions.c +++ b/src/bin/e_actions.c @@ -2244,6 +2244,11 @@ _e_actions_cb_hibernate_dialog_delete(E_Win *win) _e_actions_cb_hibernate_dialog_cancel(NULL, dia); } +ACT_FN_GO(hibernate_now, __UNUSED__) +{ + e_sys_action_do(E_SYS_HIBERNATE, NULL); +} + ACT_FN_GO(hibernate, ) { if ((params) && (!strcmp(params, "now"))) @@ -3106,6 +3111,10 @@ e_actions_init(void) e_action_predef_name_set(N_("System"), N_("Hibernate"), "hibernate", NULL, NULL, 0); + ACT_GO(hibernate_now); + e_action_predef_name_set(N_("System"), N_("Hibernate Now"), "hibernate_now", + NULL, NULL, 0); + ACT_GO(pointer_resize_push); ACT_GO(pointer_resize_pop); diff --git a/src/bin/e_backlight.c b/src/bin/e_backlight.c index eb7806ac3..ab2bb42f3 100644 --- a/src/bin/e_backlight.c +++ b/src/bin/e_backlight.c @@ -82,11 +82,14 @@ e_backlight_init(void) _e_backlight_handler_desk_show = ecore_event_handler_add (E_EVENT_DESK_SHOW, _e_backlight_handler, NULL); -// if (bl_avail == EINA_TRUE) + if (bl_avail) { e_backlight_update(); - e_backlight_level_set(NULL, 0.0, 0.0); - e_backlight_level_set(NULL, e_config->backlight.normal, 1.0); + if (!getenv("E_RESTART")) + { + e_backlight_level_set(NULL, 0.0, 0.0); + e_backlight_level_set(NULL, e_config->backlight.normal, 1.0); + } } return 1; }