Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
menus-misc.c menus.c
Log Message:
Scan background dirs during startup (broke due to deferred menu loading).
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus-misc.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- menus-misc.c 26 Sep 2005 17:32:09 -0000 1.21
+++ menus-misc.c 20 Oct 2005 21:42:45 -0000 1.22
@@ -261,6 +261,10 @@
MenuSetData(m, Estrdup(dir));
MenuSetLoader(m, MenuLoadFromDirectory);
+ /* Hmmm... Make sure background dirs are scanned during startup */
+ if (Mode.wm.startup)
+ MenuLoadFromDirectory(m);
+
calls--;
return m;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -3 -r1.218 -r1.219
--- menus.c 12 Oct 2005 17:20:42 -0000 1.218
+++ menus.c 20 Oct 2005 21:42:45 -0000 1.219
@@ -1913,13 +1913,11 @@
for (i = 0; i < num; i++)
{
m = lst[i];
- if (!m->loader || m->shown || m->num == 0 ||
- m->last_access == 0 || ts - m->last_access < 300)
+ if (!m->loader || m->shown || m->num == 0 || ts - m->last_access < 300)
continue;
MenuEmpty(m, 0);
m->last_change = 0;
- m->last_access = 0;
}
if (lst)
Efree(lst);
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
