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

SVN revision: 46998

diff --git a/src/modules/comp/e_mod_comp.c b/src/modules/comp/e_mod_comp.c
index 14a354b..c0c43dd 100644 (file)
--- a/src/modules/comp/e_mod_comp.c
+++ b/src/modules/comp/e_mod_comp.c
@@ -2097,6 +2097,8 @@ e_mod_comp_init(void)
         if (c) compositors = eina_list_append(compositors, c);
      }
    
+   ecore_x_sync();
+   
    return 1;
 }
 

diff --git a/src/modules/comp/e_mod_main.c b/src/modules/comp/e_mod_main.c
index 049e2ca..e3ba3fd 100644 (file)
--- a/src/modules/comp/e_mod_main.c
+++ b/src/modules/comp/e_mod_main.c
@@ -5,17 +5,17 @@
 
 static Ecore_Event_Handler *init_done_handler = NULL;
 
-static int
-_e_init_done(void *data, int type, void *event)
-{
-   ecore_event_handler_del(init_done_handler);
-   init_done_handler = NULL;
-   if (!e_mod_comp_init())
-     {
-        // FIXME: handle if comp init fails
-     }
-   return 1;
-}
+//static int
+//_e_init_done(void *data, int type, void *event)
+//{
+//   ecore_event_handler_del(init_done_handler);
+//   init_done_handler = NULL;
+//   if (!e_mod_comp_init())
+//     {
+//        // FIXME: handle if comp init fails
+//     }
+//   return 1;
+//}
 
 /* module private routines */
 Mod *_comp_mod = NULL;
@@ -97,18 +97,18 @@ e_modapi_init(E_Module *m)
    
    _comp_mod = mod;
 
-   if (e_init_count_get() <= 0)
-     {
+//   if (e_init_count_get() <= 0)
+//     {
         if (!e_mod_comp_init())
           {
              // FIXME: handle if comp init fails
           }
-     }
-   else
-     {
-        init_done_handler = ecore_event_handler_add(E_EVENT_INIT_DONE,
-                                                    _e_init_done, NULL);
-     }
+//     }
+//   else
+//     {
+//        init_done_handler = ecore_event_handler_add(E_EVENT_INIT_DONE,
+//                                                    _e_init_done, NULL);
+//     }
    
    return mod;
 }