call e_powersave_init Before we call e_screensaver_init because the

init of e_screensaver sets up an event handler for the
powersave_update event (which would be 0 unless powersave is init
first).

Thanks to dt9 for the report ! ;)

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2014-12-18 10:13:27 -05:00 committed by Mike Blumenkrantz
parent bd6c9c0aaf
commit a3c7ebc28d
1 changed files with 10 additions and 11 deletions

View File

@ -628,6 +628,16 @@ main(int argc, char **argv)
e_desk_init();
e_exehist_init();
if (e_config->show_splash)
e_init_status_set(_("Setup Powersave Modes"));
TS("E_Powersave Init");
if (!e_powersave_init())
{
e_error_message_show(_("Enlightenment cannot set up its powersave modes.\n"));
_e_main_shutdown(-1);
}
TS("E_Powersave Init Done");
_e_main_shutdown_push(e_powersave_shutdown);
if (e_config->show_splash)
e_init_status_set(_("Setup Screensaver"));
@ -728,17 +738,6 @@ main(int argc, char **argv)
TS("E_Dpms Init Done");
_e_main_shutdown_push(e_dpms_shutdown);
if (e_config->show_splash)
e_init_status_set(_("Setup Powersave Modes"));
TS("E_Powersave Init");
if (!e_powersave_init())
{
e_error_message_show(_("Enlightenment cannot set up its powersave modes.\n"));
_e_main_shutdown(-1);
}
TS("E_Powersave Init Done");
_e_main_shutdown_push(e_powersave_shutdown);
if (e_config->show_splash)
e_init_status_set(_("Setup Desklock"));
TS("E_Desklock Init");