styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Create symlinks in ~/.e/e/applications/all to system .desktop files, 

then we don't need full paths in .order files.  Full paths still
supported.


SVN revision: 25200
This commit is contained in:
David Walter Seikel 2006-08-30 05:00:58 +00:00
parent f40fcfa8b9
commit 91d183cc14
2 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/bin/e_apps.c
View File

@ -65,6 +65,7 @@ static void _e_app_print(const char *path, Ecore_File_Event event);
#endif
static void _e_app_check_order(const char *file);
static int _e_app_order_contains(E_App *a, const char *file);
static void _e_app_resolve_file_name(char *buf, size_t size, const char *path, const char *file);
/* local subsystem globals */
static Evas_Hash *_e_apps = NULL;
@ -289,10 +290,12 @@ e_app_new(const char *path, int scan_subdirs)
goto error;
}
else
return NULL;
{
return NULL;
}
_e_apps = evas_hash_add(_e_apps, a->path, a);
_e_apps_list = evas_list_prepend(_e_apps_list, a);
ac = e_app_cache_generate(a);
e_app_cache_save(ac, a->path);
e_app_cache_free(ac);
@ -388,10 +391,7 @@ e_app_subdir_scan(E_App *a, int scan_subdirs)
a2 = NULL;
if (s[0] == '/')
snprintf(buf, sizeof(buf), "%s", s);
else
snprintf(buf, sizeof(buf), "%s/%s", a->path, s);
_e_app_resolve_file_name(buf, sizeof(buf), a->path, s);
if (ecore_file_exists(buf))
{
a2 = e_app_new(buf, scan_subdirs);
@ -409,10 +409,7 @@ e_app_subdir_scan(E_App *a, int scan_subdirs)
pl = _e_apps_repositories;
while ((!a2) && (pl))
{
if (s[0] == '/')
snprintf(buf, sizeof(buf), "%s", s);
else
snprintf(buf, sizeof(buf), "%s/%s", (char *)pl->data, s);
_e_app_resolve_file_name(buf, sizeof(buf), (char *)pl->data, s);
a2 = e_app_new(buf, scan_subdirs);
pl = pl->next;
}
@ -1154,13 +1151,12 @@ e_app_fields_fill(E_App *a, const char *path)
}
if (!path) path = a->path;
ext = strchr(path, '.');
ext = strrchr(path, '.');
if ((ext) && (strcmp(ext, ".desktop") == 0))
{ /* It's a .desktop file. */
Ecore_Desktop *desktop;
desktop = ecore_desktop_get(path, lang);
if (!desktop) return;
if (desktop)
{
if (desktop->name) a->name = evas_stringshare_add(desktop->name);
@ -1952,10 +1948,7 @@ _e_app_subdir_rescan(E_App *app)
else
{
/* If we still haven't found it, it is new! */
if (s[0] == '/')
snprintf(buf, sizeof(buf), "%s", s);
else
snprintf(buf, sizeof(buf), "%s/%s", app->path, s);
_e_app_resolve_file_name(buf, sizeof(buf), app->path, s);
a2 = e_app_new(buf, 1);
if (a2)
{
@ -1977,10 +1970,7 @@ _e_app_subdir_rescan(E_App *app)
pl = _e_apps_repositories;
while ((!a2) && (pl))
{
if (s[0] == '/')
snprintf(buf, sizeof(buf), "%s", s);
else
snprintf(buf, sizeof(buf), "%s/%s", (char *)pl->data, s);
_e_app_resolve_file_name(buf, sizeof(buf), (char *)pl->data, s);
a2 = e_app_new(buf, 1);
pl = pl->next;
}
@ -2329,10 +2319,7 @@ _e_app_cb_scan_cache_timer(void *data)
// printf("Cache scan finish.\n");
return 0;
}
if (s[0] == '/')
snprintf(buf, sizeof(buf), "%s", s);
else
snprintf(buf, sizeof(buf), "%s/%s", sc->path, s);
_e_app_resolve_file_name(buf, sizeof(buf), sc->path, s);
is_dir = ecore_file_is_dir(buf);
if (_e_app_is_eapp(s) || is_dir)
{
@ -2386,10 +2373,7 @@ _e_app_cache_new(E_App_Cache *ac, const char *path, int scan_subdirs)
E_App *a2;
ac2 = l->data;
if (ac2->file[0] == '/')
snprintf(buf, sizeof(buf), "%s", ac2->file);
else
snprintf(buf, sizeof(buf), "%s/%s", path, ac2->file);
_e_app_resolve_file_name(buf, sizeof(buf), path, ac2->file);
if ((ac2->is_dir) && (scan_subdirs))
{
a2 = e_app_new(buf, scan_subdirs);
@ -2424,10 +2408,7 @@ _e_app_cache_new(E_App_Cache *ac, const char *path, int scan_subdirs)
a2 = NULL;
while ((!a2) && (pl))
{
if (ac2->file[0] == '/')
snprintf(buf, sizeof(buf), "%s", ac2->file);
else
snprintf(buf, sizeof(buf), "%s/%s", (char *)pl->data, ac2->file);
_e_app_resolve_file_name(buf, sizeof(buf), (char *)pl->data, ac2->file);
a2 = e_app_new(buf, scan_subdirs);
pl = pl->next;
}
@ -2557,3 +2538,18 @@ _e_app_order_contains(E_App *a, const char *file)
fclose(f);
return ret;
}
static void
_e_app_resolve_file_name(char *buf, size_t size, const char *path, const char *file)
{
size_t length;
length = strlen(path);
if (file[0] == '/')
snprintf(buf, size, "%s", file);
else if ((length > 0) && (path[length - 1] == '/'))
snprintf(buf, size, "%s%s", path, file);
else
snprintf(buf, size, "%s/%s", path, file);
}

10
src/bin/e_fdo_menu_to_order.c
View File

@ -90,7 +90,7 @@ _e_menu_dump_each_hash_node(void *value, void *user_data)
{
Ecore_Hash_Node *node;
Ecore_Desktop *desktop;
char *file, *path;
const char *file, *path;
path = (char *)user_data;
node = (Ecore_Hash_Node *) value;
@ -110,6 +110,10 @@ _e_menu_dump_each_hash_node(void *value, void *user_data)
FILE *f;
Ecore_List *list = NULL;
snprintf(path2, sizeof(path2), "%s/.e/e/applications/all/%s", ecore_desktop_home_get(), ecore_file_get_file(file));
if (!ecore_file_exists(path2))
ecore_file_symlink(file, path2);
file = ecore_file_get_file(file);
snprintf(order_path, sizeof(order_path), "%s/.e/e/applications/menu/all/%s", ecore_desktop_home_get(), path);
if (!ecore_file_exists(order_path))
{
@ -151,7 +155,7 @@ _e_menu_dump_each_hash_node(void *value, void *user_data)
}
fclose(f2);
/* If We Had To Create This Order Then Just Add The file */
if (!ecore_list_append(list, file))
if (!ecore_list_append(list, strdup(file)))
{
fprintf(stderr, "ERROR: Ecore List Append Failed !!\n");
return;
@ -188,7 +192,7 @@ _e_menu_dump_each_hash_node(void *value, void *user_data)
/* Add This file To List Of Existing ? */
if (!_e_search_list(list, file))
{
if (!ecore_list_append(list, file))
if (!ecore_list_append(list, strdup(file)))
{
fprintf(stderr, "ERROR: Ecore List Append Failed !!\n");
return;