Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/e17genmenu
Modified Files:
eaps.c fdo_menus.c
Log Message:
Lame attempts to fix some problems, or at least stop them from crashing.
I'll look closer at these problems tomorrow.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/eaps.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- eaps.c 7 Mar 2006 21:58:24 -0000 1.1
+++ eaps.c 9 Mar 2006 15:00:12 -0000 1.2
@@ -74,11 +74,10 @@
#ifdef DEBUG
fprintf(stderr, "\tWriting Icon %s\n", i);
#endif
- if (!i)
- ifile = ecore_file_get_file(DEFAULTICON);
- if (i)
- ifile = ecore_file_get_file(i);
-
+ /* FIXME: This does not seem to be catching all the problems. Further head
scratching is needed. */
+ if ((!i) || (i[0] == '\0'))
+ i = DEFAULTICON;
+ ifile = ecore_file_get_file(i);
idir = ecore_file_get_dir(i);
eet = engrave_file_new();
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/fdo_menus.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- fdo_menus.c 9 Mar 2006 03:06:25 -0000 1.2
+++ fdo_menus.c 9 Mar 2006 15:00:12 -0000 1.3
@@ -534,8 +534,16 @@
int i, count = 0, menu_count = 0;
legacy_data = (struct _fdo_menus_legacy_data *)data;
- menu_path = (char *)legacy_data->current->elements[1].element;
- menu_path += 12 + legacy_data->menu_length;
+ if (legacy_data->current->elements[1].type == DUMB_TREE_ELEMENT_TYPE_STRING)
+ {
+ menu_path = (char *)legacy_data->current->elements[1].element;
+ menu_path += 12 + legacy_data->menu_length;
+ }
+ else
+ {
+ menu_path = "";
+ printf(" PROBLEM IN LEGACYDIR FILE - %s - %s %s\n",
legacy_data->prefix, legacy_data->path, &path[legacy_data->length]);
+ }
for (i = legacy_data->length; path[i] != '\0'; i++)
{
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
