Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/e17genmenu/src/bin
Modified Files:
eaps.c fdo_paths.c icons.c main.c menus.c
Log Message:
* The dreaded Eap Torture Test (TM).
* Some quick patches to make it work. I'll give this a full code reveiw to
sort out the issues soon, or devilhorns will rewrite it. B-)
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/eaps.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- eaps.c 1 Feb 2006 09:41:25 -0000 1.4
+++ eaps.c 4 Feb 2006 00:36:48 -0000 1.5
@@ -111,12 +111,12 @@
engrave_edj_output(eet, f);
engrave_file_free(eet);
- if (icomp)
- free(icomp);
- if (idir)
- free(idir);
- if (ifile)
- free(ifile);
+// if (icomp)
+// free(icomp);
+// if (idir)
+// free(idir);
+// if (ifile)
+// free(ifile);
}
void
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/fdo_paths.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- fdo_paths.c 3 Feb 2006 06:52:16 -0000 1.8
+++ fdo_paths.c 4 Feb 2006 00:36:48 -0000 1.9
@@ -471,7 +471,9 @@
static void
_fdo_paths_check_and_add(Fdo_Path_List * paths, char *path)
{
+#ifdef DEBUG
printf("CHECKING %s", path);
+#endif
if (!_fdo_paths_list_exist(paths, path))
{
struct stat path_stat;
@@ -479,11 +481,15 @@
/* Check if the path exists. */
if ((stat(path, &path_stat) == 0) && (S_ISDIR(path_stat.st_mode)))
{
+#ifdef DEBUG
printf(" OK");
+#endif
_fdo_paths_list_extend(paths, path);
}
}
+#ifdef DEBUG
printf("\n");
+#endif
}
static void
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/icons.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- icons.c 3 Feb 2006 20:52:04 -0000 1.14
+++ icons.c 4 Feb 2006 00:36:48 -0000 1.15
@@ -64,7 +64,7 @@
char *dir, *icon_size, *icon_theme, *home;
if (icon == NULL)
- return DEFAULTICON;
+ return strdup(DEFAULTICON);
home = get_home();
@@ -77,7 +77,7 @@
if ((!strcmp(icon + strlen(icon) - 4, ".svg"))
|| (!strcmp(icon + strlen(icon) - 4, ".ico"))
|| (!strcmp(icon + strlen(icon) - 4, ".xpm")))
- return DEFAULTICON;
+ return strdup(DEFAULTICON);
/* Check For An Extension, Append PNG If Missing */
if (strrchr(icon, '.') == NULL)
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/main.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- main.c 3 Feb 2006 20:52:04 -0000 1.11
+++ main.c 4 Feb 2006 00:36:48 -0000 1.12
@@ -23,6 +23,7 @@
backup_eaps();
}
+#if 0
void
_e17genmenu_test_fdo_paths()
{
@@ -104,6 +105,7 @@
exit(0);
}
+#endif
void
_e17genmenu_help()
@@ -140,8 +142,8 @@
_e17genmenu_help();
if ((strstr(argv[i], "--backup")) || (strstr(argv[i], "-b")))
_e17genmenu_backup();
- if ((strstr(argv[i], "--fdo")) || (strstr(argv[i], "-f")))
- _e17genmenu_test_fdo_paths();
+// if ((strstr(argv[i], "--fdo")) || (strstr(argv[i], "-f")))
+// _e17genmenu_test_fdo_paths();
}
}
}
@@ -217,6 +219,9 @@
/* Set App Args */
ecore_app_args_set(argc, (const char **)argv);
+ /* Get the fdo paths. */
+ fdo_paths_init();
+
/* Start Making Menus */
make_menus();
@@ -232,6 +237,8 @@
get_home());
system(path);
+ fdo_paths_shutdown();
+
/* Shutdown */
_e17genmenu_shutdown();
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/menus.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- menus.c 1 Feb 2006 09:41:25 -0000 1.4
+++ menus.c 4 Feb 2006 00:36:48 -0000 1.5
@@ -30,7 +30,7 @@
char dirs[MAX_PATH];
snprintf(dirs, sizeof(dirs), path);
- dir = strdup(path);
+ dir = path; //strdup(path);
if (dirs)
{
if (strstr(dirs, ":"))
@@ -40,9 +40,9 @@
return;
while (dir)
{
-#ifdef DEBUG
+//#ifdef DEBUG
fprintf(stderr, "\nChecking For %s...\n", dir);
-#endif
+//#endif
if (ecore_file_exists(dir))
check_for_files(strdup(dir));
@@ -50,8 +50,8 @@
break;
dir = strtok(NULL, ":");
}
- if (dir)
- free(dir);
+// if (dir)
+// free(dir);
}
void
-------------------------------------------------------
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
