Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/e17genmenu/src/bin
Modified Files:
fdo_paths.c
Log Message:
First in a long line of "insert the error checking I hastily skipped before"
commits in an effort to get it to work on the half of the distros it's
currently
segving on.
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/fdo_paths.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- fdo_paths.c 19 Feb 2006 12:00:51 -0000 1.15
+++ fdo_paths.c 20 Feb 2006 04:09:29 -0000 1.16
@@ -449,8 +449,8 @@
ev = event;
if (!ev->exe)
return 1;
- if (!(ecore_exe_tag_get(ev->exe) &&
- (!strcmp(ecore_exe_tag_get(ev->exe), "genmenu/fdo"))))
+ value = ecore_exe_tag_get(ev->exe);
+ if ((!value) || (strcmp(value, "genmenu/fdo")) != 0)
return 1;
paths = data;
if (!paths)
@@ -460,35 +460,38 @@
return 1;
read = ecore_exe_event_data_get(ev->exe, ECORE_EXE_PIPE_READ);
- value = read->lines[0].line;
- if (value)
+ if ((read) && (read->lines[0].line))
{
- config_list = dumb_list_from_paths(value);
- if (config_list)
- {
- int i, j;
+ value = read->lines[0].line;
+ if (value)
+ {
+ config_list = dumb_list_from_paths(value);
+ if (config_list)
+ {
+ int i, j;
- for (i = 0; i < config_list->size; i++)
- {
- if (ced->types)
- {
- for (j = 0; j < ced->types->size; j++)
- {
- _fdo_paths_massage_path(path, ced->home,
+ for (i = 0; i < config_list->size; i++)
+ {
+ if (ced->types)
+ {
+ for (j = 0; j < ced->types->size; j++)
+ {
+ _fdo_paths_massage_path(path, ced->home,
config_list->elements[i].element,
ced->types->elements[j].element);
- _fdo_paths_check_and_add(paths, path);
- }
- }
- else
- {
- _fdo_paths_massage_path(path, ced->home,
config_list->elements[i].element,
+ _fdo_paths_check_and_add(paths, path);
+ }
+ }
+ else
+ {
+ _fdo_paths_massage_path(path, ced->home,
config_list->elements[i].element,
NULL);
- _fdo_paths_check_and_add(paths, path);
- }
- }
- E_FN_DEL(dumb_list_del, config_list);
- }
+ _fdo_paths_check_and_add(paths, path);
+ }
+ }
+ E_FN_DEL(dumb_list_del, config_list);
+ }
+ }
}
ced->done = 1;
return 1;
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
