dont delay comp load - and sync on init too to make sure.

SVN revision: 46998
This commit is contained in:
Carsten Haitzler 2010-03-08 14:50:00 +00:00
parent cb5d3df3d4
commit 33e98b7b15
2 changed files with 21 additions and 19 deletions

View File

@ -2097,6 +2097,8 @@ e_mod_comp_init(void)
if (c) compositors = eina_list_append(compositors, c); if (c) compositors = eina_list_append(compositors, c);
} }
ecore_x_sync();
return 1; return 1;
} }

View File

@ -5,17 +5,17 @@
static Ecore_Event_Handler *init_done_handler = NULL; static Ecore_Event_Handler *init_done_handler = NULL;
static int //static int
_e_init_done(void *data, int type, void *event) //_e_init_done(void *data, int type, void *event)
{ //{
ecore_event_handler_del(init_done_handler); // ecore_event_handler_del(init_done_handler);
init_done_handler = NULL; // init_done_handler = NULL;
if (!e_mod_comp_init()) // if (!e_mod_comp_init())
{ // {
// FIXME: handle if comp init fails // // FIXME: handle if comp init fails
} // }
return 1; // return 1;
} //}
/* module private routines */ /* module private routines */
Mod *_comp_mod = NULL; Mod *_comp_mod = NULL;
@ -97,18 +97,18 @@ e_modapi_init(E_Module *m)
_comp_mod = mod; _comp_mod = mod;
if (e_init_count_get() <= 0) // if (e_init_count_get() <= 0)
{ // {
if (!e_mod_comp_init()) if (!e_mod_comp_init())
{ {
// FIXME: handle if comp init fails // FIXME: handle if comp init fails
} }
} // }
else // else
{ // {
init_done_handler = ecore_event_handler_add(E_EVENT_INIT_DONE, // init_done_handler = ecore_event_handler_add(E_EVENT_INIT_DONE,
_e_init_done, NULL); // _e_init_done, NULL);
} // }
return mod; return mod;
} }