summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2014-12-18 10:13:27 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2014-12-18 11:40:12 -0500
commita3c7ebc28d8540e09c7afdd2575cf26dcf90cda2 (patch)
tree6645ee40ca80f6a1f3f5dee0a8f17c448666c5d8
parentbd6c9c0aaf3006e1ce9e2c686208e0a5463551fc (diff)
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>
-rw-r--r--src/bin/e_main.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index dde87ad49..67570ec99 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -628,6 +628,16 @@ main(int argc, char **argv)
628 e_desk_init(); 628 e_desk_init();
629 e_exehist_init(); 629 e_exehist_init();
630 630
631 if (e_config->show_splash)
632 e_init_status_set(_("Setup Powersave Modes"));
633 TS("E_Powersave Init");
634 if (!e_powersave_init())
635 {
636 e_error_message_show(_("Enlightenment cannot set up its powersave modes.\n"));
637 _e_main_shutdown(-1);
638 }
639 TS("E_Powersave Init Done");
640 _e_main_shutdown_push(e_powersave_shutdown);
631 641
632 if (e_config->show_splash) 642 if (e_config->show_splash)
633 e_init_status_set(_("Setup Screensaver")); 643 e_init_status_set(_("Setup Screensaver"));
@@ -729,17 +739,6 @@ main(int argc, char **argv)
729 _e_main_shutdown_push(e_dpms_shutdown); 739 _e_main_shutdown_push(e_dpms_shutdown);
730 740
731 if (e_config->show_splash) 741 if (e_config->show_splash)
732 e_init_status_set(_("Setup Powersave Modes"));
733 TS("E_Powersave Init");
734 if (!e_powersave_init())
735 {
736 e_error_message_show(_("Enlightenment cannot set up its powersave modes.\n"));
737 _e_main_shutdown(-1);
738 }
739 TS("E_Powersave Init Done");
740 _e_main_shutdown_push(e_powersave_shutdown);
741
742 if (e_config->show_splash)
743 e_init_status_set(_("Setup Desklock")); 742 e_init_status_set(_("Setup Desklock"));
744 TS("E_Desklock Init"); 743 TS("E_Desklock Init");
745 if (!e_desklock_init()) 744 if (!e_desklock_init())