Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/e17genmenu
Modified Files:
global.c main.c menus.c parse.c sort.c
Log Message:
Updated to match ecore_desktop name changes.
===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/e17genmenu/global.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- global.c 11 Aug 2006 13:50:04 -0000 1.4
+++ global.c 14 Aug 2006 05:45:06 -0000 1.5
@@ -156,7 +156,7 @@
Ecore_List *eaps = NULL;
/* Check That Dir All Exists */
- snprintf(path, sizeof(path), "%s" EAPPDIR, ecore_desktop_get_home());
+ snprintf(path, sizeof(path), "%s" EAPPDIR, ecore_desktop_home_get());
if (!ecore_file_exists(path))
{
fprintf(stderr, "ERROR: %s doesn't exist. Where are the eapps ?\n",
path);
@@ -179,7 +179,7 @@
#ifdef DEBUG
fprintf(stderr, "Backing Up %s\n", tmp);
#endif
- snprintf(dest, sizeof(dest), "%s/EapBackup",
ecore_desktop_get_home());
+ snprintf(dest, sizeof(dest), "%s/EapBackup",
ecore_desktop_home_get());
if (!ecore_file_exists(dest))
{
if (!ecore_file_mkdir(dest))
@@ -187,7 +187,7 @@
}
/* Copy The File */
- snprintf(dest, sizeof(dest), "%s/EapBackup/%s",
ecore_desktop_get_home(), file);
+ snprintf(dest, sizeof(dest), "%s/EapBackup/%s",
ecore_desktop_home_get(), file);
result = ecore_file_cp(tmp, dest);
if (!result)
break;
@@ -206,7 +206,7 @@
if ((!eap->icon) || (!eap->name) || (!eap->exec) || (!eap->window_class))
return;
- snprintf(path, sizeof(path), "%s/MAPPING", ecore_desktop_get_home());
+ snprintf(path, sizeof(path), "%s/MAPPING", ecore_desktop_home_get());
f = fopen(path, "a+");
if (!f)
{
===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/e17genmenu/main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- main.c 11 Aug 2006 13:50:04 -0000 1.9
+++ main.c 14 Aug 2006 05:45:06 -0000 1.10
@@ -92,7 +92,7 @@
}
/* Check That Dir All Exists */
- snprintf(path, sizeof(path), "%s" EAPPDIR, ecore_desktop_get_home());
+ snprintf(path, sizeof(path), "%s" EAPPDIR, ecore_desktop_home_get());
if (!ecore_file_exists(path))
{
fprintf(stderr, "ERROR: %s doesn't exist. Where are the eapps?\n",
path);
@@ -164,9 +164,9 @@
/* Just being paranoid, and cause people have removed these during testing.
*/
- snprintf(path, sizeof(path), "%s/.e/e/applications/all",
ecore_desktop_get_home());
+ snprintf(path, sizeof(path), "%s/.e/e/applications/all",
ecore_desktop_home_get());
ecore_file_mkpath(path);
- snprintf(path, sizeof(path), "%s/.e/e/applications/favorite",
ecore_desktop_get_home());
+ snprintf(path, sizeof(path), "%s/.e/e/applications/favorite",
ecore_desktop_home_get());
ecore_file_mkpath(path);
begin = ecore_time_get();
@@ -181,7 +181,7 @@
*
* Currently I do this instead, it seems to work -
*/
- snprintf(path, sizeof(path),
"%s/.e/e/applications/favorite/.eap.cache.cfg", ecore_desktop_get_home());
+ snprintf(path, sizeof(path),
"%s/.e/e/applications/favorite/.eap.cache.cfg", ecore_desktop_home_get());
ecore_file_unlink(path);
/* Update E Cache */
@@ -189,9 +189,9 @@
#ifdef DEBUG
fprintf(stderr, "Regenerating Eapp Caches...\n");
#endif
- snprintf(path, sizeof(path), "enlightenment_eapp_cache_gen %s" EAPPDIR "
-r", ecore_desktop_get_home());
+ snprintf(path, sizeof(path), "enlightenment_eapp_cache_gen %s" EAPPDIR "
-r", ecore_desktop_home_get());
system(path);
- snprintf(path, sizeof(path), "enlightenment_eapp_cache_gen
%s/.e/e/applications/favorite -r", ecore_desktop_get_home());
+ snprintf(path, sizeof(path), "enlightenment_eapp_cache_gen
%s/.e/e/applications/favorite -r", ecore_desktop_home_get());
system(path);
cache_time += ecore_time_get() - begin;
===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/e17genmenu/menus.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- menus.c 11 Aug 2006 13:50:04 -0000 1.6
+++ menus.c 14 Aug 2006 05:45:06 -0000 1.7
@@ -47,7 +47,7 @@
printf("Converting freedesktop.org (fdo) menus.\n");
/* Find the main menu file. */
- menu_file =
ecore_desktop_paths_search_for_file(ecore_desktop_paths_menus, menu, 1, NULL,
NULL);
+ menu_file = ecore_desktop_paths_file_find(ecore_desktop_paths_menus,
menu, 1, NULL, NULL);
if (menu_file)
{
char *path;
@@ -58,7 +58,7 @@
Ecore_Desktop_Tree *menus = NULL;
/* convert the xml into menus */
- menus = ecore_desktop_menus_get(menu_file, NULL, 0);
+ menus = ecore_desktop_menu_get(menu_file, NULL, 0);
if (menus)
{
/* create the .eap and order files from the menu */
===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/e17genmenu/parse.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- parse.c 11 Aug 2006 13:50:04 -0000 1.11
+++ parse.c 14 Aug 2006 05:45:06 -0000 1.12
@@ -111,7 +111,7 @@
G_Eap *eap;
Ecore_Desktop *desktop;
- home = ecore_desktop_get_home();
+ home = ecore_desktop_home_get();
#ifdef DEBUG
fprintf(stderr, "Parsing Desktop File %s\n", app);
@@ -120,7 +120,7 @@
eap = calloc(1, sizeof(G_Eap));
eap->eap_name = get_eap_name(app);
- desktop = ecore_desktop_parse_file(app);
+ desktop = ecore_desktop_get(app);
if (desktop)
{
if (desktop->name)
@@ -198,7 +198,7 @@
icon_size = get_icon_size();
icon_theme = get_icon_theme();
- home = ecore_desktop_get_home();
+ home = ecore_desktop_home_get();
overwrite = get_overwrite();
snprintf(path, sizeof(path), "%s" EAPPDIR "/%s", home, eap->eap_name);
@@ -207,7 +207,7 @@
not_over_count++;
else
{
- eap->icon_path = ecore_desktop_find_icon(eap->icon, icon_size,
icon_theme);
+ eap->icon_path = ecore_desktop_icon_find(eap->icon, icon_size,
icon_theme);
write_icon(path, eap);
}
===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/e17genmenu/sort.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- sort.c 11 Aug 2006 13:50:04 -0000 1.2
+++ sort.c 14 Aug 2006 05:45:06 -0000 1.3
@@ -66,7 +66,7 @@
fprintf(stderr, "Sorting Menu %s...\n", path);
#endif
- home = ecore_desktop_get_home();
+ home = ecore_desktop_home_get();
snprintf(path2, sizeof(path2), "%s/.order", path);
if (!ecore_file_exists(path2))
create_order(path2);
@@ -136,7 +136,7 @@
fprintf(stderr, "Sorting Menus...\n");
#endif
- home = ecore_desktop_get_home();
+ home = ecore_desktop_home_get();
snprintf(path, sizeof(path), "%s" EFAVDIR, home);
list = (Ecore_List *)ecore_file_ls(path);
if (!list)
@@ -169,7 +169,7 @@
fprintf(stderr, "\nSorting Favorites Menu...\n");
#endif
- home = ecore_desktop_get_home();
+ home = ecore_desktop_home_get();
snprintf(path, sizeof(path), "%s" EFAVDIR "/.order", home);
if (!ecore_file_exists(path))
-------------------------------------------------------------------------
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
