Hi,
I was just getting familiar with the e17 source. I added a patch for
the FIXME about checking the return value of e_module_init and a few
typos. I also added the shutdown onto the shutdown stack. Is there a
reason this wasn't done before?
Also, about this fixme,
/* FIXME: make save to delete within a callback */
E_Before_Idler *
e_main_idler_before_add(int (*func) (void *data), void *data, int once)
I assume its make safe to delete? and that would be make it safe to
delete idlers while their callbacks are being called?
Thanks,
Stafford
Index: e_main.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.48
diff -u -r1.48 e_main.c
--- e_main.c 21 Feb 2005 16:16:40 -0000 1.48
+++ e_main.c 4 Mar 2005 18:35:27 -0000
@@ -256,9 +256,15 @@
else
_e_main_shutdown_push(_e_main_ipc_shutdown);
- /* setup module loading etc. FIXME: check return value */
- e_module_init();
-
+ /* setup module loading etc */
+ if (!e_module_init())
+ {
+ e_error_message_show("Enlightenment cannot set up its module system.");
+ _e_main_shutdown(-1);
+ }
+ _e_main_shutdown_push(e_module_shutdown);
+
+ /* setup iconification */
if (!e_iconify_init())
{
e_error_message_show("Enlightenment cannot setup its iconify system.");
@@ -289,7 +295,7 @@
/* add in a handler that just before we go idle we flush x */
_e_main_idle_enterer_flusher = ecore_idle_enterer_add(_e_main_cb_x_flusher, NULL);
- /* an intle enterer to be called after all others */
+ /* an idle enterer to be called after all others */
_e_main_idle_enterer_after = ecore_idle_enterer_add(_e_main_cb_idler_after, NULL);
ecore_x_ungrab();
@@ -323,7 +329,6 @@
/* NB: no need to do this as config shutdown will flush any saves */
/* and all changed config was already saved before */
e_config_save_flush();
- e_module_shutdown();
/* unroll our stack of shutdown functions with exit code of 0 */
_e_main_shutdown(0);
@@ -340,7 +345,7 @@
return 0;
}
-/* FIXME: make save to deleet within a callback */
+/* FIXME: make save to delete within a callback */
E_Before_Idler *
e_main_idler_before_add(int (*func) (void *data), void *data, int once)
{
@@ -813,4 +818,3 @@
e_init_hide();
return 0;
}
-
