From 5a12b590ac40ad78343dff846d67d18e6e152c98 Mon Sep 17 00:00:00 2001 From: rephorm Date: Thu, 7 Jun 2007 01:22:48 +0000 Subject: [PATCH] add efreet_menu_new() small fixes SVN revision: 30267 --- legacy/efreet/src/lib/efreet_icon.c | 2 +- legacy/efreet/src/lib/efreet_menu.c | 9 +++++++++ legacy/efreet/src/lib/efreet_menu.h | 1 + legacy/efreet/src/lib/efreet_utils.c | 6 +++++- legacy/efreet/src/lib/efreet_utils.h | 2 +- 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/legacy/efreet/src/lib/efreet_icon.c b/legacy/efreet/src/lib/efreet_icon.c index 6193a04420..686836361b 100644 --- a/legacy/efreet/src/lib/efreet_icon.c +++ b/legacy/efreet/src/lib/efreet_icon.c @@ -840,7 +840,7 @@ efreet_icon_new(const char *path) if (!icon->name) { - char *file; + const char *file; file = ecore_file_get_file(icon->path); p = strrchr(icon->path, '.'); diff --git a/legacy/efreet/src/lib/efreet_menu.c b/legacy/efreet/src/lib/efreet_menu.c index 1c5c99eb91..2b28ccb6ac 100644 --- a/legacy/efreet/src/lib/efreet_menu.c +++ b/legacy/efreet/src/lib/efreet_menu.c @@ -554,6 +554,15 @@ efreet_menu_shutdown(void) ecore_string_shutdown(); } +Efreet_Menu * +efreet_menu_new(void) +{ + Efreet_Menu *menu; + menu = efreet_menu_entry_new(); + menu->type = EFREET_MENU_ENTRY_MENU; + return menu; +} + /** * @return Returns the Efreet_Menu_Internal representation of the default menu or * NULL if none found diff --git a/legacy/efreet/src/lib/efreet_menu.h b/legacy/efreet/src/lib/efreet_menu.h index 29214d7c16..57791d1749 100644 --- a/legacy/efreet/src/lib/efreet_menu.h +++ b/legacy/efreet/src/lib/efreet_menu.h @@ -51,6 +51,7 @@ struct Efreet_Menu int efreet_menu_kde_legacy_init(void); +Efreet_Menu *efreet_menu_new(void); Efreet_Menu *efreet_menu_get(void); Efreet_Menu *efreet_menu_parse(const char *path); int efreet_menu_save(Efreet_Menu *menu, const char *path); diff --git a/legacy/efreet/src/lib/efreet_utils.c b/legacy/efreet/src/lib/efreet_utils.c index 6fde3d6e4c..cbf7b465e1 100644 --- a/legacy/efreet/src/lib/efreet_utils.c +++ b/legacy/efreet/src/lib/efreet_utils.c @@ -421,6 +421,7 @@ efreet_util_desktop_comment_glob_list(const char *glob) /** * Find all desktop categories + * This list must be freed using ecore_list_destroy() * * @return an Ecore_List of category names (const char *) */ @@ -432,10 +433,13 @@ efreet_util_desktop_categories_list() /** * Find all desktops in a given category + * + * Note: this returns a pointer to an internal list. Do not add to, remove from, or delete this list. + * * @param category the category name * @return a list of desktops */ -const Ecore_List * +Ecore_List * efreet_util_desktop_category_list(const char *category) { return ecore_hash_get(desktops_by_category, category); diff --git a/legacy/efreet/src/lib/efreet_utils.h b/legacy/efreet/src/lib/efreet_utils.h index a88084acd0..8ac50f18b0 100644 --- a/legacy/efreet/src/lib/efreet_utils.h +++ b/legacy/efreet/src/lib/efreet_utils.h @@ -39,7 +39,7 @@ Ecore_List *efreet_util_desktop_generic_name_glob_list(const char *glob); Ecore_List *efreet_util_desktop_comment_glob_list(const char *glob); Ecore_List *efreet_util_desktop_categories_list(); -const Ecore_List *efreet_util_desktop_category_list(const char *category); +Ecore_List *efreet_util_desktop_category_list(const char *category); Ecore_List *efreet_util_menus_find(); extern int EFREET_EVENT_DESKTOP_LIST_CHANGE;