Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/e17genmenu
Modified Files:
Makefile.am main.c menus.c
Log Message:
No need to convert fdo menus anymore, it's done by E17. I'll clean this
up later, just making sure it compiles now.
===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/e17genmenu/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am 22 Aug 2006 00:45:19 -0000 1.5
+++ Makefile.am 5 Sep 2006 16:35:18 -0000 1.6
@@ -15,8 +15,8 @@
bin_PROGRAMS = e17genmenu
-e17genmenu_SOURCES = main.c global.c e_fdo_menu_to_order.c menus.c parse.c
eaps.c order.c sort.c
+e17genmenu_SOURCES = main.c global.c menus.c parse.c eaps.c order.c sort.c
-noinst_HEADERS = global.h e_fdo_menu_to_order.h menus.h parse.h eaps.h order.h
sort.h
+noinst_HEADERS = global.h menus.h parse.h eaps.h order.h sort.h
e17genmenu_LDADD = @EET_LIBS@ @ECORE_LIBS@ @ENGRAVE_LIBS@
===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/e17genmenu/main.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- main.c 21 Aug 2006 19:43:02 -0000 1.15
+++ main.c 5 Sep 2006 16:35:18 -0000 1.16
@@ -113,22 +113,6 @@
}
-#ifdef DEBUG
-static void
-_print_theme(void *value, void *user_data)
-{
- Ecore_Hash_Node *node;
- Ecore_Desktop_Icon_Theme *theme;
- char *key;
-
- node = (Ecore_Hash_Node *) value;
- key = node->key;
- theme = node->value;
- printf("FDO icon theme %s is in %s\n", key, theme->path);
-}
-#endif
-
-
double convert_time = 0.0, icon_time = 0.0, cache_time = 0.0, generate_time =
0.0;
int menu_count, item_count, reject_count, not_over_count, not_found_count;
@@ -137,10 +121,6 @@
{
char path[PATH_MAX];
double start, begin, paths, gen;
-#ifdef DEBUG
- char *this_path;
- Ecore_Hash *icon_themes;
-#endif
/* Init E Stuff */
_e17genmenu_init();
@@ -156,31 +136,6 @@
begin = ecore_time_get();
ecore_desktop_init();
paths = ecore_time_get() - begin;
-
-#ifdef DEBUG
- /* You can iterate through the various path lists as needed. */
- ecore_list_goto_first(ecore_desktop_paths_config);
- while ((this_path = ecore_list_next(ecore_desktop_paths_config)) != NULL)
- printf("FDO config path = %s\n", this_path);
- ecore_list_goto_first(ecore_desktop_paths_menus);
- while ((this_path = ecore_list_next(ecore_desktop_paths_menus)) != NULL)
- printf("FDO menu path = %s\n", this_path);
- ecore_list_goto_first(ecore_desktop_paths_directories);
- while ((this_path = ecore_list_next(ecore_desktop_paths_directories)) !=
NULL)
- printf("FDO directory path = %s\n", this_path);
- ecore_list_goto_first(ecore_desktop_paths_desktops);
- while ((this_path = ecore_list_next(ecore_desktop_paths_desktops)) != NULL)
- printf("FDO desktop path = %s\n", this_path);
- ecore_list_goto_first(ecore_desktop_paths_icons);
- while ((this_path = ecore_list_next(ecore_desktop_paths_icons)) != NULL)
- printf("FDO icon path = %s\n", this_path);
- ecore_list_goto_first(ecore_desktop_paths_kde_legacy);
- while ((this_path = ecore_list_next(ecore_desktop_paths_kde_legacy)) !=
NULL)
- printf("FDO kde legacy path = %s\n", this_path);
-
- if ((icon_themes = ecore_desktop_icon_theme_list()))
- ecore_hash_for_each_node(icon_themes, _print_theme, NULL);
-#endif
/* Just being paranoid, and cause people have removed these during testing.
*/
snprintf(path, sizeof(path), "%s/.e/e/applications/all",
ecore_desktop_home_get());
===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/e17genmenu/menus.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- menus.c 22 Aug 2006 00:45:19 -0000 1.11
+++ menus.c 5 Sep 2006 16:35:18 -0000 1.12
@@ -2,7 +2,6 @@
#include "config.h"
#include "parse.h"
#include "menus.h"
-#include "e_fdo_menu_to_order.h"
//#define DEBUG 1
@@ -33,17 +32,14 @@
check_for_dirs(KDE_DIRS); /* FIXME: probably obsolete. */
check_for_dirs(DEBIAN_DIRS); /* FIXME: may or may not be
obsolete. */
- ecore_list_goto_first(ecore_desktop_paths_desktops);
- while ((this_path =
ecore_list_next(ecore_desktop_paths_desktops)) != NULL)
- check_for_dirs(this_path);
- ecore_list_goto_first(ecore_desktop_paths_kde_legacy);
- while ((this_path =
ecore_list_next(ecore_desktop_paths_kde_legacy)) != NULL)
- check_for_dirs(this_path);
+// ecore_list_goto_first(ecore_desktop_paths_desktops);
+// while ((this_path =
ecore_list_next(ecore_desktop_paths_desktops)) != NULL)
+// check_for_dirs(this_path);
+// ecore_list_goto_first(ecore_desktop_paths_kde_legacy);
+// while ((this_path =
ecore_list_next(ecore_desktop_paths_kde_legacy)) != NULL)
+// check_for_dirs(this_path);
generate_time = ecore_time_get() - begin;
}
-
- printf("Converting freedesktop.org (fdo) menus.\n");
- e_fdo_menu_to_order();
}
if (d)
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
