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

fix e_fm2_mime_handler_mime_handlers_get() to return const like it should and fix usages to prevent freeing handlers. whoever wrote this initially should come over here so I can deliver spankies. 

SVN revision: 75767
This commit is contained in:
Mike Blumenkrantz 2012-08-28 08:54:54 +00:00
parent 45803968c5
commit 916fd8e183
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bin/e_fm.c
View File

@ -440,7 +440,7 @@ static int _e_fm_client_file_copy(const char *args, Evas_Object *e_fm)
static int _e_fm_client_file_symlink(const char *args, Evas_Object *e_fm);
static void _e_fm2_sel_rect_update(void *data);
static void _e_fm2_context_menu_append(Evas_Object *obj, const char *path, Eina_List *l, E_Menu *mn, E_Fm2_Icon *ic);
static void _e_fm2_context_menu_append(Evas_Object *obj, const char *path, const Eina_List *l, E_Menu *mn, E_Fm2_Icon *ic);
static int _e_fm2_context_list_sort(const void *data1, const void *data2);
static char *_e_fm_string_append_char(char *str, size_t *size, size_t *len, char c);
@ -8224,7 +8224,8 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp)
E_Manager *man;
E_Container *con;
E_Zone *zone;
Eina_List *sel, *l = NULL;
Eina_List *sel;
const Eina_List *l = NULL;
int x, y, can_w, can_w2, protect;
char buf[PATH_MAX], *ext;
@ -8489,13 +8490,15 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp)
}
static void
_e_fm2_context_menu_append(Evas_Object *obj, const char *path, Eina_List *l, E_Menu *mn, E_Fm2_Icon *ic)
_e_fm2_context_menu_append(Evas_Object *obj, const char *path, const Eina_List *list, E_Menu *mn, E_Fm2_Icon *ic)
{
E_Fm2_Mime_Handler *handler;
Eina_List *l;
Eina_Bool added = EINA_FALSE;
if (!l) return;
if (!list) return;
l = eina_list_clone(list);
l = eina_list_sort(l, -1, _e_fm2_context_list_sort);
EINA_LIST_FREE(l, handler)

7
src/bin/e_fm_mime.c
View File

@ -273,9 +273,7 @@ e_fm2_mime_handler_glob_del(E_Fm2_Mime_Handler *handler, const char *glob_)
}
}
/* get the list of mime handlers for a mime.
NOTE: the list should be free()'ed */
EAPI Eina_List *
EAPI const Eina_List *
e_fm2_mime_handler_mime_handlers_get(const char *mime)
{
if ((!mime) || (!_mime_handlers)) return NULL;
@ -327,8 +325,7 @@ e_fm2_mime_handler_call(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const cha
EAPI void
e_fm2_mime_handler_mime_handlers_call_all(Evas_Object *obj, const char *path, const char *mime)
{
Eina_List *handlers = NULL;
Eina_List *l = NULL;
const Eina_List *l, *handlers;
E_Fm2_Mime_Handler *handler = NULL;
if ((!obj) || (!path) || (!mime)) return;

2
src/bin/e_fm_mime.h
View File

@ -29,7 +29,7 @@ EAPI void e_fm2_mime_handler_mime_handlers_call_all(Evas_Object *obj, const char
EAPI void e_fm2_mime_handler_glob_handlers_call_all(Evas_Object *obj, const char *path, const char *glob);
EAPI void e_fm2_mime_handler_mime_del(E_Fm2_Mime_Handler *handler, const char *mime);
EAPI void e_fm2_mime_handler_glob_del(E_Fm2_Mime_Handler *handler, const char *glob);
EAPI Eina_List *e_fm2_mime_handler_mime_handlers_get(const char *mime);
EAPI const Eina_List *e_fm2_mime_handler_mime_handlers_get(const char *mime);
EAPI Eina_List *e_fm2_mime_handler_glob_handlers_get(const char *glob);
#endif