enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

reorder some startup stuff to not fail when ecore events haven't been initialized 

eta until wayland-fb bug reports start rolling in: -5 minutes
This commit is contained in:
Mike Blumenkrantz 2014-01-16 20:09:45 -05:00
parent a12768c465
commit ddc89ad46b
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/bin/e_comp.c
View File

@ -1045,16 +1045,6 @@ e_comp_init(void)
ignores = eina_hash_pointer_new(NULL); ignores = eina_hash_pointer_new(NULL);
E_LIST_HANDLER_APPEND(handlers, E_EVENT_SCREENSAVER_ON, _e_comp_screensaver_on, NULL);
E_LIST_HANDLER_APPEND(handlers, E_EVENT_SCREENSAVER_OFF, _e_comp_screensaver_off, NULL);
E_LIST_HANDLER_APPEND(handlers, ECORE_EVENT_KEY_DOWN, _e_comp_key_down, NULL);
E_LIST_HANDLER_APPEND(handlers, ECORE_EVENT_SIGNAL_USER, _e_comp_signal_user, NULL);
E_LIST_HANDLER_APPEND(handlers, E_EVENT_ZONE_MOVE_RESIZE, _e_comp_cb_zone_change, NULL);
E_LIST_HANDLER_APPEND(handlers, E_EVENT_ZONE_ADD, _e_comp_cb_zone_change, NULL);
E_LIST_HANDLER_APPEND(handlers, E_EVENT_ZONE_DEL, _e_comp_cb_zone_change, NULL);
e_comp_cfdata_edd_init(&conf_edd, &conf_match_edd); e_comp_cfdata_edd_init(&conf_edd, &conf_match_edd);
conf = e_config_domain_load("e_comp", conf_edd); conf = e_config_domain_load("e_comp", conf_edd);
if (conf) if (conf)
@ -1127,6 +1117,16 @@ e_comp_init(void)
e_comp_wl_init(); e_comp_wl_init();
#endif #endif
E_LIST_HANDLER_APPEND(handlers, E_EVENT_SCREENSAVER_ON, _e_comp_screensaver_on, NULL);
E_LIST_HANDLER_APPEND(handlers, E_EVENT_SCREENSAVER_OFF, _e_comp_screensaver_off, NULL);
E_LIST_HANDLER_APPEND(handlers, ECORE_EVENT_KEY_DOWN, _e_comp_key_down, NULL);
E_LIST_HANDLER_APPEND(handlers, ECORE_EVENT_SIGNAL_USER, _e_comp_signal_user, NULL);
E_LIST_HANDLER_APPEND(handlers, E_EVENT_ZONE_MOVE_RESIZE, _e_comp_cb_zone_change, NULL);
E_LIST_HANDLER_APPEND(handlers, E_EVENT_ZONE_ADD, _e_comp_cb_zone_change, NULL);
E_LIST_HANDLER_APPEND(handlers, E_EVENT_ZONE_DEL, _e_comp_cb_zone_change, NULL);
return EINA_TRUE; return EINA_TRUE;
} }

19
src/bin/e_main.c
View File

@ -492,15 +492,6 @@ main(int argc, char **argv)
s = getenv("E_DESKLOCK_LOCKED"); s = getenv("E_DESKLOCK_LOCKED");
if ((s) && (!strcmp(s, "locked"))) waslocked = EINA_TRUE; if ((s) && (!strcmp(s, "locked"))) waslocked = EINA_TRUE;
TS("E_Pointer Init");
if (!e_pointer_init())
{
e_error_message_show(_("Enlightenment cannot set up its pointer system.\n"));
_e_main_shutdown(-1);
}
TS("E_Pointer Init Done");
_e_main_shutdown_push(e_pointer_shutdown);
TS("E Paths Init"); TS("E Paths Init");
if (!_e_main_path_init()) if (!_e_main_path_init())
{ {
@ -596,7 +587,6 @@ main(int argc, char **argv)
*/ */
e_zone_init(); e_zone_init();
e_desk_init(); e_desk_init();
e_menu_init();
e_exehist_init(); e_exehist_init();
@ -623,6 +613,15 @@ main(int argc, char **argv)
TS("Screens Init Done"); TS("Screens Init Done");
_e_main_shutdown_push(_e_main_screens_shutdown); _e_main_shutdown_push(_e_main_screens_shutdown);
TS("E_Pointer Init");
if (!e_pointer_init())
{
e_error_message_show(_("Enlightenment cannot set up its pointer system.\n"));
_e_main_shutdown(-1);
}
TS("E_Pointer Init Done");
_e_main_shutdown_push(e_pointer_shutdown);
e_menu_init();
TS("E_Scale Init"); TS("E_Scale Init");
if (!e_scale_init()) if (!e_scale_init())