forked from enlightenment/efl
parent
b2193b6fd3
commit
c53f0f501b
|
@ -1625,7 +1625,7 @@ efreet_menu_merge_dir(Efreet_Menu_Internal *parent, Efreet_Xml *xml, const char
|
||||||
{
|
{
|
||||||
char *p;
|
char *p;
|
||||||
|
|
||||||
p = strrchr(info->path + info->name_length, '.');
|
p = strrchr(info->path + info->name_start, '.');
|
||||||
if (!p) continue;
|
if (!p) continue;
|
||||||
if (strcmp(p, ".menu")) continue;
|
if (strcmp(p, ".menu")) continue;
|
||||||
|
|
||||||
|
@ -1816,7 +1816,7 @@ efreet_menu_handle_legacy_dir_helper(Efreet_Menu_Internal *root,
|
||||||
char *exten;
|
char *exten;
|
||||||
const char *fname;
|
const char *fname;
|
||||||
|
|
||||||
fname = info->path + info->name_length;
|
fname = info->path + info->name_start;
|
||||||
/* recurse into sub directories */
|
/* recurse into sub directories */
|
||||||
if (ecore_file_is_dir(info->path))
|
if (ecore_file_is_dir(info->path))
|
||||||
{
|
{
|
||||||
|
@ -3296,7 +3296,7 @@ efreet_menu_app_dir_scan(Efreet_Menu_Internal *internal, const char *path, const
|
||||||
{
|
{
|
||||||
const char *fname;
|
const char *fname;
|
||||||
|
|
||||||
fname = info->path + info->name_length;
|
fname = info->path + info->name_start;
|
||||||
if (id)
|
if (id)
|
||||||
snprintf(buf2, sizeof(buf2), "%s-%s", id, fname);
|
snprintf(buf2, sizeof(buf2), "%s-%s", id, fname);
|
||||||
else
|
else
|
||||||
|
@ -3404,7 +3404,7 @@ efreet_menu_directory_dir_scan(const char *path, const char *relative_path,
|
||||||
{
|
{
|
||||||
const char *fname;
|
const char *fname;
|
||||||
|
|
||||||
fname = info->path + info->name_length;
|
fname = info->path + info->name_start;
|
||||||
if (relative_path)
|
if (relative_path)
|
||||||
snprintf(buf2, sizeof(buf2), "%s/%s", relative_path, fname);
|
snprintf(buf2, sizeof(buf2), "%s/%s", relative_path, fname);
|
||||||
else
|
else
|
||||||
|
|
|
@ -353,7 +353,7 @@ efreet_util_menus_find_helper(Eina_List *menus, const char *config_dir)
|
||||||
EINA_ITERATOR_FOREACH(it, info)
|
EINA_ITERATOR_FOREACH(it, info)
|
||||||
{
|
{
|
||||||
const char *exten;
|
const char *exten;
|
||||||
exten = strrchr(info->path + info->name_length, '.');
|
exten = strrchr(info->path + info->name_start, '.');
|
||||||
if (!exten) continue;
|
if (!exten) continue;
|
||||||
if (strcmp(".menu", exten)) continue;
|
if (strcmp(".menu", exten)) continue;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue