hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Be less strict 

Prefer system set menu_file.
Try harder to find -merged dirs which matches the current menu.

SVN revision: 45265
This commit is contained in:
Sebastian Dransfeld 2010-01-17 18:57:49 +00:00
parent 4b33d2e4aa
commit 04edba1123
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
legacy/efreet/src/lib/efreet_menu.c
View File

@ -641,13 +641,8 @@ efreet_menu_get(void)
const char *dir;
Eina_List *config_dirs, *l;
/* check the users config directory first */
snprintf(menu, sizeof(menu), "%s/menus/%sapplications.menu",
efreet_config_home_get(), efreet_menu_prefix_get());
if (ecore_file_exists(menu))
return efreet_menu_parse(menu);
#ifndef STRICT_SPEC
/* prefer user set menu */
if (efreet_menu_file)
{
if (ecore_file_exists(efreet_menu_file))
@ -655,6 +650,12 @@ efreet_menu_get(void)
}
#endif
/* check the users config directory first */
snprintf(menu, sizeof(menu), "%s/menus/%sapplications.menu",
efreet_config_home_get(), efreet_menu_prefix_get());
if (ecore_file_exists(menu))
return efreet_menu_parse(menu);
/* fallback to the XDG_CONFIG_DIRS */
config_dirs = efreet_config_dirs_get();
EINA_LIST_FOREACH(config_dirs, l, dir)
@ -1790,6 +1791,9 @@ efreet_menu_handle_default_merge_dirs(Efreet_Menu_Internal *parent, Efreet_Xml *
{
Eina_List *dirs;
char path[PATH_MAX], *p;
#ifndef STRICT_SPEC
char parent_path[PATH_MAX];
#endif
const char *prefix;
if (!parent || !xml) return 0;
@ -1823,6 +1827,11 @@ efreet_menu_handle_default_merge_dirs(Efreet_Menu_Internal *parent, Efreet_Xml *
efreet_menu_merge_dir(parent, xml, p);
FREE(p);
}
#ifndef STRICT_SPEC
/* Also check the path of the parent file */
snprintf(parent_path, sizeof(parent_path), "%s/%s", parent->file.path, path);
efreet_menu_merge_dir(parent, xml, parent_path);
#endif
return 1;
}