Hi, The attached patches fix three things: 0001 converts the remaining uses of ecore_dlist to using eina_list 0002 replaces the use of Eina_Compare_Cb with the use of EINA_COMPARE_CB 0003 Allows the e17-specified menu to be chosen as a menu only if STRICT_SPEC is not defined, as it is obviously not conforming to the spec. I tested a bit on my system and everything seems to be working correctly, however I haven't tested it really thoroughly. Comments welcome.
Regards, -- Albin Tonnerre
diff --git a/src/lib/efreet_desktop.c b/src/lib/efreet_desktop.c
index 9357add..2dfa357 100644
--- a/src/lib/efreet_desktop.c
+++ b/src/lib/efreet_desktop.c
@@ -1089,7 +1089,7 @@ efreet_desktop_environment_check(Efreet_Ini *ini)
/**
* @param desktop: the desktop entry
- * @param files: an ecore list of file names to execute, as either absolute paths,
+ * @param files: an eina list of file names to execute, as either absolute paths,
* relative paths, or uris
* @param func: a callback to call for each prepared command line
* @param data: user data passed to the callback
@@ -1105,8 +1105,8 @@ efreet_desktop_command_get(Efreet_Desktop *desktop, Eina_List *files,
/**
* @param desktop: the desktop entry
- * @param files an ecore list of local files, as absolute paths, local paths, or file:// uris (or NULL to get exec string with no files appended)
- * @return Returns an ecore list of exec strings
+ * @param files an eina list of local files, as absolute paths, local paths, or file:// uris (or NULL to get exec string with no files appended)
+ * @return Returns an eina list of exec strings
* @brief Get the command to use to execute a desktop entry
*
* The returned list and each of its elements must be freed.
@@ -1153,7 +1153,7 @@ efreet_desktop_command_local_get(Efreet_Desktop *desktop, Eina_List *files)
/**
* @param desktop: the desktop entry
- * @param files: an ecore list of file names to execute, as either absolute paths,
+ * @param files: an eina list of file names to execute, as either absolute paths,
* relative paths, or uris
* @param cb_command: a callback to call for each prepared command line
* @param cb_progress: a callback to get progress for the downloads
diff --git a/src/lib/efreet_menu.c b/src/lib/efreet_menu.c
index 1a77a38..57c85fa 100644
--- a/src/lib/efreet_menu.c
+++ b/src/lib/efreet_menu.c
@@ -41,7 +41,7 @@ struct Efreet_Menu_Internal
} name; /**< The names for this menu */
Efreet_Desktop *directory; /**< The directory */
- Ecore_DList *directories; /**< All the directories set in the menu file */
+ Eina_List *directories; /**< All the directories set in the menu file */
Efreet_Menu_Move *current_move; /**< The current move */
@@ -50,7 +50,7 @@ struct Efreet_Menu_Internal
Eina_List *app_pool; /**< application pool */
Eina_List *applications; /**< applications in this menu */
- Ecore_DList *directory_dirs; /**< .directory file directories */
+ Eina_List *directory_dirs; /**< .directory file directories */
Eina_Hash *directory_cache; /**< .directory dirs */
Eina_List *moves; /**< List of moves to be handled by the menu */
@@ -1001,10 +1001,10 @@ efreet_menu_internal_free(Efreet_Menu_Internal *internal)
internal->applications = eina_list_free(internal->applications);
- IF_FREE_DLIST(internal->directories);
+ IF_FREE_LIST(internal->directories, free);
IF_FREE_LIST(internal->app_dirs, efreet_menu_app_dir_free);
IF_FREE_LIST(internal->app_pool, efreet_menu_desktop_free);
- IF_FREE_DLIST(internal->directory_dirs);
+ IF_FREE_LIST(internal->directory_dirs, free);
IF_FREE_HASH(internal->directory_cache);
IF_FREE_LIST(internal->moves, efreet_menu_move_free);
@@ -1053,10 +1053,10 @@ static int
efreet_menu_handle_menu(Efreet_Menu_Internal *internal, Efreet_Xml *xml)
{
Efreet_Xml *child;
+ Eina_List *l;
int (*cb)(Efreet_Menu_Internal *parent, Efreet_Xml *xml);
- ecore_list_last_goto(xml->children);
- while ((child = ecore_dlist_previous(xml->children)))
+ EINA_LIST_REVERSE_FOREACH(xml->children, l, child)
{
cb = eina_hash_find(efreet_menu_handle_cbs, child->tag);
if (cb)
@@ -1206,13 +1206,13 @@ efreet_menu_handle_directory_dir(Efreet_Menu_Internal *parent, Efreet_Xml *xml)
if (!path) return 0;
/* we've already got this guy in our list we can skip it */
- if (ecore_list_find(parent->directory_dirs, ECORE_COMPARE_CB(strcmp), path))
+ if (eina_list_search_unsorted(parent->directory_dirs, EINA_COMPARE_CB(strcmp), path))
{
FREE(path);
return 1;
}
- ecore_dlist_prepend(parent->directory_dirs, path);
+ parent->directory_dirs = eina_list_prepend(parent->directory_dirs, path);
return 1;
}
@@ -1237,10 +1237,10 @@ efreet_menu_handle_default_directory_dirs(Efreet_Menu_Internal *parent, Efreet_X
"desktop-directories");
EINA_LIST_FOREACH(dirs, l, dir)
{
- if (ecore_list_find(parent->directory_dirs, ECORE_COMPARE_CB(strcmp), dir))
+ if (eina_list_search_unsorted(parent->directory_dirs, EINA_COMPARE_CB(strcmp), dir))
continue;
- ecore_dlist_prepend(parent->directory_dirs, strdup(dir));
+ parent->directory_dirs = eina_list_prepend(parent->directory_dirs, strdup(dir));
}
while (dirs)
@@ -1293,7 +1293,7 @@ efreet_menu_handle_directory(Efreet_Menu_Internal *parent, Efreet_Xml *xml)
if (!parent || !xml) return 0;
efreet_menu_create_directories_list(parent);
- ecore_dlist_prepend(parent->directories, strdup(xml->text));
+ parent->directories = eina_list_prepend(parent->directories, strdup(xml->text));
return 1;
}
@@ -1867,7 +1867,7 @@ efreet_menu_handle_legacy_dir_helper(Efreet_Menu_Internal *root,
/* add the legacy dir as a directory dir */
efreet_menu_create_directory_dirs_list(legacy_internal);
- ecore_dlist_append(legacy_internal->directory_dirs, strdup(path));
+ legacy_internal->directory_dirs = eina_list_append(legacy_internal->directory_dirs, strdup(path));
/* setup a filter for all the conforming .desktop files in the legacy
* dir */
@@ -2003,13 +2003,13 @@ static int
efreet_menu_handle_move(Efreet_Menu_Internal *parent, Efreet_Xml *xml)
{
Efreet_Xml *child;
+ Eina_List *l;
if (!parent || !xml) return 0;
efreet_menu_create_move_list(parent);
- ecore_list_first_goto(xml->children);
- while ((child = ecore_list_next(xml->children)))
+ EINA_LIST_FOREACH(xml->children, l, child)
{
int (*cb)(Efreet_Menu_Internal *parent, Efreet_Xml *xml);
@@ -2110,6 +2110,7 @@ static int
efreet_menu_handle_layout(Efreet_Menu_Internal *parent, Efreet_Xml *xml)
{
Efreet_Xml *child;
+ Eina_List *l;
if (!parent || !xml) return 0;
@@ -2118,8 +2119,7 @@ efreet_menu_handle_layout(Efreet_Menu_Internal *parent, Efreet_Xml *xml)
efreet_menu_create_layout_list(parent);
- ecore_list_first_goto(xml->children);
- while ((child = ecore_list_next(xml->children)))
+ EINA_LIST_FOREACH(xml->children, l, child)
{
int (*cb)(Efreet_Menu_Internal *parent, Efreet_Xml *xml, int def);
@@ -2152,6 +2152,7 @@ efreet_menu_handle_default_layout(Efreet_Menu_Internal *parent, Efreet_Xml *xml)
{
const char *val;
Efreet_Xml *child;
+ Eina_List *l;
if (!parent || !xml) return 0;
@@ -2175,8 +2176,7 @@ efreet_menu_handle_default_layout(Efreet_Menu_Internal *parent, Efreet_Xml *xml)
efreet_menu_create_default_layout_list(parent);
- ecore_list_first_goto(xml->children);
- while ((child = ecore_list_next(xml->children)))
+ EINA_LIST_FOREACH(xml->children, l, child)
{
int (*cb)(Efreet_Menu_Internal *parent, Efreet_Xml *xml, int def);
@@ -2353,9 +2353,9 @@ static int
efreet_menu_handle_filter_op(Efreet_Menu_Filter_Op *op, Efreet_Xml *xml)
{
Efreet_Xml *child;
+ Eina_List *l;
- ecore_list_first_goto(xml->children);
- while ((child = ecore_list_next(xml->children)))
+ EINA_LIST_FOREACH(xml->children, l, child)
{
int (*cb)(Efreet_Menu_Filter_Op *op, Efreet_Xml *xml);
@@ -2971,7 +2971,7 @@ efreet_menu_concatenate(Efreet_Menu_Internal *dest, Efreet_Menu_Internal *src)
if (src->directories)
{
efreet_menu_create_directories_list(dest);
- ecore_dlist_prepend_list(dest->directories, src->directories);
+ dest->directories = eina_list_merge(src->directories, dest->directories);
}
if (src->app_dirs)
@@ -2984,7 +2984,7 @@ efreet_menu_concatenate(Efreet_Menu_Internal *dest, Efreet_Menu_Internal *src)
if (src->directory_dirs)
{
efreet_menu_create_directory_dirs_list(dest);
- ecore_dlist_prepend_list(dest->directory_dirs, src->directory_dirs);
+ dest->directory_dirs = eina_list_merge(src->directory_dirs, dest->directory_dirs);
}
if (src->moves)
@@ -3270,8 +3270,7 @@ efreet_menu_create_directory_dirs_list(Efreet_Menu_Internal *internal)
{
if (!internal || internal->directory_dirs) return;
- internal->directory_dirs = ecore_dlist_new();
- ecore_dlist_free_cb_set(internal->directory_dirs, free);
+ internal->directory_dirs = NULL;
}
static void
@@ -3311,8 +3310,7 @@ efreet_menu_create_directories_list(Efreet_Menu_Internal *internal)
{
if (!internal || internal->directories) return;
- internal->directories = ecore_dlist_new();
- ecore_dlist_free_cb_set(internal->directories, free);
+ internal->directories = NULL;
}
static char *
@@ -3429,21 +3427,20 @@ static int
efreet_menu_directory_dirs_process(Efreet_Menu_Internal *internal)
{
const char *path;
+ Eina_List *l;
if (internal->directory_dirs)
{
internal->directory_cache =
eina_hash_string_superfast_new(EINA_FREE_CB(efreet_desktop_free));
- ecore_dlist_last_goto(internal->directory_dirs);
- while ((path = ecore_dlist_previous(internal->directory_dirs)))
+ EINA_LIST_REVERSE_FOREACH(internal->directory_dirs, l, path)
efreet_menu_directory_dir_scan(path, NULL, internal->directory_cache);
}
if (internal->directories)
{
- ecore_dlist_last_goto(internal->directories);
- while ((path = ecore_dlist_previous(internal->directories)))
+ EINA_LIST_REVERSE_FOREACH(internal->directories, l, path)
{
internal->directory = efreet_menu_directory_get(internal, path);
if (internal->directory) break;
diff --git a/src/lib/efreet_private.h b/src/lib/efreet_private.h
index 43e59c4..a566670 100644
--- a/src/lib/efreet_private.h
+++ b/src/lib/efreet_private.h
@@ -79,17 +79,6 @@
} while (0)
/**
- * @def IF_FREE_DLIST(x)
- * If x is a valid pointer destroy x and set to NULL
- */
-#define IF_FREE_DLIST(x) do { \
- if (x) { \
- Ecore_DList *__tmp; __tmp = (x); (x) = NULL; ecore_dlist_destroy(__tmp); \
- } \
- (x) = NULL; \
-} while (0)
-
-/**
* @def IF_FREE_HASH(x)
* If x is a valid pointer destroy x and set to NULL
*/
diff --git a/src/lib/efreet_utils.c b/src/lib/efreet_utils.c
index a4a812a..41df840 100644
--- a/src/lib/efreet_utils.c
+++ b/src/lib/efreet_utils.c
@@ -490,7 +490,7 @@ _hash_keys(Eina_Hash *hash __UNUSED__, const void *key, void *fdata)
/**
* Find all desktop categories
- * This list must be freed using ecore_list_destroy()
+ * This list must be freed using EINA_LIST_FREE
*
* @return an Eina_List of category names (const char *)
*/
@@ -1102,7 +1102,7 @@ efreet_util_monitor_free(void *data)
/**
* Returns a list of .menu files found in the various config dirs.
- * @return An ecore list of menu file paths (const char *). This must be freed with ecore_list_destroy().
+ * @return An eina list of menu file paths (const char *). This must be freed with EINA_LIST_FREE.
*/
EAPI Eina_List *
efreet_util_menus_find(void)
diff --git a/src/lib/efreet_xml.c b/src/lib/efreet_xml.c
index 12a01b8..b2b32a1 100644
--- a/src/lib/efreet_xml.c
+++ b/src/lib/efreet_xml.c
@@ -97,8 +97,7 @@ ERROR:
void
efreet_xml_del(Efreet_Xml *xml)
{
- if (xml->children) ecore_dlist_destroy(xml->children);
- xml->children = NULL;
+ IF_FREE_LIST(xml->children, efreet_xml_cb_attribute_free);
if (xml->tag) eina_stringshare_del(xml->tag);
if (xml->attributes)
@@ -166,11 +165,11 @@ efreet_xml_dump(Efreet_Xml *xml, int level)
if (xml->children)
{
Efreet_Xml *child;
+ Eina_List *l;
printf(">\n");
- ecore_dlist_first_goto(xml->children);
- while ((child = ecore_dlist_next(xml->children)))
+ EINA_LIST_FOREACH(xml->children, l, child)
efreet_xml_dump(child, level + 1);
for (i = 0; i < level; i++)
@@ -200,8 +199,7 @@ efreet_xml_parse(char **data, int *size)
return NULL;
}
- xml->children = ecore_dlist_new();
- ecore_dlist_free_cb_set(xml->children, efreet_xml_cb_attribute_free);
+ xml->children = NULL;
xml->tag = tag;
efreet_xml_attributes_parse(data, size, &(xml->attributes));
@@ -214,7 +212,7 @@ efreet_xml_parse(char **data, int *size)
if (efreet_xml_tag_close(data, size, xml->tag)) return xml;
while ((sub_xml = efreet_xml_parse(data, size)))
- ecore_dlist_append(xml->children, sub_xml);
+ xml->children = eina_list_append(xml->children, sub_xml);
efreet_xml_tag_close(data, size, xml->tag);
diff --git a/src/lib/efreet_xml.h b/src/lib/efreet_xml.h
index acd7bb2..0b93789 100644
--- a/src/lib/efreet_xml.h
+++ b/src/lib/efreet_xml.h
@@ -42,7 +42,7 @@ struct Efreet_Xml
Efreet_Xml_Attribute **attributes; /**< The attributes for this node */
- Ecore_DList *children; /**< Child nodes */
+ Eina_List *children; /**< Child nodes */
};
int efreet_xml_init(void);
--
1.6.2.1
diff --git a/src/lib/efreet_base.c b/src/lib/efreet_base.c
index 5464163..d60d21f 100644
--- a/src/lib/efreet_base.c
+++ b/src/lib/efreet_base.c
@@ -195,13 +195,13 @@ efreet_dirs_get(const char *key, const char *fallback)
while (p)
{
*p = '\0';
- if (!eina_list_search_unsorted(dirs, (Eina_Compare_Cb)strcmp, s))
+ if (!eina_list_search_unsorted(dirs, EINA_COMPARE_CB(strcmp), s))
dirs = eina_list_append(dirs, (void *)eina_stringshare_add(s));
s = ++p;
p = strchr(s, ':');
}
- if (!eina_list_search_unsorted(dirs, ECORE_COMPARE_CB(strcmp), s))
+ if (!eina_list_search_unsorted(dirs, EINA_COMPARE_CB(strcmp), s))
dirs = eina_list_append(dirs, (void *)eina_stringshare_add(s));
FREE(tmp);
diff --git a/src/lib/efreet_desktop.c b/src/lib/efreet_desktop.c
index 2dfa357..2983983 100644
--- a/src/lib/efreet_desktop.c
+++ b/src/lib/efreet_desktop.c
@@ -600,7 +600,7 @@ efreet_desktop_category_add(Efreet_Desktop *desktop, const char *category)
if (!desktop) return;
if (eina_list_search_unsorted(desktop->categories,
- (Eina_Compare_Cb)strcmp, category)) return;
+ EINA_COMPARE_CB(strcmp), category)) return;
desktop->categories = eina_list_append(desktop->categories,
(void *)eina_stringshare_add(category));
@@ -620,7 +620,7 @@ efreet_desktop_category_del(Efreet_Desktop *desktop, const char *category)
if (!desktop || !desktop->categories) return 0;
if ((found = eina_list_search_unsorted(desktop->categories,
- (Eina_Compare_Cb)strcmp, category)))
+ EINA_COMPARE_CB(strcmp), category)))
{
eina_stringshare_del(found);
desktop->categories = eina_list_remove(desktop->categories, found);
diff --git a/src/lib/efreet_icon.c b/src/lib/efreet_icon.c
index ab19b78..1bb24e9 100644
--- a/src/lib/efreet_icon.c
+++ b/src/lib/efreet_icon.c
@@ -1566,7 +1566,7 @@ efreet_icon_cache_check(Efreet_Icon_Theme *theme, const char *icon, unsigned int
if (!list) return NULL;
snprintf(key, sizeof(key), "%s %d", icon, size);
- cache = eina_list_search_unsorted(list, (Eina_Compare_Cb)efreet_icon_cache_find, key);
+ cache = eina_list_search_unsorted(list, EINA_COMPARE_CB(efreet_icon_cache_find), key);
if (cache)
{
if (!cache->path)
diff --git a/src/lib/efreet_menu.c b/src/lib/efreet_menu.c
index 57c85fa..346a159 100644
--- a/src/lib/efreet_menu.c
+++ b/src/lib/efreet_menu.c
@@ -878,7 +878,7 @@ efreet_menu_desktop_remove(Efreet_Menu *menu, Efreet_Desktop *desktop)
if (!desktop || !menu) return 0;
entry = eina_list_search_unsorted(menu->entries,
- (Eina_Compare_Cb)efreet_menu_cb_entry_compare_desktop,
+ EINA_COMPARE_CB(efreet_menu_cb_entry_compare_desktop),
desktop);
if (entry)
{
@@ -1098,7 +1098,7 @@ efreet_menu_handle_sub_menu(Efreet_Menu_Internal *parent, Efreet_Xml *xml)
/* if this menu already exists we just take this one and stick it on the
* start of the existing one */
if ((match = eina_list_search_unsorted(parent->sub_menus,
- (Eina_Compare_Cb)efreet_menu_cb_menu_compare,
+ EINA_COMPARE_CB(efreet_menu_cb_menu_compare),
internal)))
{
@@ -1132,7 +1132,7 @@ efreet_menu_handle_app_dir(Efreet_Menu_Internal *parent, Efreet_Xml *xml)
/* we've already got this guy in our list we can skip it */
if (eina_list_search_unsorted(parent->app_dirs,
- (Eina_Compare_Cb)efreet_menu_cb_app_dirs_compare,
+ EINA_COMPARE_CB(efreet_menu_cb_app_dirs_compare),
path))
{
FREE(path);
@@ -1171,7 +1171,7 @@ efreet_menu_handle_default_app_dirs(Efreet_Menu_Internal *parent, Efreet_Xml *xm
Efreet_Menu_App_Dir *app_dir;
if (eina_list_search_unsorted(parent->app_dirs,
- (Eina_Compare_Cb)efreet_menu_cb_app_dirs_compare,
+ EINA_COMPARE_CB(efreet_menu_cb_app_dirs_compare),
dir))
continue;
@@ -2057,7 +2057,7 @@ efreet_menu_handle_old(Efreet_Menu_Internal *parent, Efreet_Xml *xml)
/* XXX This seems wrong, but it makes efreet pass the fdo tests */
#ifndef STRICT_SPEC
move = eina_list_search_unsorted(parent->moves,
- (Eina_Compare_Cb)efreet_menu_cb_move_compare,
+ EINA_COMPARE_CB(efreet_menu_cb_move_compare),
xml->text);
if (move)
{
@@ -2815,7 +2815,7 @@ efreet_menu_filter_or_matches(Efreet_Menu_Filter_Op *op, Efreet_Menu_Desktop *md
EINA_LIST_FOREACH(op->categories, l, t)
{
if (eina_list_search_unsorted(md->desktop->categories,
- (Eina_Compare_Cb)strcmp, t))
+ EINA_COMPARE_CB(strcmp), t))
return 1;
}
}
@@ -2860,7 +2860,7 @@ efreet_menu_filter_and_matches(Efreet_Menu_Filter_Op *op, Efreet_Menu_Desktop *m
EINA_LIST_FOREACH(op->categories, l, t)
{
if (!eina_list_search_unsorted(md->desktop->categories,
- (Eina_Compare_Cb)strcmp, t))
+ EINA_COMPARE_CB(strcmp), t))
return 0;
}
}
@@ -2910,7 +2910,7 @@ efreet_menu_filter_not_matches(Efreet_Menu_Filter_Op *op, Efreet_Menu_Desktop *m
EINA_LIST_FOREACH(op->categories, l, t)
{
if (eina_list_search_unsorted(md->desktop->categories,
- (Eina_Compare_Cb)strcmp, t))
+ EINA_COMPARE_CB(strcmp), t))
return 0;
}
}
@@ -3012,7 +3012,7 @@ efreet_menu_concatenate(Efreet_Menu_Internal *dest, Efreet_Menu_Internal *src)
src->sub_menus = eina_list_remove(src->sub_menus, submenu);
/* if this menu is in the list already we just add to that */
if ((match = eina_list_search_unsorted(dest->sub_menus,
- (Eina_Compare_Cb)efreet_menu_cb_menu_compare,
+ EINA_COMPARE_CB(efreet_menu_cb_menu_compare),
submenu)))
{
efreet_menu_concatenate(match, submenu);
@@ -3129,7 +3129,7 @@ efreet_menu_by_name_find(Efreet_Menu_Internal *internal, const char *name, Efree
*part = '\0';
if (!(internal = eina_list_search_unsorted(internal->sub_menus,
- (Eina_Compare_Cb)efreet_menu_cb_compare_names,
+ EINA_COMPARE_CB(efreet_menu_cb_compare_names),
ptr)))
{
FREE(tmp);
@@ -3144,7 +3144,7 @@ efreet_menu_by_name_find(Efreet_Menu_Internal *internal, const char *name, Efree
/* find the menu in the parent list */
if (!(internal = eina_list_search_unsorted(internal->sub_menus,
- (Eina_Compare_Cb)efreet_menu_cb_compare_names,
+ EINA_COMPARE_CB(efreet_menu_cb_compare_names),
ptr)))
{
FREE(tmp);
@@ -3402,7 +3402,7 @@ efreet_menu_app_dir_scan(Efreet_Menu_Internal *internal, const char *path, const
}
/* Don't add two files with the same id in the app pool */
if (eina_list_search_unsorted(internal->app_pool,
- (Eina_Compare_Cb)efreet_menu_cb_md_compare_ids,
+ EINA_COMPARE_CB(efreet_menu_cb_md_compare_ids),
buf2))
continue;
@@ -3611,7 +3611,7 @@ efreet_menu_layout_menu(Efreet_Menu_Internal *internal)
{
internal->sub_menus = eina_list_sort(internal->sub_menus,
0,
- (Eina_Compare_Cb)efreet_menu_cb_menu_compare);
+ EINA_COMPARE_CB(efreet_menu_cb_menu_compare));
}
#endif
@@ -3708,7 +3708,7 @@ efreet_menu_layout_entries_get(Efreet_Menu *entry, Efreet_Menu_Internal *interna
else inline_alias = layout->inline_alias;
sub = eina_list_search_unsorted(internal->sub_menus,
- (Eina_Compare_Cb)efreet_menu_cb_compare_names, layout->name);
+ EINA_COMPARE_CB(efreet_menu_cb_compare_names), layout->name);
if (sub)
{
if (!(sub->directory && sub->directory->no_display) && !sub->deleted)
@@ -3774,7 +3774,7 @@ efreet_menu_layout_entries_get(Efreet_Menu *entry, Efreet_Menu_Internal *interna
{
Efreet_Menu_Desktop *md;
md = eina_list_search_unsorted(internal->applications,
- (Eina_Compare_Cb)efreet_menu_cb_md_compare_ids, layout->name);
+ EINA_COMPARE_CB(efreet_menu_cb_md_compare_ids), layout->name);
if (md)
{
sub_entry = efreet_menu_layout_desktop(md);
@@ -3793,7 +3793,7 @@ efreet_menu_layout_entries_get(Efreet_Menu *entry, Efreet_Menu_Internal *interna
internal->applications = eina_list_remove_list(internal->applications,
internal->applications);
sub_entry = eina_list_search_unsorted(entry->entries,
- (Eina_Compare_Cb)efreet_menu_cb_entry_compare_desktop,
+ EINA_COMPARE_CB(efreet_menu_cb_entry_compare_desktop),
md->desktop);
if (!sub_entry)
{
@@ -3816,7 +3816,7 @@ efreet_menu_layout_entries_get(Efreet_Menu *entry, Efreet_Menu_Internal *interna
continue;
}
sub_entry = eina_list_search_unsorted(entry->entries,
- (Eina_Compare_Cb)efreet_menu_cb_entry_compare_menu,
+ EINA_COMPARE_CB(efreet_menu_cb_entry_compare_menu),
sub);
if (!sub_entry)
{
diff --git a/src/lib/efreet_mime.c b/src/lib/efreet_mime.c
index eb6af88..176a6d5 100644
--- a/src/lib/efreet_mime.c
+++ b/src/lib/efreet_mime.c
@@ -732,7 +732,7 @@ efreet_mime_glob_remove(const char *glob)
{
Efreet_Mime_Glob *mime = NULL;
- if ((mime = eina_list_search_unsorted(globs, (Eina_Compare_Cb)strcmp, glob)))
+ if ((mime = eina_list_search_unsorted(globs, EINA_COMPARE_CB(strcmp), glob)))
{
globs = eina_list_remove(globs, mime);
IF_RELEASE(mime->glob);
--
1.6.2.1
diff --git a/src/lib/efreet_menu.c b/src/lib/efreet_menu.c
index 346a159..a36a844 100644
--- a/src/lib/efreet_menu.c
+++ b/src/lib/efreet_menu.c
@@ -608,11 +608,13 @@ efreet_menu_get(void)
if (ecore_file_exists(menu))
return efreet_menu_parse(menu);
+#ifndef STRICT_SPEC
if (efreet_menu_file)
{
if (ecore_file_exists(efreet_menu_file))
- return efreet_menu_parse(efreet_menu_file);
+ return efreet_menu_parse(efreet_menu_file);
}
+#endif
/* fallback to the XDG_CONFIG_DIRS */
config_dirs = efreet_config_dirs_get();
--
1.6.2.1
signature.asc
Description: Digital signature
------------------------------------------------------------------------------
_______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
