enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

This commit is huge. I did test it a lot on my computer, and it run fine here. 

But is so big i fear i could have broken some piece of code. So report any wrong
behaviour to me (cedric on #edevelop).

So moving e17 and efreet to eina_hash. With a little efreet API break so they
must come together.


SVN revision: 38185
This commit is contained in:
Cedric BAIL 2008-12-17 15:33:43 +00:00
parent e29866312c
commit 773d102291
46 changed files with 940 additions and 812 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bin/e_actions.c
View File

@ -2256,7 +2256,7 @@ ACT_FN_END_MOUSE(delayed_action)
} }
/* local subsystem globals */ /* local subsystem globals */
static Evas_Hash *actions = NULL; static Eina_Hash *actions = NULL;
static Eina_List *action_list = NULL; static Eina_List *action_list = NULL;
static Eina_List *action_names = NULL; static Eina_List *action_names = NULL;
static Eina_List *action_groups = NULL; static Eina_List *action_groups = NULL;
@ -2268,6 +2268,7 @@ e_actions_init(void)
{ {
E_Action *act; E_Action *act;
actions = eina_hash_string_superfast_new(NULL);
ACT_GO(window_move); ACT_GO(window_move);
e_action_predef_name_set(_("Window : Actions"), _("Move"), e_action_predef_name_set(_("Window : Actions"), _("Move"),
"window_move", NULL, NULL, 0); "window_move", NULL, NULL, 0);
@ -2655,7 +2656,7 @@ e_actions_shutdown(void)
{ {
e_action_predef_name_all_del(); e_action_predef_name_all_del();
action_names = eina_list_free(action_names); action_names = eina_list_free(action_names);
evas_hash_free(actions); eina_hash_free(actions);
actions = NULL; actions = NULL;
E_FREE_LIST(action_list, e_object_del); E_FREE_LIST(action_list, e_object_del);
@ -2679,7 +2680,7 @@ e_action_add(const char *name)
act = E_OBJECT_ALLOC(E_Action, E_ACTION_TYPE, _e_action_free); act = E_OBJECT_ALLOC(E_Action, E_ACTION_TYPE, _e_action_free);
if (!act) return NULL; if (!act) return NULL;
act->name = name; act->name = name;
actions = evas_hash_direct_add(actions, act->name, act); eina_hash_direct_add(actions, act->name, act);
action_names = eina_list_append(action_names, name); action_names = eina_list_append(action_names, name);
action_list = eina_list_append(action_list, act); action_list = eina_list_append(action_list, act);
} }
@ -2691,7 +2692,7 @@ e_action_del(const char *name)
{ {
E_Action *act; E_Action *act;
act = evas_hash_find(actions, name); act = eina_hash_find(actions, name);
if (act) if (act)
_e_action_free(act); _e_action_free(act);
} }
@ -2700,8 +2701,7 @@ EAPI E_Action *
e_action_find(const char *name) e_action_find(const char *name)
{ {
E_Action *act; E_Action *act;
act = eina_hash_find(actions, name);
act = evas_hash_find(actions, name);
return act; return act;
} }
@ -2870,7 +2870,7 @@ e_action_groups_get(void)
static void static void
_e_action_free(E_Action *act) _e_action_free(E_Action *act)
{ {
actions = evas_hash_del(actions, act->name, act); eina_hash_del(actions, act->name, act);
action_names = eina_list_remove(action_names, act->name); action_names = eina_list_remove(action_names, act->name);
action_list = eina_list_remove(action_list, act); action_list = eina_list_remove(action_list, act);
free(act); free(act);

37
src/bin/e_border.c
View File

@ -107,7 +107,7 @@ static void _e_border_hook_call(E_Border_Hook_Point hookpoint, E_Border *bd);
/* local subsystem globals */ /* local subsystem globals */
static Eina_List *handlers = NULL; static Eina_List *handlers = NULL;
static Eina_List *borders = NULL; static Eina_List *borders = NULL;
static Evas_Hash *borders_hash = NULL; static Eina_Hash *borders_hash = NULL;
static E_Border *focused = NULL; static E_Border *focused = NULL;
static E_Border *resize = NULL; static E_Border *resize = NULL;
@ -183,12 +183,12 @@ e_border_init(void)
ecore_x_passive_grab_replay_func_set(_e_border_cb_grab_replay, NULL); ecore_x_passive_grab_replay_func_set(_e_border_cb_grab_replay, NULL);
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_POINTER_WARP, _e_border_cb_pointer_warp, NULL)); handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_POINTER_WARP, _e_border_cb_pointer_warp, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(EFREET_EVENT_DESKTOP_LIST_CHANGE, _e_border_cb_efreet_desktop_list_change, NULL)); handlers = eina_list_append(handlers, ecore_event_handler_add(EFREET_EVENT_DESKTOP_LIST_CHANGE, _e_border_cb_efreet_desktop_list_change, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(EFREET_EVENT_DESKTOP_CHANGE, _e_border_cb_efreet_desktop_change, NULL)); handlers = eina_list_append(handlers, ecore_event_handler_add(EFREET_EVENT_DESKTOP_CHANGE, _e_border_cb_efreet_desktop_change, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_CONFIG_ICON_THEME, _e_border_cb_config_icon_theme, NULL)); handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_CONFIG_ICON_THEME, _e_border_cb_config_icon_theme, NULL));
if (!borders_hash) borders_hash = eina_hash_string_superfast_new(NULL);
E_EVENT_BORDER_ADD = ecore_event_type_new(); E_EVENT_BORDER_ADD = ecore_event_type_new();
E_EVENT_BORDER_REMOVE = ecore_event_type_new(); E_EVENT_BORDER_REMOVE = ecore_event_type_new();
E_EVENT_BORDER_DESK_SET = ecore_event_type_new(); E_EVENT_BORDER_DESK_SET = ecore_event_type_new();
@ -218,6 +218,9 @@ e_border_shutdown(void)
{ {
E_FREE_LIST(handlers, ecore_event_handler_del); E_FREE_LIST(handlers, ecore_event_handler_del);
if (borders_hash) eina_hash_free(borders_hash);
borders_hash = NULL;
return 1; return 1;
} }
@ -486,7 +489,7 @@ e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal)
bd->desk = e_desk_current_get(bd->zone); bd->desk = e_desk_current_get(bd->zone);
e_container_border_add(bd); e_container_border_add(bd);
borders = eina_list_append(borders, bd); borders = eina_list_append(borders, bd);
bd2 = evas_hash_find(borders_hash, e_util_winid_str_get(bd->client.win)); bd2 = eina_hash_find(borders_hash, e_util_winid_str_get(bd->client.win));
if (bd2) if (bd2)
{ {
printf("EEEEK! 2 borders with same client window id in them! very bad!\n"); printf("EEEEK! 2 borders with same client window id in them! very bad!\n");
@ -495,13 +498,13 @@ e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal)
printf("bd=%p, bd->references=%i, bd->deleted=%i, bd->client.win=%x\n", printf("bd=%p, bd->references=%i, bd->deleted=%i, bd->client.win=%x\n",
bd2, bd2->e_obj_inherit.references, bd2->e_obj_inherit.deleted, bd2, bd2->e_obj_inherit.references, bd2->e_obj_inherit.deleted,
bd2->client.win); bd2->client.win);
borders_hash = evas_hash_del(borders_hash, e_util_winid_str_get(bd->client.win), bd2); eina_hash_del(borders_hash, e_util_winid_str_get(bd->client.win), bd2);
borders_hash = evas_hash_del(borders_hash, e_util_winid_str_get(bd2->bg_win), bd2); eina_hash_del(borders_hash, e_util_winid_str_get(bd2->bg_win), bd2);
borders_hash = evas_hash_del(borders_hash, e_util_winid_str_get(bd2->win), bd2); eina_hash_del(borders_hash, e_util_winid_str_get(bd2->win), bd2);
} }
borders_hash = evas_hash_add(borders_hash, e_util_winid_str_get(bd->client.win), bd); eina_hash_add(borders_hash, e_util_winid_str_get(bd->client.win), bd);
borders_hash = evas_hash_add(borders_hash, e_util_winid_str_get(bd->bg_win), bd); eina_hash_add(borders_hash, e_util_winid_str_get(bd->bg_win), bd);
borders_hash = evas_hash_add(borders_hash, e_util_winid_str_get(bd->win), bd); eina_hash_add(borders_hash, e_util_winid_str_get(bd->win), bd);
managed = 1; managed = 1;
ecore_x_window_prop_card32_set(win, E_ATOM_MANAGED, &managed, 1); ecore_x_window_prop_card32_set(win, E_ATOM_MANAGED, &managed, 1);
ecore_x_window_prop_card32_set(win, E_ATOM_CONTAINER, &bd->zone->container->num, 1); ecore_x_window_prop_card32_set(win, E_ATOM_CONTAINER, &bd->zone->container->num, 1);
@ -2434,7 +2437,7 @@ e_border_find_by_client_window(Ecore_X_Window win)
{ {
E_Border *bd; E_Border *bd;
bd = evas_hash_find(borders_hash, e_util_winid_str_get(win)); bd = eina_hash_find(borders_hash, e_util_winid_str_get(win));
if ((bd) && (!e_object_is_del(E_OBJECT(bd))) && if ((bd) && (!e_object_is_del(E_OBJECT(bd))) &&
(bd->client.win == win)) (bd->client.win == win))
return bd; return bd;
@ -2446,7 +2449,7 @@ e_border_find_all_by_client_window(Ecore_X_Window win)
{ {
E_Border *bd; E_Border *bd;
bd = evas_hash_find(borders_hash, e_util_winid_str_get(win)); bd = eina_hash_find(borders_hash, e_util_winid_str_get(win));
if ((bd) && (bd->client.win == win)) if ((bd) && (bd->client.win == win))
return bd; return bd;
return NULL; return NULL;
@ -2457,7 +2460,7 @@ e_border_find_by_frame_window(Ecore_X_Window win)
{ {
E_Border *bd; E_Border *bd;
bd = evas_hash_find(borders_hash, e_util_winid_str_get(win)); bd = eina_hash_find(borders_hash, e_util_winid_str_get(win));
if ((bd) && (!e_object_is_del(E_OBJECT(bd))) && if ((bd) && (!e_object_is_del(E_OBJECT(bd))) &&
(bd->bg_win == win)) (bd->bg_win == win))
return bd; return bd;
@ -2469,7 +2472,7 @@ e_border_find_by_window(Ecore_X_Window win)
{ {
E_Border *bd; E_Border *bd;
bd = evas_hash_find(borders_hash, e_util_winid_str_get(win)); bd = eina_hash_find(borders_hash, e_util_winid_str_get(win));
if ((bd) && (!e_object_is_del(E_OBJECT(bd))) && if ((bd) && (!e_object_is_del(E_OBJECT(bd))) &&
(bd->win == win)) (bd->win == win))
return bd; return bd;
@ -3709,9 +3712,9 @@ _e_border_free(E_Border *bd)
e_bindings_wheel_ungrab(E_BINDING_CONTEXT_BORDER, bd->win); e_bindings_wheel_ungrab(E_BINDING_CONTEXT_BORDER, bd->win);
ecore_x_window_del(bd->win); ecore_x_window_del(bd->win);
borders_hash = evas_hash_del(borders_hash, e_util_winid_str_get(bd->client.win), bd); eina_hash_del(borders_hash, e_util_winid_str_get(bd->client.win), bd);
borders_hash = evas_hash_del(borders_hash, e_util_winid_str_get(bd->bg_win), bd); eina_hash_del(borders_hash, e_util_winid_str_get(bd->bg_win), bd);
borders_hash = evas_hash_del(borders_hash, e_util_winid_str_get(bd->win), bd); eina_hash_del(borders_hash, e_util_winid_str_get(bd->win), bd);
borders = eina_list_remove(borders, bd); borders = eina_list_remove(borders, bd);
focus_stack = eina_list_remove(focus_stack, bd); focus_stack = eina_list_remove(focus_stack, bd);
raise_stack = eina_list_remove(raise_stack, bd); raise_stack = eina_list_remove(raise_stack, bd);

8
src/bin/e_config_data.c
View File

@ -18,10 +18,10 @@ e_config_descriptor_new(const char *name, int size)
eddc.func.list_data = (void *(*)(void *)) eina_list_data_get; eddc.func.list_data = (void *(*)(void *)) eina_list_data_get;
eddc.func.list_free = (void *(*)(void *)) eina_list_free; eddc.func.list_free = (void *(*)(void *)) eina_list_free;
eddc.func.hash_foreach = eddc.func.hash_foreach =
(void (*) (void *, int (*) (void *, const char *, void *, void *), void *)) (void (*) (const Eina_Hash *, Eina_Bool (*) (const Eina_Hash *, const void *, void *, void *), const void *))
evas_hash_foreach; eina_hash_foreach;
eddc.func.hash_add = (void *(*) (void *, const char *, void *)) evas_hash_add; eddc.func.hash_add = (Eina_Hash* (*) (Eina_Hash *, const void *, void *)) eet_eina_hash_add_alloc;
eddc.func.hash_free = (void (*) (void *)) evas_hash_free; eddc.func.hash_free = (void (*) (Eina_Hash *)) eina_hash_free;
eddc.name = name; eddc.name = name;
eddc.size = size; eddc.size = size;
return (E_Config_DD *)eet_data_descriptor2_new(&eddc); return (E_Config_DD *)eet_data_descriptor2_new(&eddc);

9
src/bin/e_config_data.h
View File

@ -29,6 +29,15 @@ typedef Eet_Data_Descriptor E_Config_DD;
#ifndef E_CONFIG_DATA_H #ifndef E_CONFIG_DATA_H
#define E_CONFIG_DATA_H #define E_CONFIG_DATA_H
static inline Eina_Hash *
eet_eina_hash_add_alloc(Eina_Hash *hash, const void *key, void *data)
{
if (!hash) hash = eina_hash_string_superfast_new(NULL);
if (!hash) return NULL;
eina_hash_add(hash, key, data);
return hash;
}
EAPI E_Config_DD *e_config_descriptor_new(const char *name, int size); EAPI E_Config_DD *e_config_descriptor_new(const char *name, int size);
#endif #endif

8
src/bin/e_configure.c
View File

@ -92,11 +92,11 @@ _e_configure_efreet_desktop_update(void)
label = NULL; label = NULL;
if (desktop->x) if (desktop->x)
{ {
cfg_cat_cfg = ecore_hash_get(desktop->x, "X-Enlightenment-Config-Category"); cfg_cat_cfg = eina_hash_find(desktop->x, "X-Enlightenment-Config-Category");
s = ecore_hash_get(desktop->x, "X-Enlightenment-Config-Priority"); s = eina_hash_find(desktop->x, "X-Enlightenment-Config-Priority");
if (s) cfg_pri = atoi(s); if (s) cfg_pri = atoi(s);
cfg_cat_name = ecore_hash_get(desktop->x, "X-Enlightenment-Config-Category-Name"); cfg_cat_name = eina_hash_find(desktop->x, "X-Enlightenment-Config-Category-Name");
cfg_cat_icon = ecore_hash_get(desktop->x, "X-Enlightenment-Config-Category-Icon"); cfg_cat_icon = eina_hash_find(desktop->x, "X-Enlightenment-Config-Category-Icon");
if (cfg_cat_icon) if (cfg_cat_icon)
{ {
if (cfg_cat_icon[0] == '/') if (cfg_cat_icon[0] == '/')

14
src/bin/e_datastore.c
View File

@ -6,26 +6,30 @@
/* local subsystem functions */ /* local subsystem functions */
/* local subsystem globals */ /* local subsystem globals */
static Evas_Hash *store = NULL; static Eina_Hash *store = NULL;
/* externally accessible functions */ /* externally accessible functions */
EAPI void EAPI void
e_datastore_set(char *key, void *data) e_datastore_set(char *key, void *data)
{ {
store = evas_hash_del(store, key, NULL); if (!store) store = eina_hash_string_superfast_new(NULL);
store = evas_hash_add(store, key, data); eina_hash_del(store, key, NULL);
eina_hash_add(store, key, data);
} }
EAPI void * EAPI void *
e_datastore_get(char *key) e_datastore_get(char *key)
{ {
return evas_hash_find(store, key); return eina_hash_find(store, key);
} }
EAPI void EAPI void
e_datastore_del(char *key) e_datastore_del(char *key)
{ {
store = evas_hash_del(store, key, NULL); eina_hash_del(store, key, NULL);
if (eina_hash_population(store)) return;
eina_hash_free(store);
store = NULL;
} }
/* local subsystem functions */ /* local subsystem functions */

31
src/bin/e_dnd.c
View File

@ -55,7 +55,7 @@ struct _XDnd
static Eina_List *_event_handlers = NULL; static Eina_List *_event_handlers = NULL;
static Eina_List *_drop_handlers = NULL; static Eina_List *_drop_handlers = NULL;
static Evas_Hash *_drop_win_hash = NULL; static Eina_Hash *_drop_win_hash = NULL;
static Ecore_X_Window _drag_win = 0; static Ecore_X_Window _drag_win = 0;
static Ecore_X_Window _drag_win_root = 0; static Ecore_X_Window _drag_win_root = 0;
@ -65,7 +65,7 @@ static E_Drag *_drag_current = NULL;
static XDnd *_xdnd = NULL; static XDnd *_xdnd = NULL;
static Evas_Hash *_drop_handlers_responsives; static Eina_Hash *_drop_handlers_responsives;
static Ecore_X_Atom _action; static Ecore_X_Atom _action;
/* externally accessible functions */ /* externally accessible functions */
@ -73,6 +73,9 @@ static Ecore_X_Atom _action;
EAPI int EAPI int
e_dnd_init(void) e_dnd_init(void)
{ {
_drop_win_hash = eina_hash_string_superfast_new(NULL);
_drop_handlers_responsives = eina_hash_string_superfast_new(NULL);
_event_handlers = eina_list_append(_event_handlers, _event_handlers = eina_list_append(_event_handlers,
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_UP, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_UP,
_e_dnd_cb_mouse_up, NULL)); _e_dnd_cb_mouse_up, NULL));
@ -138,11 +141,11 @@ e_dnd_shutdown(void)
eina_list_free(_event_handlers); eina_list_free(_event_handlers);
_event_handlers = NULL; _event_handlers = NULL;
evas_hash_free(_drop_win_hash); eina_hash_free(_drop_win_hash);
eina_list_free(_drop_handlers); eina_list_free(_drop_handlers);
_drop_handlers = NULL; _drop_handlers = NULL;
evas_hash_free(_drop_handlers_responsives); eina_hash_free(_drop_handlers_responsives);
return 1; return 1;
} }
@ -425,16 +428,16 @@ e_drop_xdnd_register_set(Ecore_X_Window win, int reg)
id = e_util_winid_str_get(win); id = e_util_winid_str_get(win);
if (reg) if (reg)
{ {
if (!evas_hash_find(_drop_win_hash, id)) if (!eina_hash_find(_drop_win_hash, id))
{ {
ecore_x_dnd_aware_set(win, 1); ecore_x_dnd_aware_set(win, 1);
_drop_win_hash = evas_hash_add(_drop_win_hash, id, (void *)1); eina_hash_add(_drop_win_hash, id, (void *)1);
} }
} }
else else
{ {
ecore_x_dnd_aware_set(win, 0); ecore_x_dnd_aware_set(win, 0);
_drop_win_hash = evas_hash_del(_drop_win_hash, id, (void *) 1); eina_hash_del(_drop_win_hash, id, (void *) 1);
} }
return 1; return 1;
} }
@ -514,7 +517,7 @@ e_drop_handler_responsive_set(E_Drop_Handler *handler)
Ecore_X_Window hwin = _e_drag_win_get(handler, 1); Ecore_X_Window hwin = _e_drag_win_get(handler, 1);
const char *wid = e_util_winid_str_get(hwin); const char *wid = e_util_winid_str_get(hwin);
_drop_handlers_responsives = evas_hash_add(_drop_handlers_responsives, wid, (void *)handler); eina_hash_add(_drop_handlers_responsives, wid, (void *)handler);
} }
EAPI int EAPI int
@ -523,7 +526,7 @@ e_drop_handler_responsive_get(E_Drop_Handler *handler)
Ecore_X_Window hwin = _e_drag_win_get(handler, 1); Ecore_X_Window hwin = _e_drag_win_get(handler, 1);
const char *wid = e_util_winid_str_get(hwin); const char *wid = e_util_winid_str_get(hwin);
return evas_hash_find(_drop_handlers_responsives, wid) == (void *)handler; return eina_hash_find(_drop_handlers_responsives, wid) == (void *)handler;
} }
EAPI void EAPI void
@ -1186,7 +1189,7 @@ _e_dnd_cb_event_dnd_enter(void *data, int type, void *event)
ev = event; ev = event;
id = e_util_winid_str_get(ev->win); id = e_util_winid_str_get(ev->win);
if (!evas_hash_find(_drop_win_hash, id)) return 1; if (!eina_hash_find(_drop_win_hash, id)) return 1;
for (l = _drop_handlers; l; l = l->next) for (l = _drop_handlers; l; l = l->next)
{ {
E_Drop_Handler *h; E_Drop_Handler *h;
@ -1258,7 +1261,7 @@ _e_dnd_cb_event_dnd_leave(void *data, int type, void *event)
ev = event; ev = event;
id = e_util_winid_str_get(ev->win); id = e_util_winid_str_get(ev->win);
if (!evas_hash_find(_drop_win_hash, id)) return 1; if (!eina_hash_find(_drop_win_hash, id)) return 1;
leave_ev.x = 0; leave_ev.x = 0;
leave_ev.y = 0; leave_ev.y = 0;
@ -1304,7 +1307,7 @@ _e_dnd_cb_event_dnd_position(void *data, int type, void *event)
ev = event; ev = event;
// double t1 = ecore_time_get(); //// // double t1 = ecore_time_get(); ////
id = e_util_winid_str_get(ev->win); id = e_util_winid_str_get(ev->win);
if (!evas_hash_find(_drop_win_hash, id)) if (!eina_hash_find(_drop_win_hash, id))
{ {
// double t2 = ecore_time_get() - t1; //// // double t2 = ecore_time_get() - t1; ////
// printf("DND POS EV 1 %3.7f\n", t2); //// // printf("DND POS EV 1 %3.7f\n", t2); ////
@ -1396,7 +1399,7 @@ _e_dnd_cb_event_dnd_drop(void *data, int type, void *event)
ev = event; ev = event;
id = e_util_winid_str_get(ev->win); id = e_util_winid_str_get(ev->win);
if (!evas_hash_find(_drop_win_hash, id)) return 1; if (!eina_hash_find(_drop_win_hash, id)) return 1;
ecore_x_selection_xdnd_request(ev->win, _xdnd->type); ecore_x_selection_xdnd_request(ev->win, _xdnd->type);
@ -1415,7 +1418,7 @@ _e_dnd_cb_event_dnd_selection(void *data, int type, void *event)
ev = event; ev = event;
id = e_util_winid_str_get(ev->win); id = e_util_winid_str_get(ev->win);
if (!evas_hash_find(_drop_win_hash, id)) return 1; if (!eina_hash_find(_drop_win_hash, id)) return 1;
if (ev->selection != ECORE_X_SELECTION_XDND) return 1; if (ev->selection != ECORE_X_SELECTION_XDND) return 1;
if (!strcmp("text/uri-list", _xdnd->type)) if (!strcmp("text/uri-list", _xdnd->type))

24
src/bin/e_exec.c
View File

@ -47,7 +47,7 @@ static E_Exec_Instance *_e_exec_cb_exec(void *data, Efreet_Desktop *desktop, cha
static int _e_exec_cb_expire_timer(void *data); static int _e_exec_cb_expire_timer(void *data);
static int _e_exec_cb_exit(void *data, int type, void *event); static int _e_exec_cb_exit(void *data, int type, void *event);
static Evas_Bool _e_exec_startup_id_pid_find(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *value, void *data); static Evas_Bool _e_exec_startup_id_pid_find(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *value, void *data);
static void _e_exec_error_dialog(Efreet_Desktop *desktop, const char *exec, Ecore_Exe_Event_Del *event, Ecore_Exe_Event_Data *error, Ecore_Exe_Event_Data *read); static void _e_exec_error_dialog(Efreet_Desktop *desktop, const char *exec, Ecore_Exe_Event_Del *event, Ecore_Exe_Event_Data *error, Ecore_Exe_Event_Data *read);
static void _fill_data(E_Config_Dialog_Data *cfdata); static void _fill_data(E_Config_Dialog_Data *cfdata);
@ -60,7 +60,7 @@ static void _dialog_save_cb(void *data, void *data2);
/* local subsystem globals */ /* local subsystem globals */
static Eina_List *e_exec_start_pending = NULL; static Eina_List *e_exec_start_pending = NULL;
static Evas_Hash *e_exec_instances = NULL; static Eina_Hash *e_exec_instances = NULL;
static int startup_id = 0; static int startup_id = 0;
static Ecore_Event_Handler *_e_exec_exit_handler = NULL; static Ecore_Event_Handler *_e_exec_exit_handler = NULL;
@ -70,6 +70,8 @@ static Ecore_Event_Handler *_e_exec_border_add_handler = NULL;
EAPI int EAPI int
e_exec_init(void) e_exec_init(void)
{ {
e_exec_instances = eina_hash_string_superfast_new(NULL);
_e_exec_exit_handler = _e_exec_exit_handler =
ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _e_exec_cb_exit, NULL); ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _e_exec_cb_exit, NULL);
#if 0 #if 0
@ -89,7 +91,7 @@ e_exec_shutdown(void)
if (_e_exec_exit_handler) ecore_event_handler_del(_e_exec_exit_handler); if (_e_exec_exit_handler) ecore_event_handler_del(_e_exec_exit_handler);
if (_e_exec_border_add_handler) ecore_event_handler_del(_e_exec_border_add_handler); if (_e_exec_border_add_handler) ecore_event_handler_del(_e_exec_border_add_handler);
evas_hash_free(e_exec_instances); eina_hash_free(e_exec_instances);
eina_list_free(e_exec_start_pending); eina_list_free(e_exec_start_pending);
return 1; return 1;
} }
@ -132,7 +134,7 @@ e_exec_startup_id_pid_find(int startup_id, pid_t pid)
search.desktop = NULL; search.desktop = NULL;
search.startup_id = startup_id; search.startup_id = startup_id;
search.pid = pid; search.pid = pid;
evas_hash_foreach(e_exec_instances, _e_exec_startup_id_pid_find, &search); eina_hash_foreach(e_exec_instances, _e_exec_startup_id_pid_find, &search);
return search.desktop; return search.desktop;
} }
@ -242,16 +244,16 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
inst->launch_time = ecore_time_get(); inst->launch_time = ecore_time_get();
inst->expire_timer = ecore_timer_add(10.0, _e_exec_cb_expire_timer, inst); inst->expire_timer = ecore_timer_add(10.0, _e_exec_cb_expire_timer, inst);
l = evas_hash_find(e_exec_instances, desktop->orig_path); l = eina_hash_find(e_exec_instances, desktop->orig_path);
if (l) if (l)
{ {
l = eina_list_append(l, inst); l = eina_list_append(l, inst);
evas_hash_modify(e_exec_instances, desktop->orig_path, l); eina_hash_modify(e_exec_instances, desktop->orig_path, l);
} }
else else
{ {
l = eina_list_append(l, inst); l = eina_list_append(l, inst);
e_exec_instances = evas_hash_add(e_exec_instances, desktop->orig_path, l); eina_hash_add(e_exec_instances, desktop->orig_path, l);
} }
e_exec_start_pending = eina_list_append(e_exec_start_pending, desktop); e_exec_start_pending = eina_list_append(e_exec_start_pending, desktop);
} }
@ -344,14 +346,14 @@ _e_exec_cb_exit(void *data, int type, void *event)
} }
if (inst->desktop) if (inst->desktop)
{ {
instances = evas_hash_find(e_exec_instances, inst->desktop->orig_path); instances = eina_hash_find(e_exec_instances, inst->desktop->orig_path);
if (instances) if (instances)
{ {
instances = eina_list_remove(instances, inst); instances = eina_list_remove(instances, inst);
if (instances) if (instances)
evas_hash_modify(e_exec_instances, inst->desktop->orig_path, instances); eina_hash_modify(e_exec_instances, inst->desktop->orig_path, instances);
else else
e_exec_instances = evas_hash_del(e_exec_instances, inst->desktop->orig_path, NULL); eina_hash_del(e_exec_instances, inst->desktop->orig_path, NULL);
} }
} }
e_exec_start_pending = eina_list_remove(e_exec_start_pending, inst->desktop); e_exec_start_pending = eina_list_remove(e_exec_start_pending, inst->desktop);
@ -362,7 +364,7 @@ _e_exec_cb_exit(void *data, int type, void *event)
} }
static Evas_Bool static Evas_Bool
_e_exec_startup_id_pid_find(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *value, void *data) _e_exec_startup_id_pid_find(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *value, void *data)
{ {
E_Exec_Search *search; E_Exec_Search *search;
Eina_List *instances, *l; Eina_List *instances, *l;

22
src/bin/e_filereg.c
View File

@ -8,7 +8,7 @@
* currently being used by E in core components should be registered * currently being used by E in core components should be registered
* here and will be protected as best as E can. :) * here and will be protected as best as E can. :)
*/ */
static Evas_Hash *_e_filereg = NULL; static Eina_Hash *_e_filereg = NULL;
typedef struct _Filereg_Item Filereg_Item; typedef struct _Filereg_Item Filereg_Item;
struct _Filereg_Item struct _Filereg_Item
@ -17,7 +17,7 @@ struct _Filereg_Item
int ref_count; int ref_count;
}; };
static Evas_Bool _filereg_hash_cb_free(const Evas_Hash *hash __UNUSED__, static Eina_Bool _filereg_hash_cb_free(const Eina_Hash *hash __UNUSED__,
const void *key __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__); void *data, void *fdata __UNUSED__);
@ -25,14 +25,16 @@ static Evas_Bool _filereg_hash_cb_free(const Evas_Hash *hash __UNUSED__,
EAPI int EAPI int
e_filereg_init(void) e_filereg_init(void)
{ {
_e_filereg = eina_hash_string_superfast_new(NULL);
return 1; return 1;
} }
EAPI int EAPI int
e_filereg_shutdown(void) e_filereg_shutdown(void)
{ {
evas_hash_foreach(_e_filereg, _filereg_hash_cb_free, NULL); eina_hash_foreach(_e_filereg, _filereg_hash_cb_free, NULL);
evas_hash_free(_e_filereg); eina_hash_free(_e_filereg);
_e_filereg = NULL; _e_filereg = NULL;
return 1; return 1;
} }
@ -42,7 +44,7 @@ e_filereg_register(const char *path)
{ {
Filereg_Item *fi = NULL; Filereg_Item *fi = NULL;
fi = evas_hash_find(_e_filereg, path); fi = eina_hash_find(_e_filereg, path);
if (fi) if (fi)
{ {
fi->ref_count++; fi->ref_count++;
@ -52,7 +54,7 @@ e_filereg_register(const char *path)
if (!fi) return 0; if (!fi) return 0;
fi->path = eina_stringshare_add(path); fi->path = eina_stringshare_add(path);
fi->ref_count = 1; fi->ref_count = 1;
_e_filereg = evas_hash_add(_e_filereg, path, fi); eina_hash_add(_e_filereg, path, fi);
return 1; return 1;
} }
@ -61,13 +63,13 @@ e_filereg_deregister(const char *path)
{ {
Filereg_Item *fi = NULL; Filereg_Item *fi = NULL;
fi = evas_hash_find(_e_filereg, path); fi = eina_hash_find(_e_filereg, path);
if (fi) if (fi)
{ {
fi->ref_count--; fi->ref_count--;
if (fi->ref_count == 0) if (fi->ref_count == 0)
{ {
_e_filereg = evas_hash_del(_e_filereg, path, fi); eina_hash_del(_e_filereg, path, fi);
if (fi->path) eina_stringshare_del(fi->path); if (fi->path) eina_stringshare_del(fi->path);
E_FREE(fi); E_FREE(fi);
} }
@ -79,14 +81,14 @@ e_filereg_file_protected(const char *path)
{ {
Filereg_Item *fi = NULL; Filereg_Item *fi = NULL;
fi = evas_hash_find(_e_filereg, path); fi = eina_hash_find(_e_filereg, path);
if (!fi) return 0; if (!fi) return 0;
else return 1; else return 1;
} }
/* Private Functions */ /* Private Functions */
static Evas_Bool static Evas_Bool
_filereg_hash_cb_free(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, _filereg_hash_cb_free(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__) void *data, void *fdata __UNUSED__)
{ {
Filereg_Item *fi; Filereg_Item *fi;

4
src/bin/e_fm.c
View File

@ -3922,7 +3922,7 @@ _e_fm2_icon_desktop_load(E_Fm2_Icon *ic)
{ {
const char *type; const char *type;
type = ecore_hash_get(desktop->x, "X-Enlightenment-Type"); type = eina_hash_find(desktop->x, "X-Enlightenment-Type");
if (type) if (type)
{ {
if (!strcmp(type, "Mount")) ic->info.mount = 1; if (!strcmp(type, "Mount")) ic->info.mount = 1;
@ -3937,7 +3937,7 @@ _e_fm2_icon_desktop_load(E_Fm2_Icon *ic)
goto error; goto error;
} }
} }
type = ecore_hash_get(desktop->x, "X-Enlightenment-Removable-State"); type = eina_hash_find(desktop->x, "X-Enlightenment-Removable-State");
if (type) if (type)
{ {
if (!strcmp(type, "Full")) if (!strcmp(type, "Full"))

91
src/bin/e_fm_custom.c
View File

@ -3,12 +3,12 @@
*/ */
#include "e.h" #include "e.h"
static Evas_Bool _e_fm2_custom_file_hash_foreach_list(const Evas_Hash *hash, const void *key, void *data, void *fdata); static Eina_Bool _e_fm2_custom_file_hash_foreach_list(const Eina_Hash *hash, const void *key, void *data, void *fdata);
static Eina_List *_e_fm2_custom_hash_key_base_list(Evas_Hash *hash, const char *str); static Eina_List *_e_fm2_custom_hash_key_base_list(Eina_Hash *hash, const char *str);
//static Evas_Bool _e_fm2_custom_file_hash_foreach_sub_list(Evas_Hash *hash, const char *key, void *data, void *fdata); //static Eina_Bool _e_fm2_custom_file_hash_foreach_sub_list(Eina_Hash *hash, const char *key, void *data, void *fdata);
//static Eina_List *_e_fm2_custom_hash_key_sub_list(Evas_Hash *hash, const char *str); //static Eina_List *_e_fm2_custom_hash_key_sub_list(Eina_Hash *hash, const char *str);
static Evas_Bool _e_fm2_custom_file_hash_foreach(const Evas_Hash *hash, const void *key, void *data, void *fdata); static Eina_Bool _e_fm2_custom_file_hash_foreach(const Eina_Hash *hash, const void *key, void *data, void *fdata);
static Evas_Bool _e_fm2_custom_file_hash_foreach_save(const Evas_Hash *hash, const void *key, void *data, void *fdata); static Eina_Bool _e_fm2_custom_file_hash_foreach_save(const Eina_Hash *hash, const void *key, void *data, void *fdata);
static void _e_fm2_custom_file_info_load(void); static void _e_fm2_custom_file_info_load(void);
static void _e_fm2_custom_file_info_save(void); static void _e_fm2_custom_file_info_save(void);
static void _e_fm2_custom_file_info_free(void); static void _e_fm2_custom_file_info_free(void);
@ -17,10 +17,9 @@ static void _e_fm2_custom_file_cb_defer_save(void *data);
static E_Powersave_Deferred_Action*_e_fm2_flush_defer = NULL; static E_Powersave_Deferred_Action*_e_fm2_flush_defer = NULL;
static Eet_File *_e_fm2_custom_file = NULL; static Eet_File *_e_fm2_custom_file = NULL;
static Eet_Data_Descriptor *_e_fm2_custom_file_edd = NULL; static Eet_Data_Descriptor *_e_fm2_custom_file_edd = NULL;
static Evas_Hash *_e_fm2_custom_hash = NULL; static Eina_Hash *_e_fm2_custom_hash = NULL;
static int _e_fm2_custom_writes = 0; static int _e_fm2_custom_writes = 0;
/* FIXME: this uses a flat path key for custom file info. this is fine as /* FIXME: this uses a flat path key for custom file info. this is fine as
* long as we only expect a limited number of custom info nodes. if we * long as we only expect a limited number of custom info nodes. if we
* start to see whole dire trees stored this way things will suck. we need * start to see whole dire trees stored this way things will suck. we need
@ -44,9 +43,9 @@ e_fm2_custom_file_init(void)
eddc.func.list_free = (void *(*)(void *)) eina_list_free; eddc.func.list_free = (void *(*)(void *)) eina_list_free;
eddc.func.hash_foreach = eddc.func.hash_foreach =
(void (*) (void *, int (*) (void *, const char *, void *, void *), void *)) (void (*) (void *, int (*) (void *, const char *, void *, void *), void *))
evas_hash_foreach; eina_hash_foreach;
eddc.func.hash_add = (void *(*) (void *, const char *, void *)) evas_hash_add; eddc.func.hash_add = (void* (*) (void *, const char *, void *)) eet_eina_hash_add_alloc;
eddc.func.hash_free = (void (*) (void *)) evas_hash_free; eddc.func.hash_free = (void (*) (Eina_Hash *)) eina_hash_free;
eddc.name = "e_fm_custom_file"; eddc.name = "e_fm_custom_file";
eddc.size = sizeof(E_Fm2_Custom_File); eddc.size = sizeof(E_Fm2_Custom_File);
@ -89,7 +88,7 @@ e_fm2_custom_file_get(const char *path)
_e_fm2_custom_file_info_load(); _e_fm2_custom_file_info_load();
if (!_e_fm2_custom_file) return NULL; if (!_e_fm2_custom_file) return NULL;
if (_e_fm2_flush_defer) e_fm2_custom_file_flush(); if (_e_fm2_flush_defer) e_fm2_custom_file_flush();
cf = evas_hash_find(_e_fm2_custom_hash, path); cf = eina_hash_find(_e_fm2_custom_hash, path);
return cf; return cf;
} }
@ -99,7 +98,7 @@ e_fm2_custom_file_set(const char *path, E_Fm2_Custom_File *cf)
_e_fm2_custom_file_info_load(); _e_fm2_custom_file_info_load();
if (!_e_fm2_custom_file) return; if (!_e_fm2_custom_file) return;
if (_e_fm2_flush_defer) e_fm2_custom_file_flush(); if (_e_fm2_flush_defer) e_fm2_custom_file_flush();
if (evas_hash_find(_e_fm2_custom_hash, path) != cf) if (eina_hash_find(_e_fm2_custom_hash, path) != cf)
{ {
E_Fm2_Custom_File *cf2; E_Fm2_Custom_File *cf2;
@ -111,7 +110,9 @@ e_fm2_custom_file_set(const char *path, E_Fm2_Custom_File *cf)
cf2->icon.icon = eina_stringshare_add(cf->icon.icon); cf2->icon.icon = eina_stringshare_add(cf->icon.icon);
if (cf->label) if (cf->label)
cf2->label = eina_stringshare_add(cf->label); cf2->label = eina_stringshare_add(cf->label);
_e_fm2_custom_hash = evas_hash_add(_e_fm2_custom_hash, path, cf2); if (!_e_fm2_custom_hash)
_e_fm2_custom_hash = eina_hash_string_superfast_new(NULL);
eina_hash_add(_e_fm2_custom_hash, path, cf2);
} }
} }
_e_fm2_custom_writes = 1; _e_fm2_custom_writes = 1;
@ -132,11 +133,10 @@ e_fm2_custom_file_del(const char *path)
{ {
for (l = list; l; l = l->next) for (l = list; l; l = l->next)
{ {
cf2 = evas_hash_find(_e_fm2_custom_hash, l->data); cf2 = eina_hash_find(_e_fm2_custom_hash, l->data);
if (cf2) if (cf2)
{ {
_e_fm2_custom_hash = evas_hash_del(_e_fm2_custom_hash, eina_hash_del(_e_fm2_custom_hash, l->data, cf2);
l->data, cf2);
if (cf2->icon.icon) eina_stringshare_del(cf2->icon.icon); if (cf2->icon.icon) eina_stringshare_del(cf2->icon.icon);
if (cf2->label) eina_stringshare_del(cf2->label); if (cf2->label) eina_stringshare_del(cf2->label);
free(cf2); free(cf2);
@ -156,42 +156,40 @@ e_fm2_custom_file_rename(const char *path, const char *new_path)
_e_fm2_custom_file_info_load(); _e_fm2_custom_file_info_load();
if (!_e_fm2_custom_file) return; if (!_e_fm2_custom_file) return;
if (_e_fm2_flush_defer) e_fm2_custom_file_flush(); if (_e_fm2_flush_defer) e_fm2_custom_file_flush();
cf2 = evas_hash_find(_e_fm2_custom_hash, path); cf2 = eina_hash_find(_e_fm2_custom_hash, path);
if (cf2) if (cf2)
{ {
_e_fm2_custom_hash = evas_hash_del(_e_fm2_custom_hash, path, cf2); eina_hash_del(_e_fm2_custom_hash, path, cf2);
cf = evas_hash_find(_e_fm2_custom_hash, new_path); cf = eina_hash_find(_e_fm2_custom_hash, new_path);
if (cf) if (cf)
{ {
if (cf->icon.icon) eina_stringshare_del(cf->icon.icon); if (cf->icon.icon) eina_stringshare_del(cf->icon.icon);
if (cf->label) eina_stringshare_del(cf->label); if (cf->label) eina_stringshare_del(cf->label);
free(cf); free(cf);
} }
_e_fm2_custom_hash = evas_hash_add(_e_fm2_custom_hash, new_path, cf2); eina_hash_add(_e_fm2_custom_hash, new_path, cf2);
} }
list = _e_fm2_custom_hash_key_base_list(_e_fm2_custom_hash, path); list = _e_fm2_custom_hash_key_base_list(_e_fm2_custom_hash, path);
if (list) if (list)
{ {
for (l = list; l; l = l->next) for (l = list; l; l = l->next)
{ {
cf2 = evas_hash_find(_e_fm2_custom_hash, l->data); cf2 = eina_hash_find(_e_fm2_custom_hash, l->data);
if (cf2) if (cf2)
{ {
char buf[PATH_MAX]; char buf[PATH_MAX];
strcpy(buf, new_path); strcpy(buf, new_path);
strcat(buf, (char *)l->data + strlen(path)); strcat(buf, (char *)l->data + strlen(path));
_e_fm2_custom_hash = evas_hash_del(_e_fm2_custom_hash, eina_hash_del(_e_fm2_custom_hash, l->data, cf2);
l->data, cf2); cf = eina_hash_find(_e_fm2_custom_hash, buf);
cf = evas_hash_find(_e_fm2_custom_hash, buf);
if (cf) if (cf)
{ {
if (cf->icon.icon) eina_stringshare_del(cf->icon.icon); if (cf->icon.icon) eina_stringshare_del(cf->icon.icon);
if (cf->label) eina_stringshare_del(cf->label); if (cf->label) eina_stringshare_del(cf->label);
free(cf); free(cf);
} }
_e_fm2_custom_hash = evas_hash_add(_e_fm2_custom_hash, eina_hash_add(_e_fm2_custom_hash, buf, cf2);
buf, cf2);
} }
} }
eina_list_free(list); eina_list_free(list);
@ -219,8 +217,8 @@ struct _E_Custom_List
int base_len; int base_len;
}; };
static Evas_Bool static Eina_Bool
_e_fm2_custom_file_hash_foreach_list(const Evas_Hash *hash, const void *key, void *data, void *fdata) _e_fm2_custom_file_hash_foreach_list(const Eina_Hash *hash, const void *key, void *data, void *fdata)
{ {
struct _E_Custom_List *cl; struct _E_Custom_List *cl;
@ -231,21 +229,20 @@ _e_fm2_custom_file_hash_foreach_list(const Evas_Hash *hash, const void *key, voi
} }
static Eina_List * static Eina_List *
_e_fm2_custom_hash_key_base_list(Evas_Hash *hash, const char *str) _e_fm2_custom_hash_key_base_list(Eina_Hash *hash, const char *str)
{ {
struct _E_Custom_List cl; struct _E_Custom_List cl;
cl.l = NULL; cl.l = NULL;
cl.base = str; cl.base = str;
cl.base_len = strlen(cl.base); cl.base_len = strlen(cl.base);
evas_hash_foreach(hash, eina_hash_foreach(hash, _e_fm2_custom_file_hash_foreach_list, &cl);
_e_fm2_custom_file_hash_foreach_list, &cl);
return cl.l; return cl.l;
} }
/* /*
static Evas_Bool static Eina_Bool
_e_fm2_custom_file_hash_foreach_sub_list(const Evas_Hash *hash, const void *key, void *data, void *fdata) _e_fm2_custom_file_hash_foreach_sub_list(const Eina_Hash *hash, const void *key, void *data, void *fdata)
{ {
struct _E_Custom_List *cl; struct _E_Custom_List *cl;
@ -258,20 +255,20 @@ _e_fm2_custom_file_hash_foreach_sub_list(const Evas_Hash *hash, const void *key,
/* /*
static Eina_List * static Eina_List *
_e_fm2_custom_hash_key_sub_list(const Evas_Hash *hash, const void *str) _e_fm2_custom_hash_key_sub_list(const Eina_Hash *hash, const void *str)
{ {
struct _E_Custom_List cl; struct _E_Custom_List cl;
cl.l = NULL; cl.l = NULL;
cl.base = str; cl.base = str;
evas_hash_foreach(hash, eina_hash_foreach(hash,
_e_fm2_custom_file_hash_foreach_sub_list, &cl); _e_fm2_custom_file_hash_foreach_sub_list, &cl);
return cl.l; return cl.l;
} }
*/ */
static Evas_Bool static Eina_Bool
_e_fm2_custom_file_hash_foreach(const Evas_Hash *hash, const void *key, void *data, void *fdata) _e_fm2_custom_file_hash_foreach(const Eina_Hash *hash, const void *key, void *data, void *fdata)
{ {
E_Fm2_Custom_File *cf; E_Fm2_Custom_File *cf;
@ -282,8 +279,8 @@ _e_fm2_custom_file_hash_foreach(const Evas_Hash *hash, const void *key, void *da
return 1; return 1;
} }
static Evas_Bool static Eina_Bool
_e_fm2_custom_file_hash_foreach_save(const Evas_Hash *hash, const void *key, void *data, void *fdata) _e_fm2_custom_file_hash_foreach_save(const Eina_Hash *hash, const void *key, void *data, void *fdata)
{ {
Eet_File *ef; Eet_File *ef;
E_Fm2_Custom_File *cf; E_Fm2_Custom_File *cf;
@ -320,8 +317,12 @@ _e_fm2_custom_file_info_load(void)
cf = eet_data_read(_e_fm2_custom_file, cf = eet_data_read(_e_fm2_custom_file,
_e_fm2_custom_file_edd, list[i]); _e_fm2_custom_file_edd, list[i]);
if (cf) if (cf)
_e_fm2_custom_hash = evas_hash_add(_e_fm2_custom_hash, {
list[i], cf); if (!_e_fm2_custom_hash)
_e_fm2_custom_hash =
eina_hash_string_superfast_new(NULL);
eina_hash_add(_e_fm2_custom_hash, list[i], cf);
}
} }
free(list); free(list);
} }
@ -341,7 +342,7 @@ _e_fm2_custom_file_info_save(void)
e_user_homedir_get()); e_user_homedir_get());
ef = eet_open(buf, EET_FILE_MODE_WRITE); ef = eet_open(buf, EET_FILE_MODE_WRITE);
if (!ef) return; if (!ef) return;
evas_hash_foreach(_e_fm2_custom_hash, eina_hash_foreach(_e_fm2_custom_hash,
_e_fm2_custom_file_hash_foreach_save, ef); _e_fm2_custom_file_hash_foreach_save, ef);
eet_close(ef); eet_close(ef);
snprintf(buf2, sizeof(buf2), "%s/.e/e/fileman/custom.cfg", snprintf(buf2, sizeof(buf2), "%s/.e/e/fileman/custom.cfg",
@ -368,9 +369,9 @@ _e_fm2_custom_file_info_free(void)
} }
if (_e_fm2_custom_hash) if (_e_fm2_custom_hash)
{ {
evas_hash_foreach(_e_fm2_custom_hash, eina_hash_foreach(_e_fm2_custom_hash,
_e_fm2_custom_file_hash_foreach, NULL); _e_fm2_custom_file_hash_foreach, NULL);
evas_hash_free(_e_fm2_custom_hash); eina_hash_free(_e_fm2_custom_hash);
_e_fm2_custom_hash = NULL; _e_fm2_custom_hash = NULL;
} }
} }

2
src/bin/e_fm_main.c
View File

@ -39,9 +39,11 @@
#include "config.h" #include "config.h"
#define E_TYPEDEFS #define E_TYPEDEFS
#include "e_config_data.h"
#include "e_fm_op.h" #include "e_fm_op.h"
#include "e_prefix.h" #include "e_prefix.h"
#undef E_TYPEDEFS #undef E_TYPEDEFS
#include "e_config_data.h"
#include "e_fm_op.h" #include "e_fm_op.h"
#include "e_prefix.h" #include "e_prefix.h"

79
src/bin/e_fm_mime.c
View File

@ -12,12 +12,12 @@ struct _E_Fm2_Mime_Handler_Tuple
}; };
/* local subsystem functions */ /* local subsystem functions */
static Evas_Bool _e_fm2_mime_handler_glob_match_foreach(const Evas_Hash *hash __UNUSED__, const void *key, void *data, void *fdata); static Eina_Bool _e_fm2_mime_handler_glob_match_foreach(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata);
static Evas_Bool _e_fm_mime_icon_foreach(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata); static Eina_Bool _e_fm_mime_icon_foreach(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata);
static Evas_Hash *icon_map = NULL; static Eina_Hash *icon_map = NULL;
static Evas_Hash *_mime_handlers = NULL; static Eina_Hash *_mime_handlers = NULL;
static Evas_Hash *_glob_handlers = NULL; static Eina_Hash *_glob_handlers = NULL;
/* externally accessible functions */ /* externally accessible functions */
EAPI const char * EAPI const char *
@ -42,10 +42,10 @@ e_fm_mime_icon_get(const char *mime)
E_Config_Mime_Icon *mi; E_Config_Mime_Icon *mi;
/* 0.0 clean out hash cache once it has mroe than 512 entries in it */ /* 0.0 clean out hash cache once it has mroe than 512 entries in it */
if (evas_hash_size(icon_map) > 512) e_fm_mime_icon_cache_flush(); if (eina_hash_population(icon_map) > 512) e_fm_mime_icon_cache_flush();
/* 0. look in mapping cache */ /* 0. look in mapping cache */
val = evas_hash_find(icon_map, mime); val = eina_hash_find(icon_map, mime);
if (val) return val; if (val) return val;
ecore_strlcpy(buf2, mime, sizeof(buf2)); ecore_strlcpy(buf2, mime, sizeof(buf2));
@ -105,7 +105,8 @@ e_fm_mime_icon_get(const char *mime)
ok: ok:
val = (char *)eina_stringshare_add(buf); val = (char *)eina_stringshare_add(buf);
icon_map = evas_hash_add(icon_map, mime, val); if (!icon_map) icon_map = eina_hash_string_superfast_new(NULL);
eina_hash_add(icon_map, mime, val);
return val; return val;
} }
@ -114,13 +115,13 @@ e_fm_mime_icon_cache_flush(void)
{ {
Eina_List *freelist = NULL; Eina_List *freelist = NULL;
evas_hash_foreach(icon_map, _e_fm_mime_icon_foreach, &freelist); eina_hash_foreach(icon_map, _e_fm_mime_icon_foreach, &freelist);
while (freelist) while (freelist)
{ {
eina_stringshare_del(freelist->data); eina_stringshare_del(freelist->data);
freelist = eina_list_remove_list(freelist, freelist); freelist = eina_list_remove_list(freelist, freelist);
} }
evas_hash_free(icon_map); eina_hash_free(icon_map);
icon_map = NULL; icon_map = NULL;
} }
@ -160,7 +161,7 @@ e_fm2_mime_handler_free(E_Fm2_Mime_Handler *handler)
} }
/* associate a certain mime type with a handler */ /* associate a certain mime type with a handler */
EAPI Evas_Bool EAPI Eina_Bool
e_fm2_mime_handler_mime_add(E_Fm2_Mime_Handler *handler, const char *mime) e_fm2_mime_handler_mime_add(E_Fm2_Mime_Handler *handler, const char *mime)
{ {
Eina_List *handlers = NULL; Eina_List *handlers = NULL;
@ -168,23 +169,24 @@ e_fm2_mime_handler_mime_add(E_Fm2_Mime_Handler *handler, const char *mime)
if ((!handler) || (!mime)) return 0; if ((!handler) || (!mime)) return 0;
/* if there's an entry for this mime already, then append to its list */ /* if there's an entry for this mime already, then append to its list */
if ((handlers = evas_hash_find(_mime_handlers, mime))) if ((handlers = eina_hash_find(_mime_handlers, mime)))
{ {
handlers = eina_list_append(handlers, handler); handlers = eina_list_append(handlers, handler);
evas_hash_modify(_mime_handlers, mime, handlers); eina_hash_modify(_mime_handlers, mime, handlers);
} }
else else
{ {
/* no previous entry for this mime, lets add one */ /* no previous entry for this mime, lets add one */
handlers = eina_list_append(handlers, handler); handlers = eina_list_append(handlers, handler);
_mime_handlers = evas_hash_add(_mime_handlers, mime, handlers); if (!_mime_handlers) _mime_handlers = eina_hash_string_superfast_new(NULL);
eina_hash_add(_mime_handlers, mime, handlers);
} }
return 1; return 1;
} }
/* associate a certain glob with a handler */ /* associate a certain glob with a handler */
EAPI Evas_Bool EAPI Eina_Bool
e_fm2_mime_handler_glob_add(E_Fm2_Mime_Handler *handler, const char *glob) e_fm2_mime_handler_glob_add(E_Fm2_Mime_Handler *handler, const char *glob)
{ {
Eina_List *handlers = NULL; Eina_List *handlers = NULL;
@ -192,16 +194,17 @@ e_fm2_mime_handler_glob_add(E_Fm2_Mime_Handler *handler, const char *glob)
if ((!handler) || (!glob)) return 0; if ((!handler) || (!glob)) return 0;
/* if there's an entry for this glob already, then append to its list */ /* if there's an entry for this glob already, then append to its list */
if ((handlers = evas_hash_find(_glob_handlers, glob))) if ((handlers = eina_hash_find(_glob_handlers, glob)))
{ {
handlers = eina_list_append(handlers, handler); handlers = eina_list_append(handlers, handler);
evas_hash_modify(_glob_handlers, glob, handlers); eina_hash_modify(_glob_handlers, glob, handlers);
} }
else else
{ {
/* no previous entry for this glob, lets add one */ /* no previous entry for this glob, lets add one */
handlers = eina_list_append(handlers, handler); handlers = eina_list_append(handlers, handler);
_glob_handlers = evas_hash_add(_glob_handlers, glob, handlers); if (!_glob_handlers) _glob_handlers = eina_hash_string_superfast_new(NULL);
eina_hash_add(_glob_handlers, glob, handlers);
} }
return 1; return 1;
@ -216,13 +219,20 @@ e_fm2_mime_handler_mime_del(E_Fm2_Mime_Handler *handler, const char *mime)
if ((!handler) || (!mime)) return; if ((!handler) || (!mime)) return;
/* if there's an entry for this mime already, then remove from list */ /* if there's an entry for this mime already, then remove from list */
if ((handlers = evas_hash_find(_mime_handlers, mime))) if ((handlers = eina_hash_find(_mime_handlers, mime)))
{ {
handlers = eina_list_remove(handlers, handler); handlers = eina_list_remove(handlers, handler);
if (handlers) if (handlers)
evas_hash_modify(_mime_handlers, mime, handlers); eina_hash_modify(_mime_handlers, mime, handlers);
else else
_mime_handlers = evas_hash_del(_mime_handlers, mime, handlers); {
eina_hash_del(_mime_handlers, mime, handlers);
if (!eina_hash_population(_mime_handlers))
{
eina_hash_free(_mime_handlers);
_mime_handlers = NULL;
}
}
} }
} }
@ -235,13 +245,20 @@ e_fm2_mime_handler_glob_del(E_Fm2_Mime_Handler *handler, const char *glob)
if ((!handler) || (!glob)) return; if ((!handler) || (!glob)) return;
/* if there's an entry for this glob already, then remove from list */ /* if there's an entry for this glob already, then remove from list */
if ((handlers = evas_hash_find(_glob_handlers, glob))) if ((handlers = eina_hash_find(_glob_handlers, glob)))
{ {
handlers = eina_list_remove(handlers, handler); handlers = eina_list_remove(handlers, handler);
if (handlers) if (handlers)
evas_hash_modify(_glob_handlers, glob, handlers); eina_hash_modify(_glob_handlers, glob, handlers);
else else
_glob_handlers = evas_hash_del(_glob_handlers, glob, handlers); {
eina_hash_del(_glob_handlers, glob, handlers);
if (!eina_hash_population(_glob_handlers))
{
eina_hash_free(_glob_handlers);
_glob_handlers = NULL;
}
}
} }
} }
@ -251,7 +268,7 @@ EAPI Eina_List *
e_fm2_mime_handler_mime_handlers_get(const char *mime) e_fm2_mime_handler_mime_handlers_get(const char *mime)
{ {
if ((!mime) || (!_mime_handlers)) return NULL; if ((!mime) || (!_mime_handlers)) return NULL;
return evas_hash_find(_mime_handlers, mime); return eina_hash_find(_mime_handlers, mime);
} }
/* get the list of glob handlers for a glob. /* get the list of glob handlers for a glob.
@ -267,14 +284,14 @@ e_fm2_mime_handler_glob_handlers_get(const char *glob)
tuple = E_NEW(E_Fm2_Mime_Handler_Tuple, 1); tuple = E_NEW(E_Fm2_Mime_Handler_Tuple, 1);
tuple->list = NULL; tuple->list = NULL;
tuple->str = glob; tuple->str = glob;
evas_hash_foreach(_glob_handlers, _e_fm2_mime_handler_glob_match_foreach, tuple); eina_hash_foreach(_glob_handlers, _e_fm2_mime_handler_glob_match_foreach, tuple);
handlers = tuple->list; handlers = tuple->list;
E_FREE(tuple); E_FREE(tuple);
return handlers; return handlers;
} }
/* call a certain handler */ /* call a certain handler */
EAPI Evas_Bool EAPI Eina_Bool
e_fm2_mime_handler_call(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const char *path) e_fm2_mime_handler_call(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const char *path)
{ {
if ((!handler) || (!obj) || (!path) || (!handler->action_func)) if ((!handler) || (!obj) || (!path) || (!handler->action_func))
@ -353,8 +370,8 @@ e_fm2_mime_handler_test(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const cha
/* local subsystem functions */ /* local subsystem functions */
/* used to loop a glob hash and determine if the glob handler matches the filename */ /* used to loop a glob hash and determine if the glob handler matches the filename */
static Evas_Bool static Eina_Bool
_e_fm2_mime_handler_glob_match_foreach(const Evas_Hash *hash __UNUSED__, const void *key, void *data, void *fdata) _e_fm2_mime_handler_glob_match_foreach(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata)
{ {
E_Fm2_Mime_Handler_Tuple *tuple; E_Fm2_Mime_Handler_Tuple *tuple;
Eina_List *handlers = NULL; Eina_List *handlers = NULL;
@ -374,8 +391,8 @@ _e_fm2_mime_handler_glob_match_foreach(const Evas_Hash *hash __UNUSED__, const v
return 1; return 1;
} }
static Evas_Bool static Eina_Bool
_e_fm_mime_icon_foreach(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata) _e_fm_mime_icon_foreach(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata)
{ {
Eina_List **freelist; Eina_List **freelist;

12
src/bin/e_fm_shared.h
View File

@ -139,9 +139,9 @@ _e_volume_edd_new(void)
eddc.func.list_data = (void *(*)(void *)) eina_list_data_get; eddc.func.list_data = (void *(*)(void *)) eina_list_data_get;
eddc.func.hash_foreach = eddc.func.hash_foreach =
(void (*) (void *, int (*) (void *, const char *, void *, void *), void *)) (void (*) (void *, int (*) (void *, const char *, void *, void *), void *))
evas_hash_foreach; eina_hash_foreach;
eddc.func.hash_add = (void *(*) (void *, const char *, void *)) evas_hash_add; eddc.func.hash_add = (void* (*) (void *, const char *, void *)) eet_eina_hash_add_alloc;
eddc.func.hash_free = (void (*) (void *)) evas_hash_free; eddc.func.hash_free = (void (*) (void *)) eina_hash_free;
eddc.name = "e_volume"; eddc.name = "e_volume";
eddc.size = sizeof(E_Volume); eddc.size = sizeof(E_Volume);
@ -179,9 +179,9 @@ _e_storage_edd_new(void)
eddc.func.list_data = (void *(*)(void *)) eina_list_data_get; eddc.func.list_data = (void *(*)(void *)) eina_list_data_get;
eddc.func.hash_foreach = eddc.func.hash_foreach =
(void (*) (void *, int (*) (void *, const char *, void *, void *), void *)) (void (*) (void *, int (*) (void *, const char *, void *, void *), void *))
evas_hash_foreach; eina_hash_foreach;
eddc.func.hash_add = (void *(*) (void *, const char *, void *)) evas_hash_add; eddc.func.hash_add = (void* (*) (void *, const char *, void *)) eet_eina_hash_add_alloc;
eddc.func.hash_free = (void (*) (void *)) evas_hash_free; eddc.func.hash_free = (void (*) (Eina_Hash *)) eina_hash_free;
eddc.name = "e_storage"; eddc.name = "e_storage";
eddc.size = sizeof(E_Storage); eddc.size = sizeof(E_Storage);

42
src/bin/e_font.c
View File

@ -5,9 +5,9 @@
#define E_TOK_STYLE ":style=" #define E_TOK_STYLE ":style="
static Evas_Bool _font_hash_free_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__); static Eina_Bool _font_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__);
static Evas_Hash *_e_font_available_hash_add(Evas_Hash *font_hash, const char *full_name); static Eina_Hash *_e_font_available_hash_add(Eina_Hash *font_hash, const char *full_name);
static E_Font_Properties *_e_font_fontconfig_name_parse(Evas_Hash **font_hash, E_Font_Properties *efp, const char *font); static E_Font_Properties *_e_font_fontconfig_name_parse(Eina_Hash **font_hash, E_Font_Properties *efp, const char *font);
static char _fn_buf[1024]; static char _fn_buf[1024];
EAPI int EAPI int
@ -150,8 +150,8 @@ e_font_properties_free(E_Font_Properties *efp)
free(efp); free(efp);
} }
static Evas_Bool static Eina_Bool
_font_hash_free_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) _font_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__)
{ {
E_Font_Properties *efp; E_Font_Properties *efp;
@ -161,10 +161,10 @@ _font_hash_free_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__,
} }
EAPI void EAPI void
e_font_available_hash_free(Evas_Hash *hash) e_font_available_hash_free(Eina_Hash *hash)
{ {
evas_hash_foreach(hash, _font_hash_free_cb, NULL); eina_hash_foreach(hash, _font_hash_free_cb, NULL);
evas_hash_free(hash); eina_hash_free(hash);
} }
EAPI E_Font_Properties * EAPI E_Font_Properties *
@ -175,7 +175,7 @@ e_font_fontconfig_name_parse(const char *font)
} }
static E_Font_Properties * static E_Font_Properties *
_e_font_fontconfig_name_parse(Evas_Hash **font_hash, E_Font_Properties *efp, const char *font) _e_font_fontconfig_name_parse(Eina_Hash **font_hash, E_Font_Properties *efp, const char *font)
{ {
char *s1; char *s1;
@ -203,12 +203,16 @@ _e_font_fontconfig_name_parse(Evas_Hash **font_hash, E_Font_Properties *efp, con
{ {
style = s1 + strlen(E_TOK_STYLE); style = s1 + strlen(E_TOK_STYLE);
if (font_hash) efp = evas_hash_find(*font_hash, name); if (font_hash) efp = eina_hash_find(*font_hash, name);
if (efp == NULL) if (efp == NULL)
{ {
efp = calloc(1, sizeof(E_Font_Properties)); efp = calloc(1, sizeof(E_Font_Properties));
efp->name = eina_stringshare_add(name); efp->name = eina_stringshare_add(name);
if (font_hash) *font_hash = evas_hash_add(*font_hash, name, efp); if (font_hash)
{
if (!*font_hash) *font_hash = eina_hash_string_superfast_new(NULL);
eina_hash_add(*font_hash, name, efp);
}
} }
s2 = strchr(style, ','); s2 = strchr(style, ',');
if (s2) if (s2)
@ -229,29 +233,33 @@ _e_font_fontconfig_name_parse(Evas_Hash **font_hash, E_Font_Properties *efp, con
} }
else else
{ {
if (font_hash) efp = evas_hash_find(*font_hash, font); if (font_hash) efp = eina_hash_find(*font_hash, font);
if (efp == NULL) if (efp == NULL)
{ {
efp = calloc(1, sizeof(E_Font_Properties)); efp = calloc(1, sizeof(E_Font_Properties));
efp->name = eina_stringshare_add(font); efp->name = eina_stringshare_add(font);
if (font_hash) *font_hash = evas_hash_add(*font_hash, font, efp); if (font_hash)
{
if (!*font_hash) *font_hash = eina_hash_string_superfast_new(NULL);
eina_hash_add(*font_hash, font, efp);
}
} }
} }
return efp; return efp;
} }
static Evas_Hash * static Eina_Hash *
_e_font_available_hash_add(Evas_Hash *font_hash, const char *full_name) _e_font_available_hash_add(Eina_Hash *font_hash, const char *full_name)
{ {
_e_font_fontconfig_name_parse(&font_hash, NULL, full_name); _e_font_fontconfig_name_parse(&font_hash, NULL, full_name);
return font_hash; return font_hash;
} }
EAPI Evas_Hash * EAPI Eina_Hash *
e_font_available_list_parse(Eina_List *list) e_font_available_list_parse(Eina_List *list)
{ {
Evas_Hash *font_hash; Eina_Hash *font_hash;
Eina_List *next; Eina_List *next;
font_hash = NULL; font_hash = NULL;

4
src/bin/e_font.h
View File

@ -40,8 +40,8 @@ EAPI int e_font_shutdown(void);
EAPI void e_font_apply(void); EAPI void e_font_apply(void);
EAPI Eina_List *e_font_available_list(void); EAPI Eina_List *e_font_available_list(void);
EAPI void e_font_available_list_free(Eina_List *available); EAPI void e_font_available_list_free(Eina_List *available);
EAPI Evas_Hash *e_font_available_list_parse(Eina_List *list); EAPI Eina_Hash *e_font_available_list_parse(Eina_List *list);
EAPI void e_font_available_hash_free(Evas_Hash *hash); EAPI void e_font_available_hash_free(Eina_Hash *hash);
EAPI E_Font_Properties *e_font_fontconfig_name_parse(const char *font); EAPI E_Font_Properties *e_font_fontconfig_name_parse(const char *font);
EAPI const char *e_font_fontconfig_name_get(const char *name, const char *style); EAPI const char *e_font_fontconfig_name_get(const char *name, const char *style);
EAPI void e_font_properties_free(E_Font_Properties *efp); EAPI void e_font_properties_free(E_Font_Properties *efp);

13
src/bin/e_gadcon.c
View File

@ -182,7 +182,7 @@ struct _E_Layout_Item_Container
} }
/********************/ /********************/
static Evas_Hash *providers = NULL; static Eina_Hash *providers = NULL;
static Eina_List *providers_list = NULL; static Eina_List *providers_list = NULL;
static Eina_List *gadcons = NULL; static Eina_List *gadcons = NULL;
@ -210,7 +210,8 @@ e_gadcon_provider_register(const E_Gadcon_Client_Class *cc)
Eina_List *l; Eina_List *l;
E_Gadcon *gc; E_Gadcon *gc;
providers = evas_hash_direct_add(providers, cc->name, cc); if (!providers) providers = eina_hash_string_superfast_new(NULL);
eina_hash_direct_add(providers, cc->name, cc);
providers_list = eina_list_append(providers_list, cc); providers_list = eina_list_append(providers_list, cc);
for (l = gadcons; l; l = l->next) for (l = gadcons; l; l = l->next)
{ {
@ -245,7 +246,7 @@ e_gadcon_provider_unregister(const E_Gadcon_Client_Class *cc)
dlist = eina_list_remove_list(dlist, dlist); dlist = eina_list_remove_list(dlist, dlist);
e_object_del(E_OBJECT(gcc)); e_object_del(E_OBJECT(gcc));
} }
providers = evas_hash_del(providers, cc->name, cc); eina_hash_del(providers, cc->name, cc);
providers_list = eina_list_remove(providers_list, cc); providers_list = eina_list_remove(providers_list, cc);
} }
@ -408,7 +409,7 @@ e_gadcon_populate(E_Gadcon *gc)
cf_gcc = l->data; cf_gcc = l->data;
if (!cf_gcc->name) continue; if (!cf_gcc->name) continue;
cc = evas_hash_find(providers, cf_gcc->name); cc = eina_hash_find(providers, cf_gcc->name);
if (cc) if (cc)
{ {
E_Gadcon_Client *gcc; E_Gadcon_Client *gcc;
@ -768,7 +769,7 @@ e_gadcon_client_config_new(E_Gadcon *gc, const char *name)
E_OBJECT_TYPE_CHECK_RETURN(gc, E_GADCON_TYPE, NULL); E_OBJECT_TYPE_CHECK_RETURN(gc, E_GADCON_TYPE, NULL);
if (!name) return NULL; if (!name) return NULL;
cc = evas_hash_find(providers, name); cc = eina_hash_find(providers, name);
if (!cc) return NULL; if (!cc) return NULL;
if (!_e_gadcon_client_class_feature_check(cc, "id_new", cc->func.id_new)) return NULL; if (!_e_gadcon_client_class_feature_check(cc, "id_new", cc->func.id_new)) return NULL;
@ -2140,7 +2141,7 @@ _e_gadcon_cb_dnd_enter(void *data, const char *type, void *event)
E_Gadcon_Client_Class *cc; E_Gadcon_Client_Class *cc;
gcc = ev->data; gcc = ev->data;
cc = evas_hash_find(providers, gcc->name); cc = eina_hash_find(providers, gcc->name);
if (cc) if (cc)
{ {
if (!gcc->style) if (!gcc->style)

129
src/bin/e_int_config_modules.c
View File

@ -56,24 +56,24 @@ static Evas_Object *_basic_create (E_Config_Dialog *cfd, Evas *evas,
static void _fill_type_hash (void); static void _fill_type_hash (void);
static void _load_modules (const char *dir); static void _load_modules (const char *dir);
static void _fill_list (Evas_Object *obj, int enabled); static void _fill_list (Evas_Object *obj, int enabled);
static Evas_Bool _fill_list_types_avail(const Evas_Hash *hash __UNUSED__, static Eina_Bool _fill_list_types_avail(const Eina_Hash *hash __UNUSED__,
const void *key __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata); void *data, void *fdata);
static Evas_Bool _fill_list_types_load (const Evas_Hash *hash __UNUSED__, static Eina_Bool _fill_list_types_load (const Eina_Hash *hash __UNUSED__,
const void *key __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata); void *data, void *fdata);
static Evas_Bool _fill_list_types (Evas_Object *obj, CFType *cft, static Eina_Bool _fill_list_types (Evas_Object *obj, CFType *cft,
int enabled); int enabled);
static Evas_Bool _types_hash_cb_free (const Evas_Hash *hash __UNUSED__, static Eina_Bool _types_hash_cb_free (const Eina_Hash *hash __UNUSED__,
const void *key __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__); void *data, void *fdata __UNUSED__);
static Evas_Bool _mod_hash_cb_free (const Evas_Hash *hash __UNUSED__, static Eina_Bool _mod_hash_cb_free (const Eina_Hash *hash __UNUSED__,
const void *key __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__); void *data, void *fdata __UNUSED__);
static Evas_Bool _mod_hash_avail_list (const Evas_Hash *hash __UNUSED__, static Eina_Bool _mod_hash_avail_list (const Eina_Hash *hash __UNUSED__,
const void *key __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata); void *data, void *fdata);
static Evas_Bool _mod_hash_load_list (const Evas_Hash *hash __UNUSED__, static Eina_Bool _mod_hash_load_list (const Eina_Hash *hash __UNUSED__,
const void *key __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata); void *data, void *fdata);
static int _mod_list_sort (const void *data1, const void *data2); static int _mod_list_sort (const void *data1, const void *data2);
@ -81,28 +81,28 @@ static void _list_widget_load (Evas_Object *obj, Eina_List *list);
static void _avail_list_cb_change (void *data, Evas_Object *obj); static void _avail_list_cb_change (void *data, Evas_Object *obj);
static void _load_list_cb_change (void *data, Evas_Object *obj); static void _load_list_cb_change (void *data, Evas_Object *obj);
static void _unselect_all_modules (void); static void _unselect_all_modules (void);
static Evas_Bool _mod_hash_unselect (const Evas_Hash *hash __UNUSED__, static Eina_Bool _mod_hash_unselect (const Eina_Hash *hash __UNUSED__,
const void *key __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__); void *data, void *fdata __UNUSED__);
static void _select_all_modules (Evas_Object *obj, void *data); static void _select_all_modules (Evas_Object *obj, void *data);
static void _btn_cb_unload (void *data, void *data2); static void _btn_cb_unload (void *data, void *data2);
static void _btn_cb_load (void *data, void *data2); static void _btn_cb_load (void *data, void *data2);
static Evas_Bool _mod_hash_load (const Evas_Hash *hash __UNUSED__, static Eina_Bool _mod_hash_load (const Eina_Hash *hash __UNUSED__,
const void *key __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__); void *data, void *fdata __UNUSED__);
static Evas_Bool _mod_hash_unload (const Evas_Hash *hash __UNUSED__, static Eina_Bool _mod_hash_unload (const Eina_Hash *hash __UNUSED__,
const void *key __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__); void *data, void *fdata __UNUSED__);
static void _enable_modules (int enable); static void _enable_modules (int enable);
static Evas_Bool _enable_modules_types_enable (const Evas_Hash *hash __UNUSED__, static Eina_Bool _enable_modules_types_enable (const Eina_Hash *hash __UNUSED__,
const void *key __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata); void *data, void *fdata);
static Evas_Bool _enable_modules_types_disable (const Evas_Hash *hash __UNUSED__, static Eina_Bool _enable_modules_types_disable (const Eina_Hash *hash __UNUSED__,
const void *key __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata); void *data, void *fdata);
/* local variables */ /* local variables */
static Evas_Hash *types_hash = NULL; static Eina_Hash *types_hash = NULL;
EAPI E_Config_Dialog * EAPI E_Config_Dialog *
e_int_config_modules(E_Container *con, const char *params __UNUSED__) e_int_config_modules(E_Container *con, const char *params __UNUSED__)
@ -164,8 +164,8 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
if (types_hash) if (types_hash)
{ {
evas_hash_foreach(types_hash, _types_hash_cb_free, NULL); eina_hash_foreach(types_hash, _types_hash_cb_free, NULL);
evas_hash_free(types_hash); eina_hash_free(types_hash);
types_hash = NULL; types_hash = NULL;
} }
E_FREE(cfdata); E_FREE(cfdata);
@ -226,14 +226,15 @@ _fill_type_hash(void)
CFType *cft = NULL; CFType *cft = NULL;
if (!_types[i].key) continue; if (!_types[i].key) continue;
if (evas_hash_find(types_hash, _types[i].key)) continue; if (eina_hash_find(types_hash, _types[i].key)) continue;
cft = E_NEW(CFType, 1); cft = E_NEW(CFType, 1);
if (!cft) continue; if (!cft) continue;
cft->key = eina_stringshare_add(_types[i].key); cft->key = eina_stringshare_add(_types[i].key);
cft->name = eina_stringshare_add(_types[i].name); cft->name = eina_stringshare_add(_types[i].name);
cft->icon = eina_stringshare_add(_types[i].icon); cft->icon = eina_stringshare_add(_types[i].icon);
types_hash = evas_hash_direct_add(types_hash, cft->key, cft); if (!types_hash) types_hash = eina_hash_string_superfast_new(NULL);
eina_hash_direct_add(types_hash, cft->key, cft);
} }
} }
@ -263,14 +264,14 @@ _load_modules(const char *dir)
/* does the ModuleType exist in desktop? */ /* does the ModuleType exist in desktop? */
if (desk->x) if (desk->x)
type = ecore_hash_get(desk->x, "X-Enlightenment-ModuleType"); type = eina_hash_find(desk->x, "X-Enlightenment-ModuleType");
if (!type) type = eina_stringshare_add("shelf"); if (!type) type = eina_stringshare_add("shelf");
/* do we have this module already in it's type hash ? */ /* do we have this module already in it's type hash ? */
cft = evas_hash_find(types_hash, type); cft = eina_hash_find(types_hash, type);
if (cft) if (cft)
{ {
if (cft->modules && evas_hash_find(cft->modules, mod)) if (cft->modules && eina_hash_find(cft->modules, mod))
{ {
if ((!desk->x) && (type)) eina_stringshare_del(type); if ((!desk->x) && (type)) eina_stringshare_del(type);
if (desk) efreet_desktop_free(desk); if (desk) efreet_desktop_free(desk);
@ -290,7 +291,8 @@ _load_modules(const char *dir)
snprintf(buf, sizeof(buf), "enlightenment/%s", type); snprintf(buf, sizeof(buf), "enlightenment/%s", type);
if (e_util_edje_icon_check(buf)) if (e_util_edje_icon_check(buf))
cft->icon = eina_stringshare_add(buf); cft->icon = eina_stringshare_add(buf);
types_hash = evas_hash_direct_add(types_hash, cft->key, cft); if (!types_hash) types_hash = eina_hash_string_superfast_new(NULL);
eina_hash_direct_add(types_hash, cft->key, cft);
} }
/* module not in it's type hash, add */ /* module not in it's type hash, add */
@ -306,7 +308,8 @@ _load_modules(const char *dir)
efreet_desktop_free(desk); efreet_desktop_free(desk);
if (e_module_find(mod)) cfm->enabled = 1; if (e_module_find(mod)) cfm->enabled = 1;
cft->modules = evas_hash_direct_add(cft->modules, cfm->short_name, cfm); if (!cft->modules) cft->modules = eina_hash_string_superfast_new(NULL);
eina_hash_direct_add(cft->modules, cfm->short_name, cfm);
} }
free(mod); free(mod);
if (files) ecore_list_destroy(files); if (files) ecore_list_destroy(files);
@ -328,9 +331,9 @@ _fill_list(Evas_Object *obj, int enabled)
if (types_hash) if (types_hash)
{ {
if (!enabled) if (!enabled)
evas_hash_foreach(types_hash, _fill_list_types_avail, obj); eina_hash_foreach(types_hash, _fill_list_types_avail, obj);
else else
evas_hash_foreach(types_hash, _fill_list_types_load, obj); eina_hash_foreach(types_hash, _fill_list_types_load, obj);
} }
e_widget_ilist_go(obj); e_widget_ilist_go(obj);
@ -341,8 +344,8 @@ _fill_list(Evas_Object *obj, int enabled)
evas_event_thaw(evas); evas_event_thaw(evas);
} }
static Evas_Bool static Eina_Bool
_fill_list_types_avail(const Evas_Hash *hash __UNUSED__, _fill_list_types_avail(const Eina_Hash *hash __UNUSED__,
const void *key __UNUSED__, void *data, void *fdata) const void *key __UNUSED__, void *data, void *fdata)
{ {
CFType *cft; CFType *cft;
@ -354,8 +357,8 @@ _fill_list_types_avail(const Evas_Hash *hash __UNUSED__,
return _fill_list_types(obj, cft, 0); return _fill_list_types(obj, cft, 0);
} }
static Evas_Bool static Eina_Bool
_fill_list_types_load(const Evas_Hash *hash __UNUSED__, _fill_list_types_load(const Eina_Hash *hash __UNUSED__,
const void *key __UNUSED__, void *data, void *fdata) const void *key __UNUSED__, void *data, void *fdata)
{ {
CFType *cft; CFType *cft;
@ -367,7 +370,7 @@ _fill_list_types_load(const Evas_Hash *hash __UNUSED__,
return _fill_list_types(obj, cft, 1); return _fill_list_types(obj, cft, 1);
} }
static Evas_Bool static Eina_Bool
_fill_list_types(Evas_Object *obj, CFType *cft, int enabled) _fill_list_types(Evas_Object *obj, CFType *cft, int enabled)
{ {
Evas *evas; Evas *evas;
@ -380,13 +383,13 @@ _fill_list_types(Evas_Object *obj, CFType *cft, int enabled)
if (cft->modules) if (cft->modules)
{ {
if (!enabled) if (!enabled)
evas_hash_foreach(cft->modules, _mod_hash_avail_list, &l); eina_hash_foreach(cft->modules, _mod_hash_avail_list, &l);
else else
evas_hash_foreach(cft->modules, _mod_hash_load_list, &l); eina_hash_foreach(cft->modules, _mod_hash_load_list, &l);
} }
if (l) count = eina_list_count(l); if (l) count = eina_list_count(l);
else return 1; else return EINA_TRUE;
/* We have at least one, append header */ /* We have at least one, append header */
if (cft->icon) if (cft->icon)
@ -408,11 +411,11 @@ _fill_list_types(Evas_Object *obj, CFType *cft, int enabled)
l = NULL; l = NULL;
} }
return 1; return EINA_TRUE;
} }
static Evas_Bool static Eina_Bool
_types_hash_cb_free(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, _types_hash_cb_free(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__) void *data, void *fdata __UNUSED__)
{ {
CFType *type = NULL; CFType *type = NULL;
@ -423,16 +426,16 @@ _types_hash_cb_free(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__
if (type->icon) eina_stringshare_del(type->icon); if (type->icon) eina_stringshare_del(type->icon);
if (type->modules) if (type->modules)
{ {
evas_hash_foreach(type->modules, _mod_hash_cb_free, NULL); eina_hash_foreach(type->modules, _mod_hash_cb_free, NULL);
evas_hash_free(type->modules); eina_hash_free(type->modules);
type->modules = NULL; type->modules = NULL;
} }
E_FREE(type); E_FREE(type);
return 1; return EINA_TRUE;
} }
static Evas_Bool static Eina_Bool
_mod_hash_cb_free(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, _mod_hash_cb_free(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__) void *data, void *fdata __UNUSED__)
{ {
CFModule *mod = NULL; CFModule *mod = NULL;
@ -444,11 +447,11 @@ _mod_hash_cb_free(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__,
if (mod->comment) eina_stringshare_del(mod->comment); if (mod->comment) eina_stringshare_del(mod->comment);
if (mod->orig_path) eina_stringshare_del(mod->orig_path); if (mod->orig_path) eina_stringshare_del(mod->orig_path);
E_FREE(mod); E_FREE(mod);
return 1; return EINA_TRUE;
} }
static Evas_Bool static Eina_Bool
_mod_hash_avail_list(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, _mod_hash_avail_list(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata) void *data, void *fdata)
{ {
Eina_List **l; Eina_List **l;
@ -458,11 +461,11 @@ _mod_hash_avail_list(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED_
if ((!mod) || (mod->enabled)) return 1; if ((!mod) || (mod->enabled)) return 1;
l = fdata; l = fdata;
*l = eina_list_append(*l, mod); *l = eina_list_append(*l, mod);
return 1; return EINA_TRUE;
} }
static Evas_Bool static Eina_Bool
_mod_hash_load_list(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, _mod_hash_load_list(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata) void *data, void *fdata)
{ {
Eina_List **l; Eina_List **l;
@ -472,7 +475,7 @@ _mod_hash_load_list(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__
if ((!mod) || (!mod->enabled)) return 1; if ((!mod) || (!mod->enabled)) return 1;
l = fdata; l = fdata;
*l = eina_list_append(*l, mod); *l = eina_list_append(*l, mod);
return 1; return EINA_TRUE;
} }
static int static int
@ -579,14 +582,14 @@ _unselect_all_modules(void)
CFType *cft = NULL; CFType *cft = NULL;
if (!_types[i].key) continue; if (!_types[i].key) continue;
cft = evas_hash_find(types_hash, _types[i].key); cft = eina_hash_find(types_hash, _types[i].key);
if ((!cft) || (!cft->modules)) continue; if ((!cft) || (!cft->modules)) continue;
evas_hash_foreach(cft->modules, _mod_hash_unselect, NULL); eina_hash_foreach(cft->modules, _mod_hash_unselect, NULL);
} }
} }
static Evas_Bool static Eina_Bool
_mod_hash_unselect(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, _mod_hash_unselect(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__) void *data, void *fdata __UNUSED__)
{ {
CFModule *mod = NULL; CFModule *mod = NULL;
@ -677,13 +680,13 @@ _enable_modules(int enable)
if (!types_hash) return; if (!types_hash) return;
if (enable) if (enable)
evas_hash_foreach(types_hash, _enable_modules_types_enable, NULL); eina_hash_foreach(types_hash, _enable_modules_types_enable, NULL);
else else
evas_hash_foreach(types_hash, _enable_modules_types_disable, NULL); eina_hash_foreach(types_hash, _enable_modules_types_disable, NULL);
} }
static Evas_Bool static Eina_Bool
_enable_modules_types_enable(const Evas_Hash *hash __UNUSED__, _enable_modules_types_enable(const Eina_Hash *hash __UNUSED__,
const void *key __UNUSED__, void *data, const void *key __UNUSED__, void *data,
void *fdata) void *fdata)
{ {
@ -691,12 +694,12 @@ _enable_modules_types_enable(const Evas_Hash *hash __UNUSED__,
cft = data; cft = data;
if (cft && cft->modules) if (cft && cft->modules)
evas_hash_foreach(cft->modules, _mod_hash_load, NULL); eina_hash_foreach(cft->modules, _mod_hash_load, NULL);
return 1; return 1;
} }
static Evas_Bool static Eina_Bool
_enable_modules_types_disable(const Evas_Hash *hash __UNUSED__, _enable_modules_types_disable(const Eina_Hash *hash __UNUSED__,
const void *key __UNUSED__, void *data, const void *key __UNUSED__, void *data,
void *fdata) void *fdata)
{ {
@ -704,12 +707,12 @@ _enable_modules_types_disable(const Evas_Hash *hash __UNUSED__,
cft = data; cft = data;
if (cft && cft->modules) if (cft && cft->modules)
evas_hash_foreach(cft->modules, _mod_hash_unload, NULL); eina_hash_foreach(cft->modules, _mod_hash_unload, NULL);
return 1; return 1;
} }
static Evas_Bool static Eina_Bool
_mod_hash_load(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, _mod_hash_load(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__) void *data, void *fdata __UNUSED__)
{ {
CFModule *mod = NULL; CFModule *mod = NULL;
@ -725,8 +728,8 @@ _mod_hash_load(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__,
return 1; return 1;
} }
static Evas_Bool static Eina_Bool
_mod_hash_unload(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, _mod_hash_unload(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__) void *data, void *fdata __UNUSED__)
{ {
CFModule *mod = NULL; CFModule *mod = NULL;

87
src/bin/e_int_menus.c
View File

@ -65,7 +65,7 @@ static void _e_int_menus_items_del_hook (void *obj);
static void _e_int_menus_item_label_set (Efreet_Menu *entry, E_Menu_Item *mi); static void _e_int_menus_item_label_set (Efreet_Menu *entry, E_Menu_Item *mi);
/* local subsystem globals */ /* local subsystem globals */
static Evas_Hash *_e_int_menus_augmentation = NULL; static Eina_Hash *_e_int_menus_augmentation = NULL;
/* externally accessible functions */ /* externally accessible functions */
EAPI E_Menu * EAPI E_Menu *
@ -86,7 +86,7 @@ e_int_menus_main_new(void)
e_menu_category_set(m, "main"); e_menu_category_set(m, "main");
l = evas_hash_find(_e_int_menus_augmentation, "main/0"); l = eina_hash_find(_e_int_menus_augmentation, "main/0");
if (l) _e_int_menus_augmentation_add(m, l); if (l) _e_int_menus_augmentation_add(m, l);
if (e_config->menu_favorites_show) if (e_config->menu_favorites_show)
@ -112,13 +112,13 @@ e_int_menus_main_new(void)
e_menu_item_submenu_set(mi, subm); e_menu_item_submenu_set(mi, subm);
} }
l = evas_hash_find(_e_int_menus_augmentation, "main/1"); l = eina_hash_find(_e_int_menus_augmentation, "main/1");
if (l) _e_int_menus_augmentation_add(m, l); if (l) _e_int_menus_augmentation_add(m, l);
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1); e_menu_item_separator_set(mi, 1);
l = evas_hash_find(_e_int_menus_augmentation, "main/2"); l = eina_hash_find(_e_int_menus_augmentation, "main/2");
if (l) _e_int_menus_augmentation_add(m, l); if (l) _e_int_menus_augmentation_add(m, l);
subm = e_int_menus_desktops_new(); subm = e_int_menus_desktops_new();
@ -145,13 +145,13 @@ e_int_menus_main_new(void)
e_menu_item_submenu_set(mi, subm); e_menu_item_submenu_set(mi, subm);
*/ */
l = evas_hash_find(_e_int_menus_augmentation, "main/3"); l = eina_hash_find(_e_int_menus_augmentation, "main/3");
if (l) _e_int_menus_augmentation_add(m, l); if (l) _e_int_menus_augmentation_add(m, l);
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1); e_menu_item_separator_set(mi, 1);
l = evas_hash_find(_e_int_menus_augmentation, "main/4"); l = eina_hash_find(_e_int_menus_augmentation, "main/4");
if (l) _e_int_menus_augmentation_add(m, l); if (l) _e_int_menus_augmentation_add(m, l);
subm = e_menu_new(); subm = e_menu_new();
@ -172,13 +172,13 @@ e_int_menus_main_new(void)
e_util_menu_item_edje_icon_set(mi, "enlightenment/themes"); e_util_menu_item_edje_icon_set(mi, "enlightenment/themes");
e_menu_item_callback_set(mi, _e_int_menus_themes_about, NULL); e_menu_item_callback_set(mi, _e_int_menus_themes_about, NULL);
l = evas_hash_find(_e_int_menus_augmentation, "main/5"); l = eina_hash_find(_e_int_menus_augmentation, "main/5");
if (l) _e_int_menus_augmentation_add(m, l); if (l) _e_int_menus_augmentation_add(m, l);
mi = e_menu_item_new(subm); mi = e_menu_item_new(subm);
e_menu_item_separator_set(mi, 1); e_menu_item_separator_set(mi, 1);
l = evas_hash_find(_e_int_menus_augmentation, "main/6"); l = eina_hash_find(_e_int_menus_augmentation, "main/6");
if (l) _e_int_menus_augmentation_add(m, l); if (l) _e_int_menus_augmentation_add(m, l);
mi = e_menu_item_new(subm); mi = e_menu_item_new(subm);
@ -191,13 +191,13 @@ e_int_menus_main_new(void)
e_util_menu_item_edje_icon_set(mi, "enlightenment/exit"); e_util_menu_item_edje_icon_set(mi, "enlightenment/exit");
e_menu_item_callback_set(mi, _e_int_menus_main_exit, NULL); e_menu_item_callback_set(mi, _e_int_menus_main_exit, NULL);
l = evas_hash_find(_e_int_menus_augmentation, "main/7"); l = eina_hash_find(_e_int_menus_augmentation, "main/7");
if (l) _e_int_menus_augmentation_add(m, l); if (l) _e_int_menus_augmentation_add(m, l);
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1); e_menu_item_separator_set(mi, 1);
l = evas_hash_find(_e_int_menus_augmentation, "main/8"); l = eina_hash_find(_e_int_menus_augmentation, "main/8");
if (l) _e_int_menus_augmentation_add(m, l); if (l) _e_int_menus_augmentation_add(m, l);
subm = e_int_menus_config_new(); subm = e_int_menus_config_new();
@ -207,7 +207,7 @@ e_int_menus_main_new(void)
e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration"); e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
e_menu_item_submenu_set(mi, subm); e_menu_item_submenu_set(mi, subm);
l = evas_hash_find(_e_int_menus_augmentation, "main/9"); l = eina_hash_find(_e_int_menus_augmentation, "main/9");
if (l) _e_int_menus_augmentation_add(m, l); if (l) _e_int_menus_augmentation_add(m, l);
l = evas_hash_find(_e_int_menus_augmentation, "main/10"); l = evas_hash_find(_e_int_menus_augmentation, "main/10");
@ -355,16 +355,14 @@ e_int_menus_menu_augmentation_add(const char *menu,
maug->del.func = func_del; maug->del.func = func_del;
maug->del.data = data_del; maug->del.data = data_del;
l = evas_hash_find(_e_int_menus_augmentation, menu); l = eina_hash_find(_e_int_menus_augmentation, menu);
if (l) if (l)
{ eina_hash_del(_e_int_menus_augmentation, menu, l);
_e_int_menus_augmentation =
evas_hash_del(_e_int_menus_augmentation, menu, l);
}
l = eina_list_append(l, maug); l = eina_list_append(l, maug);
_e_int_menus_augmentation = if (!_e_int_menus_augmentation)
evas_hash_add(_e_int_menus_augmentation, menu, l); _e_int_menus_augmentation = eina_hash_string_superfast_new(NULL);
eina_hash_add(_e_int_menus_augmentation, menu, l);
return maug; return maug;
} }
@ -374,21 +372,27 @@ e_int_menus_menu_augmentation_del(const char *menu, E_Int_Menu_Augmentation *mau
{ {
Eina_List *l = NULL; Eina_List *l = NULL;
l = evas_hash_find(_e_int_menus_augmentation, menu); l = eina_hash_find(_e_int_menus_augmentation, menu);
if (l) if (l)
{ {
/* /*
* We should always add the list to the hash, in case the list * We should always add the list to the hash, in case the list
* becomes empty, or the first element is removed. * becomes empty, or the first element is removed.
*/ */
_e_int_menus_augmentation = eina_hash_del(_e_int_menus_augmentation, menu, l);
evas_hash_del(_e_int_menus_augmentation, menu, l);
l = eina_list_remove(l, maug); l = eina_list_remove(l, maug);
if (l) if (l)
{ {
_e_int_menus_augmentation = eina_hash_add(_e_int_menus_augmentation, menu, l);
evas_hash_add(_e_int_menus_augmentation, menu, l); }
else
{
if (!eina_hash_population(_e_int_menus_augmentation))
{
eina_hash_free(_e_int_menus_augmentation);
_e_int_menus_augmentation = NULL;
}
} }
} }
free(maug); free(maug);
@ -414,18 +418,18 @@ _e_int_menus_main_del_hook(void *obj)
if (dat->lost_clients) e_object_del(E_OBJECT(dat->lost_clients)); if (dat->lost_clients) e_object_del(E_OBJECT(dat->lost_clients));
free(dat); free(dat);
} }
_e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation, "main/0")); _e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/0"));
_e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation, "main/1")); _e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/1"));
_e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation, "main/2")); _e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/2"));
_e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation, "main/3")); _e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/3"));
_e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation, "main/4")); _e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/4"));
_e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation, "main/5")); _e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/5"));
_e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation, "main/6")); _e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/6"));
_e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation, "main/7")); _e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/7"));
_e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation, "main/8")); _e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/8"));
_e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation, "main/9")); _e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/9"));
_e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation, "main/10")); _e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/10"));
_e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation, "main/11")); _e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/11"));
} }
static void static void
@ -737,7 +741,7 @@ _e_int_menus_config_pre_cb(void *data, E_Menu *m)
e_menu_pre_activate_callback_set(m, NULL, NULL); e_menu_pre_activate_callback_set(m, NULL, NULL);
l = evas_hash_find(_e_int_menus_augmentation, "config/0"); l = eina_hash_find(_e_int_menus_augmentation, "config/0");
if (l) if (l)
{ {
_e_int_menus_augmentation_add(m, l); _e_int_menus_augmentation_add(m, l);
@ -753,14 +757,15 @@ _e_int_menus_config_pre_cb(void *data, E_Menu *m)
e_menu_item_callback_set(mi, _e_int_menus_module_item_cb, NULL); e_menu_item_callback_set(mi, _e_int_menus_module_item_cb, NULL);
} }
l = evas_hash_find(_e_int_menus_augmentation, "config/1"); l = eina_hash_find(_e_int_menus_augmentation, "config/1");
if (l) _e_int_menus_augmentation_add(m, l); if (l) _e_int_menus_augmentation_add(m, l);
l = evas_hash_find(_e_int_menus_augmentation, "config/2"); l = eina_hash_find(_e_int_menus_augmentation, "config/2");
if (l) if (l)
{ {
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1); e_menu_item_separator_set(mi, 1);
_e_int_menus_augmentation_add(m, l); _e_int_menus_augmentation_add(m, l);
} }
@ -773,9 +778,9 @@ _e_int_menus_config_free_hook(void *obj)
E_Menu *m; E_Menu *m;
m = obj; m = obj;
_e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation, "config/0")); _e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "config/0"));
_e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation, "config/1")); _e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "config/1"));
_e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation, "config/2")); _e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "config/2"));
} }
static int static int

29
src/bin/e_intl.c
View File

@ -41,13 +41,13 @@ static Eina_List *_e_intl_language_dir_scan(const char *dir);
static int _e_intl_language_list_find(Eina_List *language_list, char *language); static int _e_intl_language_list_find(Eina_List *language_list, char *language);
/* Locale Validation and Discovery */ /* Locale Validation and Discovery */
static Evas_Hash *_e_intl_locale_alias_hash_get(void); static Eina_Hash *_e_intl_locale_alias_hash_get(void);
static char *_e_intl_locale_alias_get(const char *language); static char *_e_intl_locale_alias_get(const char *language);
static Eina_List *_e_intl_locale_system_locales_get(void); static Eina_List *_e_intl_locale_system_locales_get(void);
static Eina_List *_e_intl_locale_search_order_get(const char *locale); static Eina_List *_e_intl_locale_search_order_get(const char *locale);
static int _e_intl_locale_validate(const char *locale); static int _e_intl_locale_validate(const char *locale);
static void _e_intl_locale_hash_free(Evas_Hash *language_hash); static void _e_intl_locale_hash_free(Eina_Hash *language_hash);
static Evas_Bool _e_intl_locale_hash_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata); static Evas_Bool _e_intl_locale_hash_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata);
/* Input Method Configuration and Management */ /* Input Method Configuration and Management */
static int _e_intl_cb_exit(void *data, int type, void *event); static int _e_intl_cb_exit(void *data, int type, void *event);
@ -459,15 +459,15 @@ _e_intl_cb_exit(void *data, int type, void *event)
} }
static void static void
_e_intl_locale_hash_free(Evas_Hash *locale_hash) _e_intl_locale_hash_free(Eina_Hash *locale_hash)
{ {
if (!locale_hash) return; if (!locale_hash) return;
evas_hash_foreach(locale_hash, _e_intl_locale_hash_free_cb, NULL); eina_hash_foreach(locale_hash, _e_intl_locale_hash_free_cb, NULL);
evas_hash_free(locale_hash); eina_hash_free(locale_hash);
} }
static Evas_Bool static Eina_Bool
_e_intl_locale_hash_free_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) _e_intl_locale_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__)
{ {
free(data); free(data);
return 1; return 1;
@ -576,7 +576,7 @@ _e_intl_language_dir_scan(const char *dir)
static char * static char *
_e_intl_locale_alias_get(const char *language) _e_intl_locale_alias_get(const char *language)
{ {
Evas_Hash *alias_hash; Eina_Hash *alias_hash;
char *alias; char *alias;
char *lower_language; char *lower_language;
char *noenc_language; char *noenc_language;
@ -594,7 +594,7 @@ _e_intl_locale_alias_get(const char *language)
lower_language[i] = tolower(language[i]); lower_language[i] = tolower(language[i]);
lower_language[i] = 0; lower_language[i] = 0;
alias = evas_hash_find(alias_hash, lower_language); alias = eina_hash_find(alias_hash, lower_language);
free(lower_language); free(lower_language);
if (alias) if (alias)
@ -607,12 +607,12 @@ _e_intl_locale_alias_get(const char *language)
return alias; return alias;
} }
static Evas_Hash * static Eina_Hash *
_e_intl_locale_alias_hash_get(void) _e_intl_locale_alias_hash_get(void)
{ {
Eina_List *next; Eina_List *next;
Eina_List *dir_list; Eina_List *dir_list;
Evas_Hash *alias_hash; Eina_Hash *alias_hash;
dir_list = e_path_dir_list_get(path_messages); dir_list = e_path_dir_list_get(path_messages);
alias_hash = NULL; alias_hash = NULL;
@ -639,10 +639,11 @@ _e_intl_locale_alias_hash_get(void)
continue; continue;
/* skip dupes */ /* skip dupes */
if (evas_hash_find(alias_hash, alias)) if (eina_hash_find(alias_hash, alias))
continue; continue;
alias_hash = evas_hash_add(alias_hash, alias, strdup(locale)); if (!alias_hash) alias_hash = eina_hash_string_superfast_new(NULL);
eina_hash_add(alias_hash, alias, strdup(locale));
} }
fclose (f); fclose (f);
} }

18
src/bin/e_ipc_codec.c
View File

@ -28,15 +28,27 @@ static Eet_Data_Descriptor *_e_ipc_3int_3str_list_edd = NULL;
static Eet_Data_Descriptor *_e_ipc_str_4int_edd = NULL; static Eet_Data_Descriptor *_e_ipc_str_4int_edd = NULL;
static Eet_Data_Descriptor *_e_ipc_str_4int_list_edd = NULL; static Eet_Data_Descriptor *_e_ipc_str_4int_list_edd = NULL;
static void *
_e_ipc_codec_eina_hash_add(void *hash, const void *key, void *data)
{
Eina_Hash *result = hash;
if (!result) result = eina_hash_string_superfast_new(NULL);
if (!result) return NULL;
eina_hash_add(result, key, data);
return result;
}
#define E_IPC_DD_NEW(str, typ) \ #define E_IPC_DD_NEW(str, typ) \
eet_data_descriptor_new(str, sizeof(typ), \ eet_data_descriptor_new(str, sizeof(typ), \
(void *(*) (void *))eina_list_next, \ (void *(*) (void *))eina_list_next, \
(void *(*) (void *, void *))eina_list_append, \ (void *(*) (void *, void *))eina_list_append, \
(void *(*) (void *))eina_list_data_get, \ (void *(*) (void *))eina_list_data_get, \
(void *(*) (void *))eina_list_free, \ (void *(*) (void *))eina_list_free, \
(void (*) (void *, int (*) (void *, const char *, void *, void *), void *))evas_hash_foreach, \ (void (*) (void *, int (*) (void *, const char *, void *, void *), void *))eina_hash_foreach, \
(void *(*) (void *, const char *, void *))evas_hash_add, \ (void *(*) (void *, const char *, void *))_e_ipc_codec_eina_hash_add, \
(void (*) (void *))evas_hash_free) (void (*) (void *))eina_hash_free)
/* externally accessible functions */ /* externally accessible functions */
EAPI int EAPI int

17
src/bin/e_manager.c
View File

@ -15,7 +15,7 @@ static int _e_manager_cb_ping(void *data, int ev_type, void *ev);
static int _e_manager_cb_screensaver_notify(void *data, int ev_type, void *ev); static int _e_manager_cb_screensaver_notify(void *data, int ev_type, void *ev);
static int _e_manager_cb_client_message(void *data, int ev_type, void *ev); static int _e_manager_cb_client_message(void *data, int ev_type, void *ev);
static Evas_Bool _e_manager_frame_extents_free_cb(const Evas_Hash *hash __UNUSED__, static Eina_Bool _e_manager_frame_extents_free_cb(const Eina_Hash *hash __UNUSED__,
const void *key __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__); void *data, void *fdata __UNUSED__);
static E_Manager *_e_manager_get_for_root(Ecore_X_Window root); static E_Manager *_e_manager_get_for_root(Ecore_X_Window root);
@ -44,13 +44,14 @@ struct _Frame_Extents
}; };
static Eina_List *managers = NULL; static Eina_List *managers = NULL;
static Evas_Hash *frame_extents = NULL; static Eina_Hash *frame_extents = NULL;
/* externally accessible functions */ /* externally accessible functions */
EAPI int EAPI int
e_manager_init(void) e_manager_init(void)
{ {
ecore_x_screensaver_event_listen_set(1); ecore_x_screensaver_event_listen_set(1);
frame_extents = eina_hash_string_superfast_new(NULL);
return 1; return 1;
} }
@ -68,8 +69,8 @@ e_manager_shutdown(void)
} }
if (frame_extents) if (frame_extents)
{ {
evas_hash_foreach(frame_extents, _e_manager_frame_extents_free_cb, NULL); eina_hash_foreach(frame_extents, _e_manager_frame_extents_free_cb, NULL);
evas_hash_free(frame_extents); eina_hash_free(frame_extents);
frame_extents = NULL; frame_extents = NULL;
} }
return 1; return 1;
@ -712,7 +713,7 @@ _e_manager_cb_frame_extents_request(void *data, int ev_type __UNUSED__, void *ev
free(state); free(state);
} }
extents = evas_hash_find(frame_extents, key); extents = eina_hash_find(frame_extents, key);
if (!extents) if (!extents)
{ {
extents = E_NEW(Frame_Extents, 1); extents = E_NEW(Frame_Extents, 1);
@ -751,7 +752,7 @@ _e_manager_cb_frame_extents_request(void *data, int ev_type __UNUSED__, void *ev
extents->b = 0; extents->b = 0;
} }
evas_object_del(o); evas_object_del(o);
frame_extents = evas_hash_add(frame_extents, key, extents); eina_hash_add(frame_extents, key, extents);
} }
} }
@ -856,8 +857,8 @@ _e_manager_cb_client_message(void *data, int ev_type, void *ev)
return 1; return 1;
} }
static Evas_Bool static Eina_Bool
_e_manager_frame_extents_free_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, _e_manager_frame_extents_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__) void *data, void *fdata __UNUSED__)
{ {
free(data); free(data);

25
src/bin/e_menu.c
View File

@ -86,14 +86,14 @@ static int _e_menu_cb_scroll_animator (void *data);
static int _e_menu_cb_window_shape (void *data, int ev_type, void *ev); static int _e_menu_cb_window_shape (void *data, int ev_type, void *ev);
static void _e_menu_cb_item_submenu_post_default (void *data, E_Menu *m, E_Menu_Item *mi); static void _e_menu_cb_item_submenu_post_default (void *data, E_Menu *m, E_Menu_Item *mi);
static Evas_Bool _e_menu_categories_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata); static Evas_Bool _e_menu_categories_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata);
/* local subsystem globals */ /* local subsystem globals */
static Ecore_X_Window _e_menu_win = 0; static Ecore_X_Window _e_menu_win = 0;
static Eina_List *_e_active_menus = NULL; static Eina_List *_e_active_menus = NULL;
static E_Menu_Item *_e_active_menu_item = NULL; static E_Menu_Item *_e_active_menu_item = NULL;
/*static Evas_Hash *_e_menu_category_items = NULL;*/ /*static Eina_Hash *_e_menu_category_items = NULL;*/
static Evas_Hash *_e_menu_categories = NULL; static Eina_Hash *_e_menu_categories = NULL;
static Ecore_X_Time _e_menu_activate_time = 0; static Ecore_X_Time _e_menu_activate_time = 0;
static int _e_menu_activate_floating = 0; static int _e_menu_activate_floating = 0;
static int _e_menu_activate_maybe_drag = 0; static int _e_menu_activate_maybe_drag = 0;
@ -124,6 +124,7 @@ e_menu_init(void)
_e_menu_mouse_move_handler = ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE, _e_menu_cb_mouse_move, NULL); _e_menu_mouse_move_handler = ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE, _e_menu_cb_mouse_move, NULL);
_e_menu_mouse_wheel_handler = ecore_event_handler_add(ECORE_X_EVENT_MOUSE_WHEEL, _e_menu_cb_mouse_wheel, NULL); _e_menu_mouse_wheel_handler = ecore_event_handler_add(ECORE_X_EVENT_MOUSE_WHEEL, _e_menu_cb_mouse_wheel, NULL);
_e_menu_window_shape_handler = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHAPE, _e_menu_cb_window_shape, NULL); _e_menu_window_shape_handler = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHAPE, _e_menu_cb_window_shape, NULL);
_e_menu_categories = eina_hash_string_superfast_new(NULL);
return 1; return 1;
} }
@ -153,8 +154,8 @@ e_menu_shutdown(void)
_e_active_menus = NULL; _e_active_menus = NULL;
if (_e_menu_categories) if (_e_menu_categories)
{ {
evas_hash_foreach(_e_menu_categories, _e_menu_categories_free_cb, NULL); eina_hash_foreach(_e_menu_categories, _e_menu_categories_free_cb, NULL);
evas_hash_free(_e_menu_categories); eina_hash_free(_e_menu_categories);
_e_menu_categories = NULL; _e_menu_categories = NULL;
} }
@ -439,14 +440,14 @@ e_menu_category_data_set(char *category, void *data)
{ {
E_Menu_Category *cat; E_Menu_Category *cat;
cat = evas_hash_find(_e_menu_categories, category); cat = eina_hash_find(_e_menu_categories, category);
if (cat) if (cat)
cat->data = data; cat->data = data;
else /* if it isnt found create the new hash */ else /* if it isnt found create the new hash */
{ {
cat = calloc(1, sizeof(E_Menu_Category)); cat = calloc(1, sizeof(E_Menu_Category));
cat->data = data; cat->data = data;
_e_menu_categories = evas_hash_add(_e_menu_categories, category, cat); eina_hash_add(_e_menu_categories, category, cat);
} }
} }
@ -456,11 +457,11 @@ e_menu_category_callback_add(char *category, void (*create) (E_Menu *m, void *ca
E_Menu_Category *cat; E_Menu_Category *cat;
E_Menu_Category_Callback *cb = NULL; E_Menu_Category_Callback *cb = NULL;
cat = evas_hash_find(_e_menu_categories, category); cat = eina_hash_find(_e_menu_categories, category);
if (!cat) /* if it isnt found create the new hash */ if (!cat) /* if it isnt found create the new hash */
{ {
cat = calloc(1, sizeof(E_Menu_Category)); cat = calloc(1, sizeof(E_Menu_Category));
_e_menu_categories = evas_hash_add(_e_menu_categories, category, cat); eina_hash_add(_e_menu_categories, category, cat);
} }
if (cat) if (cat)
{ {
@ -484,7 +485,7 @@ e_menu_category_callback_del(E_Menu_Category_Callback *cb)
if (cb) if (cb)
{ {
cat = evas_hash_find(_e_menu_categories, cb->category); cat = eina_hash_find(_e_menu_categories, cb->category);
if (cat) if (cat)
cat->callbacks = eina_list_remove(cat->callbacks, cb); cat->callbacks = eina_list_remove(cat->callbacks, cb);
eina_stringshare_del(cb->category); eina_stringshare_del(cb->category);
@ -1023,7 +1024,7 @@ _e_menu_free(E_Menu *m)
E_Menu_Category *cat; E_Menu_Category *cat;
/* the foreign menu items */ /* the foreign menu items */
cat = evas_hash_find(_e_menu_categories, m->category); cat = eina_hash_find(_e_menu_categories, m->category);
if (cat) if (cat)
{ {
for (l = cat->callbacks; l; l = l->next) for (l = cat->callbacks; l; l = l->next)
@ -2875,7 +2876,7 @@ _e_menu_cb_item_submenu_post_default(void *data, E_Menu *m, E_Menu_Item *mi)
static Evas_Bool static Evas_Bool
_e_menu_categories_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata) _e_menu_categories_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata)
{ {
Eina_List *l; Eina_List *l;
E_Menu_Category *cat; E_Menu_Category *cat;

40
src/bin/e_module.c
View File

@ -72,15 +72,15 @@ EAPI void
e_module_all_load(void) e_module_all_load(void)
{ {
Eina_List *l; Eina_List *l;
E_Config_Module *em;
e_config->modules = eina_list_sort(e_config->modules, e_config->modules = eina_list_sort(e_config->modules,
eina_list_count(e_config->modules), eina_list_count(e_config->modules),
_e_module_sort_priority); _e_module_sort_priority);
for (l = e_config->modules; l; l = l->next) EINA_LIST_FOREACH(e_config->modules, l, em)
{ {
E_Config_Module *em;
E_Module *m; E_Module *m;
em = l->data;
if (!em) continue; if (!em) continue;
if ((em->delayed) && (em->enabled)) if ((em->delayed) && (em->enabled))
{ {
@ -258,6 +258,7 @@ e_module_enable(E_Module *m)
{ {
Eina_List *l; Eina_List *l;
E_Event_Module_Update *ev; E_Event_Module_Update *ev;
E_Config_Module *em;
E_OBJECT_CHECK_RETURN(m, 0); E_OBJECT_CHECK_RETURN(m, 0);
E_OBJECT_TYPE_CHECK_RETURN(m, E_MODULE_TYPE, 0); E_OBJECT_TYPE_CHECK_RETURN(m, E_MODULE_TYPE, 0);
@ -266,11 +267,8 @@ e_module_enable(E_Module *m)
if (m->data) if (m->data)
{ {
m->enabled = 1; m->enabled = 1;
for (l = e_config->modules; l; l = l->next) EINA_LIST_FOREACH(e_config->modules, l, em)
{ {
E_Config_Module *em;
em = l->data;
if (!em) continue; if (!em) continue;
if (!e_util_strcmp(em->name, m->name)) if (!e_util_strcmp(em->name, m->name))
{ {
@ -295,6 +293,7 @@ e_module_disable(E_Module *m)
{ {
E_Event_Module_Update *ev; E_Event_Module_Update *ev;
Eina_List *l; Eina_List *l;
E_Config_Module *em;
int ret; int ret;
E_OBJECT_CHECK_RETURN(m, 0); E_OBJECT_CHECK_RETURN(m, 0);
@ -303,11 +302,8 @@ e_module_disable(E_Module *m)
ret = m->func.shutdown(m); ret = m->func.shutdown(m);
m->data = NULL; m->data = NULL;
m->enabled = 0; m->enabled = 0;
for (l = e_config->modules; l; l = l->next) EINA_LIST_FOREACH(e_config->modules, l, em)
{ {
E_Config_Module *em;
em = l->data;
if (!em) continue; if (!em) continue;
if (!e_util_strcmp(em->name, m->name)) if (!e_util_strcmp(em->name, m->name))
{ {
@ -337,20 +333,18 @@ EAPI int
e_module_save_all(void) e_module_save_all(void)
{ {
Eina_List *l; Eina_List *l;
E_Module *m;
int ret = 1; int ret = 1;
for (l = _e_modules; l; l = l->next) e_object_ref(E_OBJECT(l->data)); EINA_LIST_FOREACH(_e_modules, l, m)
for (l = _e_modules; l; l = l->next) e_object_ref(E_OBJECT(m));
{ EINA_LIST_FOREACH(_e_modules, l, m)
E_Module *m;
m = l->data;
if ((m->enabled) && (!m->error)) if ((m->enabled) && (!m->error))
{ {
if (!m->func.save(m)) ret = 0; if (!m->func.save(m)) ret = 0;
} }
} EINA_LIST_FOREACH(_e_modules, l, m)
for (l = _e_modules; l; l = l->next) e_object_unref(E_OBJECT(l->data)); e_object_unref(E_OBJECT(m));
return ret; return ret;
} }
@ -358,15 +352,11 @@ EAPI E_Module *
e_module_find(const char *name) e_module_find(const char *name)
{ {
Eina_List *l; Eina_List *l;
if (!name) return NULL;
for (l = _e_modules; l; l = l->next)
{
E_Module *m; E_Module *m;
m = l->data; if (!name) return NULL;
EINA_LIST_FOREACH(_e_modules, l, m)
if (!e_util_strcmp(name, m->name)) return m; if (!e_util_strcmp(name, m->name)) return m;
}
return NULL; return NULL;
} }

30
src/bin/e_path.c
View File

@ -6,7 +6,7 @@
/* local subsystem functions */ /* local subsystem functions */
static void _e_path_free(E_Path *ep); static void _e_path_free(E_Path *ep);
static void _e_path_cache_free(E_Path *ep); static void _e_path_cache_free(E_Path *ep);
static Evas_Bool _e_path_cache_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata); static Eina_Bool _e_path_cache_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata);
/* externally accessible functions */ /* externally accessible functions */
EAPI E_Path * EAPI E_Path *
@ -239,6 +239,7 @@ EAPI const char *
e_path_find(E_Path *ep, const char *file) e_path_find(E_Path *ep, const char *file)
{ {
Eina_List *l; Eina_List *l;
E_Path_Dir *epd;
char *str; char *str;
char buf[PATH_MAX] = ""; char buf[PATH_MAX] = "";
@ -246,22 +247,21 @@ e_path_find(E_Path *ep, const char *file)
E_OBJECT_TYPE_CHECK_RETURN(ep, E_PATH_TYPE, NULL); E_OBJECT_TYPE_CHECK_RETURN(ep, E_PATH_TYPE, NULL);
if (!file) return NULL; if (!file) return NULL;
str = evas_hash_find(ep->hash, file); str = eina_hash_find(ep->hash, file);
if (str) return eina_stringshare_add(str); if (str) return eina_stringshare_add(str);
/* Look in the default dir list */ /* Look in the default dir list */
for (l = ep->default_dir_list; l; l = l->next) EINA_LIST_FOREACH(ep->default_dir_list, l, epd)
{ {
E_Path_Dir *epd;
epd = l->data;
if (epd->dir) if (epd->dir)
{ {
snprintf(buf, sizeof(buf), "%s/%s", epd->dir, file); snprintf(buf, sizeof(buf), "%s/%s", epd->dir, file);
if (ecore_file_exists(buf)) if (ecore_file_exists(buf))
{ {
if (evas_hash_size(ep->hash) >= 512) if (eina_hash_population(ep->hash) >= 512)
_e_path_cache_free(ep); _e_path_cache_free(ep);
ep->hash = evas_hash_add(ep->hash, file, if (!ep->hash)
ep->hash = eina_hash_string_superfast_new(NULL);
eina_hash_add(ep->hash, file,
eina_stringshare_add(buf)); eina_stringshare_add(buf));
return eina_stringshare_add(buf); return eina_stringshare_add(buf);
} }
@ -278,9 +278,11 @@ e_path_find(E_Path *ep, const char *file)
snprintf(buf, sizeof(buf), "%s/%s", epd->dir, file); snprintf(buf, sizeof(buf), "%s/%s", epd->dir, file);
if (ecore_file_exists(buf)) if (ecore_file_exists(buf))
{ {
if (evas_hash_size(ep->hash) >= 512) if (eina_hash_population(ep->hash) >= 512)
_e_path_cache_free(ep); _e_path_cache_free(ep);
ep->hash = evas_hash_add(ep->hash, file, if (!ep->hash)
ep->hash = eina_hash_string_superfast_new(NULL);
eina_hash_add(ep->hash, file,
eina_stringshare_add(buf)); eina_stringshare_add(buf));
return eina_stringshare_add(buf); return eina_stringshare_add(buf);
} }
@ -381,13 +383,13 @@ static void
_e_path_cache_free(E_Path *ep) _e_path_cache_free(E_Path *ep)
{ {
if (!ep->hash) return; if (!ep->hash) return;
evas_hash_foreach(ep->hash, _e_path_cache_free_cb, NULL); eina_hash_foreach(ep->hash, _e_path_cache_free_cb, NULL);
evas_hash_free(ep->hash); eina_hash_free(ep->hash);
ep->hash = NULL; ep->hash = NULL;
} }
static Evas_Bool static Eina_Bool
_e_path_cache_free_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) _e_path_cache_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__)
{ {
eina_stringshare_del(data); eina_stringshare_del(data);
return 1; return 1;

2
src/bin/e_path.h
View File

@ -21,7 +21,7 @@ struct _E_Path
{ {
E_Object e_obj_inherit; E_Object e_obj_inherit;
Evas_Hash *hash; Eina_Hash *hash;
Eina_List *default_dir_list; Eina_List *default_dir_list;
/* keep track of the associated e_config path */ /* keep track of the associated e_config path */

4
src/bin/e_remote_main.c
View File

@ -9,9 +9,9 @@ typedef struct _Opt Opt;
struct _Opt struct _Opt
{ {
const char *opt; char *opt;
int num_param; int num_param;
const char *desc; char *desc;
int num_reply; int num_reply;
E_Ipc_Op opcode; E_Ipc_Op opcode;
}; };

12
src/bin/e_shelf.c
View File

@ -29,7 +29,7 @@ static void _e_shelf_menu_pre_cb(void *data, E_Menu *m);
static void _e_shelf_edge_event_register(E_Shelf *es, int reg); static void _e_shelf_edge_event_register(E_Shelf *es, int reg);
static Eina_List *shelves = NULL; static Eina_List *shelves = NULL;
static Evas_Hash *winid_shelves = NULL; static Eina_Hash *winid_shelves = NULL;
/* externally accessible functions */ /* externally accessible functions */
EAPI int EAPI int
@ -177,7 +177,8 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
e_gadcon_shelf_set(es->gadcon, es); e_gadcon_shelf_set(es->gadcon, es);
if (popup) if (popup)
{ {
winid_shelves = evas_hash_add(winid_shelves, e_util_winid_str_get(es->popup->evas_win), es); if (!winid_shelves) winid_shelves = eina_hash_string_superfast_new(NULL);
eina_hash_add(winid_shelves, e_util_winid_str_get(es->popup->evas_win), es);
e_drop_xdnd_register_set(es->popup->evas_win, 1); e_drop_xdnd_register_set(es->popup->evas_win, 1);
e_gadcon_xdnd_window_set(es->gadcon, es->popup->evas_win); e_gadcon_xdnd_window_set(es->gadcon, es->popup->evas_win);
e_gadcon_dnd_window_set(es->gadcon, es->popup->evas_win); e_gadcon_dnd_window_set(es->gadcon, es->popup->evas_win);
@ -733,7 +734,12 @@ _e_shelf_free(E_Shelf *es)
{ {
_e_shelf_edge_event_register(es, 0); _e_shelf_edge_event_register(es, 0);
e_drop_xdnd_register_set(es->popup->evas_win, 0); e_drop_xdnd_register_set(es->popup->evas_win, 0);
winid_shelves = evas_hash_del(winid_shelves, e_util_winid_str_get(es->popup->evas_win), es); eina_hash_del(winid_shelves, e_util_winid_str_get(es->popup->evas_win), es);
if (!eina_hash_population(winid_shelves))
{
eina_hash_free(winid_shelves);
winid_shelves = NULL;
}
e_object_del(E_OBJECT(es->popup)); e_object_del(E_OBJECT(es->popup));
} }
free(es); free(es);

18
src/bin/e_stolen.c
View File

@ -11,7 +11,7 @@ struct _E_Stolen_Window
int refcount; int refcount;
}; };
static Evas_Hash *_e_stolen_windows = NULL; static Eina_Hash *_e_stolen_windows = NULL;
/* externally accessible functions */ /* externally accessible functions */
EAPI int EAPI int
@ -19,7 +19,7 @@ e_stolen_win_get(Ecore_X_Window win)
{ {
E_Stolen_Window *esw; E_Stolen_Window *esw;
esw = evas_hash_find(_e_stolen_windows, e_util_winid_str_get(win)); esw = eina_hash_find(_e_stolen_windows, e_util_winid_str_get(win));
if (esw) return 1; if (esw) return 1;
return 0; return 0;
} }
@ -29,7 +29,7 @@ e_stolen_win_add(Ecore_X_Window win)
{ {
E_Stolen_Window *esw; E_Stolen_Window *esw;
esw = evas_hash_find(_e_stolen_windows, e_util_winid_str_get(win)); esw = eina_hash_find(_e_stolen_windows, e_util_winid_str_get(win));
if (esw) if (esw)
{ {
esw->refcount++; esw->refcount++;
@ -39,7 +39,8 @@ e_stolen_win_add(Ecore_X_Window win)
esw = E_NEW(E_Stolen_Window, 1); esw = E_NEW(E_Stolen_Window, 1);
esw->win = win; esw->win = win;
esw->refcount = 1; esw->refcount = 1;
_e_stolen_windows = evas_hash_add(_e_stolen_windows, e_util_winid_str_get(win), esw); if (!_e_stolen_windows) _e_stolen_windows = eina_hash_string_superfast_new(NULL);
eina_hash_add(_e_stolen_windows, e_util_winid_str_get(win), esw);
} }
return; return;
} }
@ -49,13 +50,18 @@ e_stolen_win_del(Ecore_X_Window win)
{ {
E_Stolen_Window *esw; E_Stolen_Window *esw;
esw = evas_hash_find(_e_stolen_windows, e_util_winid_str_get(win)); esw = eina_hash_find(_e_stolen_windows, e_util_winid_str_get(win));
if (esw) if (esw)
{ {
esw->refcount--; esw->refcount--;
if (esw->refcount == 0) if (esw->refcount == 0)
{ {
_e_stolen_windows = evas_hash_del(_e_stolen_windows, e_util_winid_str_get(win), esw); eina_hash_del(_e_stolen_windows, e_util_winid_str_get(win), esw);
if (!eina_hash_population(_e_stolen_windows))
{
eina_hash_free(_e_stolen_windows);
_e_stolen_windows = NULL;
}
free(esw); free(esw);
} }
} }

11
src/bin/e_sys_main.c
View File

@ -23,7 +23,7 @@ static int auth_etc_enlightenment_sysactions(char *a, char *u, char **g);
static char *get_word(char *s, char *d); static char *get_word(char *s, char *d);
/* local subsystem globals */ /* local subsystem globals */
static Eina_Hash *actions; static Eina_Hash *actions = NULL;
/* externally accessible functions */ /* externally accessible functions */
int int
@ -79,7 +79,6 @@ main(int argc, char **argv)
} }
eina_init(); eina_init();
actions = eina_hash_string_superfast_new(NULL);
if (!auth_action_ok(action, uid, gid, gl, gn, egid)) if (!auth_action_ok(action, uid, gid, gl, gn, egid))
{ {
@ -96,7 +95,6 @@ main(int argc, char **argv)
} }
if (!test) return system(cmd); if (!test) return system(cmd);
eina_hash_free(actions);
eina_shutdown(); eina_shutdown();
return 0; return 0;
@ -220,11 +218,8 @@ auth_etc_enlightenment_sysactions(char *a, char *u, char **g)
{ {
while ((*pp) && (isspace(*pp))) pp++; while ((*pp) && (isspace(*pp))) pp++;
s = eina_hash_find(actions, ugname); s = eina_hash_find(actions, ugname);
if (s) if (s) eina_hash_del(actions, ugname, s);
{ if (!actions) actions = eina_hash_string_superfast_new(free);
eina_hash_del(actions, ugname, s);
free(s);
}
eina_hash_add(actions, ugname, strdup(pp)); eina_hash_add(actions, ugname, strdup(pp));
continue; continue;
} }

60
src/bin/e_theme.c
View File

@ -10,19 +10,19 @@ struct _E_Theme_Result
{ {
const char *file; const char *file;
const char *cache; const char *cache;
Evas_Hash *quickfind; Eina_Hash *quickfind;
}; };
static Evas_Bool _e_theme_mappings_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata); static Eina_Bool _e_theme_mappings_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata);
static Evas_Bool _e_theme_mappings_quickfind_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata); static Eina_Bool _e_theme_mappings_quickfind_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata);
static void _e_theme_category_register(const char *category); static void _e_theme_category_register(const char *category);
static Eina_List *_e_theme_collection_item_register(Eina_List *list, const char *name); static Eina_List *_e_theme_collection_item_register(Eina_List *list, const char *name);
static Eina_List *_e_theme_collection_items_find(const char *base, const char *collname); static Eina_List *_e_theme_collection_items_find(const char *base, const char *collname);
/* local subsystem globals */ /* local subsystem globals */
static Evas_Hash *mappings = NULL; static Eina_Hash *mappings = NULL;
static Evas_Hash *group_cache = NULL; static Eina_Hash *group_cache = NULL;
static Eina_List *categories = NULL; static Eina_List *categories = NULL;
static Eina_List *transitions = NULL; static Eina_List *transitions = NULL;
@ -62,6 +62,9 @@ e_theme_init(void)
transitions = _e_theme_collection_items_find("base/theme/transitions", "e/transitions"); transitions = _e_theme_collection_items_find("base/theme/transitions", "e/transitions");
borders = _e_theme_collection_items_find("base/theme/borders", "e/widgets/border"); borders = _e_theme_collection_items_find("base/theme/borders", "e/widgets/border");
shelfs = _e_theme_collection_items_find("base/theme/shelf", "e/shelf"); shelfs = _e_theme_collection_items_find("base/theme/shelf", "e/shelf");
if (!mappings)
mappings = eina_hash_string_superfast_new(NULL);
group_cache = eina_hash_string_superfast_new(NULL);
return 1; return 1;
} }
@ -76,13 +79,13 @@ e_theme_shutdown(void)
} }
if (mappings) if (mappings)
{ {
evas_hash_foreach(mappings, _e_theme_mappings_free_cb, NULL); eina_hash_foreach(mappings, _e_theme_mappings_free_cb, NULL);
evas_hash_free(mappings); eina_hash_free(mappings);
mappings = NULL; mappings = NULL;
} }
if (group_cache) if (group_cache)
{ {
evas_hash_free(group_cache); eina_hash_free(group_cache);
group_cache = NULL; group_cache = NULL;
} }
while (categories) while (categories)
@ -117,7 +120,7 @@ e_theme_edje_object_set(Evas_Object *o, const char *category, const char *group)
/* find category -> edje mapping */ /* find category -> edje mapping */
_e_theme_category_register(category); _e_theme_category_register(category);
res = evas_hash_find(mappings, category); res = eina_hash_find(mappings, category);
if (res) if (res)
{ {
const char *str; const char *str;
@ -140,15 +143,15 @@ e_theme_edje_object_set(Evas_Object *o, const char *category, const char *group)
int ok; int ok;
snprintf(buf, sizeof(buf), "%s/::/%s", str, group); snprintf(buf, sizeof(buf), "%s/::/%s", str, group);
tres = evas_hash_find(group_cache, buf); tres = eina_hash_find(group_cache, buf);
if (!tres) if (!tres)
{ {
ok = edje_object_file_set(o, str, group); ok = edje_object_file_set(o, str, group);
/* save in the group cache hash */ /* save in the group cache hash */
if (ok) if (ok)
group_cache = evas_hash_add(group_cache, buf, res); eina_hash_add(group_cache, buf, res);
else else
group_cache = evas_hash_add(group_cache, buf, (void *)1); eina_hash_add(group_cache, buf, (void *)1);
} }
else if (tres == (void *)1) else if (tres == (void *)1)
ok = 0; ok = 0;
@ -183,7 +186,7 @@ e_theme_edje_file_get(const char *category, const char *group)
/* find category -> edje mapping */ /* find category -> edje mapping */
_e_theme_category_register(category); _e_theme_category_register(category);
res = evas_hash_find(mappings, category); res = eina_hash_find(mappings, category);
if (res) if (res)
{ {
const char *str; const char *str;
@ -207,30 +210,31 @@ e_theme_edje_file_get(const char *category, const char *group)
int ok; int ok;
snprintf(buf, sizeof(buf), "%s/::/%s", str, group); snprintf(buf, sizeof(buf), "%s/::/%s", str, group);
tres = evas_hash_find(group_cache, buf); tres = eina_hash_find(group_cache, buf);
if (!tres) if (!tres)
{ {
/* if the group exists - return */ /* if the group exists - return */
if (!res->quickfind) if (!res->quickfind)
{ {
res->quickfind = eina_hash_string_superfast_new(NULL);
/* great a quick find hash of all group entires */ /* great a quick find hash of all group entires */
coll = edje_file_collection_list(str); coll = edje_file_collection_list(str);
for (l = coll; l; l = l->next) for (l = coll; l; l = l->next)
{ {
q = eina_stringshare_add(l->data); q = eina_stringshare_add(l->data);
res->quickfind = evas_hash_direct_add(res->quickfind, q, q); eina_hash_direct_add(res->quickfind, q, q);
} }
if (coll) edje_file_collection_list_free(coll); if (coll) edje_file_collection_list_free(coll);
} }
/* save in the group cache hash */ /* save in the group cache hash */
if (evas_hash_find(res->quickfind, group)) if (eina_hash_find(res->quickfind, group))
{ {
group_cache = evas_hash_add(group_cache, buf, res); eina_hash_add(group_cache, buf, res);
ok = 1; ok = 1;
} }
else else
{ {
group_cache = evas_hash_add(group_cache, buf, (void *)1); eina_hash_add(group_cache, buf, (void *)1);
ok = 0; ok = 0;
} }
} }
@ -293,14 +297,14 @@ e_theme_file_set(const char *category, const char *file)
if (group_cache) if (group_cache)
{ {
evas_hash_free(group_cache); eina_hash_free(group_cache);
group_cache = NULL; group_cache = NULL;
} }
_e_theme_category_register(category); _e_theme_category_register(category);
res = evas_hash_find(mappings, category); res = eina_hash_find(mappings, category);
if (res) if (res)
{ {
mappings = evas_hash_del(mappings, category, res); eina_hash_del(mappings, category, res);
if (res->file) if (res->file)
{ {
e_filereg_deregister(res->file); e_filereg_deregister(res->file);
@ -312,7 +316,9 @@ e_theme_file_set(const char *category, const char *file)
res = calloc(1, sizeof(E_Theme_Result)); res = calloc(1, sizeof(E_Theme_Result));
res->file = eina_stringshare_add(file); res->file = eina_stringshare_add(file);
e_filereg_register(res->file); e_filereg_register(res->file);
mappings = evas_hash_add(mappings, category, res); if (!mappings)
mappings = eina_hash_string_superfast_new(NULL);
eina_hash_add(mappings, category, res);
} }
EAPI int EAPI int
@ -493,7 +499,7 @@ e_theme_handler_test(Evas_Object *obj, const char *path, void *data)
/* local subsystem functions */ /* local subsystem functions */
static Evas_Bool static Evas_Bool
_e_theme_mappings_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata) _e_theme_mappings_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata)
{ {
E_Theme_Result *res; E_Theme_Result *res;
@ -502,15 +508,15 @@ _e_theme_mappings_free_cb(const Evas_Hash *hash, const void *key, void *data, vo
if (res->cache) eina_stringshare_del(res->cache); if (res->cache) eina_stringshare_del(res->cache);
if (res->quickfind) if (res->quickfind)
{ {
evas_hash_foreach(res->quickfind, _e_theme_mappings_quickfind_free_cb, NULL); eina_hash_foreach(res->quickfind, _e_theme_mappings_quickfind_free_cb, NULL);
evas_hash_free(res->quickfind); eina_hash_free(res->quickfind);
} }
free(res); free(res);
return 1; return 1;
} }
static Evas_Bool static Evas_Bool
_e_theme_mappings_quickfind_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata) _e_theme_mappings_quickfind_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata)
{ {
eina_stringshare_del(key); eina_stringshare_del(key);
return 1; return 1;
@ -555,7 +561,7 @@ _e_theme_collection_items_find(const char *base, const char *collname)
strcpy(category, base); strcpy(category, base);
do do
{ {
res = evas_hash_find(mappings, category); res = eina_hash_find(mappings, category);
if (res) if (res)
{ {
const char *str; const char *str;

11
src/bin/e_thumb.c
View File

@ -33,7 +33,7 @@ static Eina_List *_thumbnailers = NULL;
static Eina_List *_thumbnailers_exe = NULL; static Eina_List *_thumbnailers_exe = NULL;
static Eina_List *_thumb_queue = NULL; static Eina_List *_thumb_queue = NULL;
static int _objid = 0; static int _objid = 0;
static Evas_Hash *_thumbs = NULL; static Eina_Hash *_thumbs = NULL;
static int _pending = 0; static int _pending = 0;
static int _num_thumbnailers = 1; static int _num_thumbnailers = 1;
static Ecore_Event_Handler *_exe_del_handler = NULL; static Ecore_Event_Handler *_exe_del_handler = NULL;
@ -46,6 +46,7 @@ e_thumb_init(void)
_exe_del_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _exe_del_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
_e_thumb_cb_exe_event_del, _e_thumb_cb_exe_event_del,
NULL); NULL);
_thumbs = eina_hash_string_superfast_new(NULL);
return 1; return 1;
} }
@ -64,7 +65,7 @@ e_thumb_shutdown(void)
} }
_thumb_queue = eina_list_free(_thumb_queue); _thumb_queue = eina_list_free(_thumb_queue);
_objid = 0; _objid = 0;
evas_hash_free(_thumbs); eina_hash_free(_thumbs);
_thumbs = NULL; _thumbs = NULL;
_pending = 0; _pending = 0;
return 1; return 1;
@ -316,7 +317,7 @@ _e_thumb_hash_add(int objid, Evas_Object *obj)
char buf[32]; char buf[32];
snprintf(buf, sizeof(buf), "%i", objid); snprintf(buf, sizeof(buf), "%i", objid);
_thumbs = evas_hash_add(_thumbs, buf, obj); eina_hash_add(_thumbs, buf, obj);
} }
static void static void
@ -325,7 +326,7 @@ _e_thumb_hash_del(int objid)
char buf[32]; char buf[32];
snprintf(buf, sizeof(buf), "%i", objid); snprintf(buf, sizeof(buf), "%i", objid);
_thumbs = evas_hash_del(_thumbs, buf, NULL); eina_hash_del(_thumbs, buf, NULL);
if ((!_thumbs) && (!_thumbnailers)) _objid = 0; if ((!_thumbs) && (!_thumbnailers)) _objid = 0;
} }
@ -335,7 +336,7 @@ _e_thumb_hash_find(int objid)
char buf[32]; char buf[32];
snprintf(buf, sizeof(buf), "%i", objid); snprintf(buf, sizeof(buf), "%i", objid);
return evas_hash_find(_thumbs, buf); return eina_hash_find(_thumbs, buf);
} }
static void static void

6
src/modules/conf_fonts/e_int_config_fonts.c
View File

@ -31,7 +31,7 @@ static void _size_list_load(E_Config_Dialog_Data *cfdata, Eina_List *size_list,
static void _class_list_load(E_Config_Dialog_Data *cfdata); static void _class_list_load(E_Config_Dialog_Data *cfdata);
static void _font_preview_update(E_Config_Dialog_Data *cfdata); static void _font_preview_update(E_Config_Dialog_Data *cfdata);
static Evas_Bool _font_hash_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata); static Eina_Bool _font_hash_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata);
struct _E_Font_Size_Data struct _E_Font_Size_Data
{ {
@ -116,7 +116,7 @@ struct _E_Config_Dialog_Data
Eina_List *text_classes; Eina_List *text_classes;
/* Font Data */ /* Font Data */
Evas_Hash *font_hash; Eina_Hash *font_hash;
Eina_List *font_list; Eina_List *font_list;
Eina_List *font_px_list; Eina_List *font_px_list;
Eina_List *font_scale_list; Eina_List *font_scale_list;
@ -920,7 +920,7 @@ _adv_font_cb_change(void *data, Evas_Object *obj)
E_Font_Properties *efp; E_Font_Properties *efp;
Eina_List *next; Eina_List *next;
efp = evas_hash_find(cfdata->font_hash, cfdata->cur_font); efp = eina_hash_find(cfdata->font_hash, cfdata->cur_font);
evas_event_freeze(evas_object_evas_get(cfdata->gui.style_list)); evas_event_freeze(evas_object_evas_get(cfdata->gui.style_list));
edje_freeze(); edje_freeze();
e_widget_ilist_freeze(cfdata->gui.style_list); e_widget_ilist_freeze(cfdata->gui.style_list);

52
src/modules/conf_imc/e_int_config_imc.c
View File

@ -36,8 +36,8 @@ static void _e_imc_change_enqueue (E_Config_Dialog_Data *cfdata);
static void _e_imc_entry_change_cb (void *data, Evas_Object *obj); static void _e_imc_entry_change_cb (void *data, Evas_Object *obj);
static void _e_imc_form_fill (E_Config_Dialog_Data *cfdata); static void _e_imc_form_fill (E_Config_Dialog_Data *cfdata);
static const char* _e_imc_file_name_new_get (void); static const char* _e_imc_file_name_new_get (void);
static Evas_Bool _change_hash_free_cb (const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__); static Eina_Bool _change_hash_free_cb (const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__);
static Evas_Bool _change_hash_apply_cb (const Evas_Hash *hash __UNUSED__, const void *key, void *data, void *fdata __UNUSED__); static Eina_Bool _change_hash_apply_cb (const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata __UNUSED__);
struct _E_Config_Dialog_Data struct _E_Config_Dialog_Data
{ {
@ -51,7 +51,7 @@ struct _E_Config_Dialog_Data
Evas_Object *o_frame; /* scrollpane for file manager*/ Evas_Object *o_frame; /* scrollpane for file manager*/
char *imc_current; char *imc_current;
Evas_Hash *imc_basic_map; Eina_Hash *imc_basic_map;
int imc_disable; /* 0=enable, 1=disable */ int imc_disable; /* 0=enable, 1=disable */
int fmdir; /* 0=Local, 1=System*/ int fmdir; /* 0=Local, 1=System*/
@ -67,7 +67,7 @@ struct _E_Config_Dialog_Data
char *xmodifiers; char *xmodifiers;
} imc; } imc;
Evas_Hash *imc_change_map; Eina_Hash *imc_change_map;
struct struct
{ {
@ -142,8 +142,8 @@ _create_data(E_Config_Dialog *cfd)
return cfdata; return cfdata;
} }
static Evas_Bool static Eina_Bool
_change_hash_free_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) _change_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__)
{ {
E_Input_Method_Config *imc; E_Input_Method_Config *imc;
@ -161,14 +161,14 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
if (cfdata->imc_basic_map) if (cfdata->imc_basic_map)
{ {
evas_hash_foreach(cfdata->imc_basic_map, _change_hash_free_cb, NULL); eina_hash_foreach(cfdata->imc_basic_map, _change_hash_free_cb, NULL);
evas_hash_free(cfdata->imc_basic_map); eina_hash_free(cfdata->imc_basic_map);
} }
if (cfdata->imc_change_map) if (cfdata->imc_change_map)
{ {
evas_hash_foreach(cfdata->imc_change_map, _change_hash_free_cb, NULL); eina_hash_foreach(cfdata->imc_change_map, _change_hash_free_cb, NULL);
evas_hash_free(cfdata->imc_change_map); eina_hash_free(cfdata->imc_change_map);
} }
cfdata->imc_change_map = NULL; cfdata->imc_change_map = NULL;
@ -245,7 +245,7 @@ _e_imc_list_change_cb(void *data, Evas_Object *obj)
if (cfdata->imc_current) if (cfdata->imc_current)
{ {
imc = evas_hash_find(cfdata->imc_basic_map, cfdata->imc_current); imc = eina_hash_find(cfdata->imc_basic_map, cfdata->imc_current);
_e_imc_setup_button_toggle(cfdata->gui.imc_basic_setup, imc); _e_imc_setup_button_toggle(cfdata->gui.imc_basic_setup, imc);
} }
} }
@ -260,7 +260,7 @@ _e_imc_setup_cb(void *data, void *data2)
{ {
E_Input_Method_Config *imc; E_Input_Method_Config *imc;
imc = evas_hash_find(cfdata->imc_basic_map, cfdata->imc_current); imc = eina_hash_find(cfdata->imc_basic_map, cfdata->imc_current);
if ((imc) && (imc->e_im_setup_exec)) if ((imc) && (imc->e_im_setup_exec))
{ {
@ -324,8 +324,8 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
if (cfdata->imc_basic_map) if (cfdata->imc_basic_map)
{ {
evas_hash_foreach(cfdata->imc_basic_map, _change_hash_free_cb, NULL); eina_hash_foreach(cfdata->imc_basic_map, _change_hash_free_cb, NULL);
evas_hash_free(cfdata->imc_basic_map); eina_hash_free(cfdata->imc_basic_map);
cfdata->imc_basic_map = NULL; cfdata->imc_basic_map = NULL;
} }
@ -361,14 +361,16 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_ilist_selected_set(cfdata->gui.imc_basic_list, i); e_widget_ilist_selected_set(cfdata->gui.imc_basic_list, i);
i++; i++;
cfdata->imc_basic_map = evas_hash_add(cfdata->imc_basic_map, imc_path, imc); if (!cfdata->imc_basic_map)
cfdata->imc_basic_map = eina_hash_string_superfast_new(NULL);
eina_hash_add(cfdata->imc_basic_map, imc_path, imc);
} }
} }
free(imc_path); free(imc_path);
imc_basic_list = eina_list_remove_list(imc_basic_list, imc_basic_list); imc_basic_list = eina_list_remove_list(imc_basic_list, imc_basic_list);
} }
_e_imc_setup_button_toggle(cfdata->gui.imc_basic_setup, evas_hash_find(cfdata->imc_basic_map, cfdata->imc_current)); _e_imc_setup_button_toggle(cfdata->gui.imc_basic_setup, eina_hash_find(cfdata->imc_basic_map, cfdata->imc_current));
e_widget_ilist_go(ob); e_widget_ilist_go(ob);
e_widget_ilist_thaw(ob); e_widget_ilist_thaw(ob);
@ -384,8 +386,8 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
/*** End Basic Dialog Logic ***/ /*** End Basic Dialog Logic ***/
/*** Start Advanced Dialog Logic ***/ /*** Start Advanced Dialog Logic ***/
static Evas_Bool static Eina_Bool
_change_hash_apply_cb(const Evas_Hash *hash __UNUSED__, const void *key, void *data, void *fdata __UNUSED__) _change_hash_apply_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata __UNUSED__)
{ {
E_Input_Method_Config *imc; E_Input_Method_Config *imc;
Eet_File *ef; Eet_File *ef;
@ -419,8 +421,8 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
if (cfdata->imc_change_map) if (cfdata->imc_change_map)
{ {
evas_hash_foreach(cfdata->imc_change_map, _change_hash_apply_cb, NULL); eina_hash_foreach(cfdata->imc_change_map, _change_hash_apply_cb, NULL);
evas_hash_free(cfdata->imc_change_map); eina_hash_free(cfdata->imc_change_map);
} }
cfdata->imc_change_map = NULL; cfdata->imc_change_map = NULL;
return 1; return 1;
@ -673,7 +675,7 @@ _e_imc_form_fill(E_Config_Dialog_Data *cfdata)
} }
imc_free = 0; imc_free = 0;
imc = evas_hash_find(cfdata->imc_change_map, cfdata->imc_current); imc = eina_hash_find(cfdata->imc_change_map, cfdata->imc_current);
if (!imc) if (!imc)
{ {
@ -731,14 +733,16 @@ _e_imc_change_enqueue(E_Config_Dialog_Data *cfdata)
imc_update->xmodifiers = eina_stringshare_add(cfdata->imc.xmodifiers); imc_update->xmodifiers = eina_stringshare_add(cfdata->imc.xmodifiers);
/* look for changes to this file and remove them */ /* look for changes to this file and remove them */
imc_update_old = evas_hash_find(cfdata->imc_change_map, cfdata->imc_current); imc_update_old = eina_hash_find(cfdata->imc_change_map, cfdata->imc_current);
if (imc_update_old) if (imc_update_old)
{ {
cfdata->imc_change_map = evas_hash_del(cfdata->imc_change_map, cfdata->imc_current, NULL); eina_hash_del(cfdata->imc_change_map, cfdata->imc_current, NULL);
e_intl_input_method_config_free(imc_update_old); e_intl_input_method_config_free(imc_update_old);
} }
cfdata->imc_change_map = evas_hash_add(cfdata->imc_change_map, cfdata->imc_current, imc_update); if (!cfdata->imc_change_map)
cfdata->imc_change_map = eina_hash_string_superfast_new(NULL);
eina_hash_add(cfdata->imc_change_map, cfdata->imc_current, imc_update);
} }
} }

56
src/modules/conf_intl/e_int_config_intl.c
View File

@ -28,10 +28,10 @@ static int _basic_lang_list_sort (const void *data1, const void *data
/* Fill the clear lists, fill with language, select */ /* Fill the clear lists, fill with language, select */
/* Update lanague */ /* Update lanague */
static void _cfdata_language_go (const char *lang, const char *region, const char *codeset, const char *modifier, E_Config_Dialog_Data *cfdata); static void _cfdata_language_go (const char *lang, const char *region, const char *codeset, const char *modifier, E_Config_Dialog_Data *cfdata);
static Evas_Bool _lang_hash_cb (const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata); static Eina_Bool _lang_hash_cb (const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata);
static Evas_Bool _region_hash_cb (const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata); static Eina_Bool _region_hash_cb (const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata);
static Evas_Bool _language_hash_free_cb (const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__); static Eina_Bool _language_hash_free_cb (const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__);
static Evas_Bool _region_hash_free_cb (const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__); static Eina_Bool _region_hash_free_cb (const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__);
static void _intl_current_locale_setup (E_Config_Dialog_Data *cfdata); static void _intl_current_locale_setup (E_Config_Dialog_Data *cfdata);
static const char *_intl_charset_upper_get (const char *charset); static const char *_intl_charset_upper_get (const char *charset);
@ -53,7 +53,7 @@ struct _E_Intl_Langauge_Node
const char *lang_code; /* en */ const char *lang_code; /* en */
const char *lang_name; /* English (trans in ilist) */ const char *lang_name; /* English (trans in ilist) */
int lang_available; /* defined in e translation */ int lang_available; /* defined in e translation */
Evas_Hash *region_hash; /* US->utf8 */ Eina_Hash *region_hash; /* US->utf8 */
}; };
struct _E_Intl_Region_Node struct _E_Intl_Region_Node
@ -81,7 +81,7 @@ struct _E_Config_Dialog_Data
int lang_dirty; int lang_dirty;
Evas_Hash *locale_hash; Eina_Hash *locale_hash;
Eina_List *lang_list; Eina_List *lang_list;
Eina_List *region_list; Eina_List *region_list;
Eina_List *blang_list; Eina_List *blang_list;
@ -648,7 +648,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
/* Add the language to the new locale properties to the hash */ /* Add the language to the new locale properties to the hash */
/* First check if the LANGUAGE exists in there already */ /* First check if the LANGUAGE exists in there already */
lang_node = evas_hash_find(cfdata->locale_hash, locale_parts->lang); lang_node = eina_hash_find(cfdata->locale_hash, locale_parts->lang);
if (lang_node == NULL) if (lang_node == NULL)
{ {
Eina_List *next; Eina_List *next;
@ -686,7 +686,9 @@ _fill_data(E_Config_Dialog_Data *cfdata)
i++; i++;
} }
cfdata->locale_hash = evas_hash_add(cfdata->locale_hash, locale_parts->lang, lang_node); if (!cfdata->locale_hash)
cfdata->locale_hash = eina_hash_string_superfast_new(NULL);
eina_hash_add(cfdata->locale_hash, locale_parts->lang, lang_node);
} }
/* We now have the current language hash node, lets see if there is /* We now have the current language hash node, lets see if there is
@ -695,7 +697,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
if (locale_parts->region) if (locale_parts->region)
{ {
region_node = evas_hash_find(lang_node->region_hash, locale_parts->region); region_node = eina_hash_find(lang_node->region_hash, locale_parts->region);
if (region_node == NULL) if (region_node == NULL)
{ {
@ -717,7 +719,9 @@ _fill_data(E_Config_Dialog_Data *cfdata)
} }
i++; i++;
} }
lang_node->region_hash = evas_hash_add(lang_node->region_hash, locale_parts->region, region_node); if (!lang_node->region_hash)
lang_node->region_hash = eina_hash_string_superfast_new(NULL);
eina_hash_add(lang_node->region_hash, locale_parts->region, region_node);
} }
/* We now have the current region hash node */ /* We now have the current region hash node */
@ -799,8 +803,8 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
E_FREE(cfdata->cur_cs); E_FREE(cfdata->cur_cs);
E_FREE(cfdata->cur_mod); E_FREE(cfdata->cur_mod);
evas_hash_foreach(cfdata->locale_hash, _language_hash_free_cb, NULL); eina_hash_foreach(cfdata->locale_hash, _language_hash_free_cb, NULL);
evas_hash_free(cfdata->locale_hash); eina_hash_free(cfdata->locale_hash);
cfdata->lang_list = eina_list_free(cfdata->lang_list); cfdata->lang_list = eina_list_free(cfdata->lang_list);
cfdata->region_list = eina_list_free(cfdata->region_list); cfdata->region_list = eina_list_free(cfdata->region_list);
@ -809,22 +813,22 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
E_FREE(cfdata); E_FREE(cfdata);
} }
static Evas_Bool static Eina_Bool
_language_hash_free_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) _language_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__)
{ {
E_Intl_Language_Node *node; E_Intl_Language_Node *node;
node = data; node = data;
if (node->lang_code) eina_stringshare_del(node->lang_code); if (node->lang_code) eina_stringshare_del(node->lang_code);
evas_hash_foreach(node->region_hash, _region_hash_free_cb, NULL); eina_hash_foreach(node->region_hash, _region_hash_free_cb, NULL);
evas_hash_free(node->region_hash); eina_hash_free(node->region_hash);
free(node); free(node);
return 1; return 1;
} }
static Evas_Bool static Eina_Bool
_region_hash_free_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) _region_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__)
{ {
E_Intl_Region_Node *node; E_Intl_Region_Node *node;
@ -977,7 +981,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
/* If lang_list already loaded just use it */ /* If lang_list already loaded just use it */
if (cfdata->lang_list == NULL) if (cfdata->lang_list == NULL)
evas_hash_foreach(cfdata->locale_hash, _lang_hash_cb, cfdata); eina_hash_foreach(cfdata->locale_hash, _lang_hash_cb, cfdata);
if (cfdata->lang_list) if (cfdata->lang_list)
{ {
@ -1166,7 +1170,7 @@ _cfdata_language_go(const char *lang, const char *region, const char *codeset, c
if (lang) if (lang)
{ {
lang_node = evas_hash_find(cfdata->locale_hash, lang); lang_node = eina_hash_find(cfdata->locale_hash, lang);
if (lang_node) if (lang_node)
{ {
@ -1174,7 +1178,7 @@ _cfdata_language_go(const char *lang, const char *region, const char *codeset, c
{ {
e_widget_ilist_clear(cfdata->gui.reg_list); e_widget_ilist_clear(cfdata->gui.reg_list);
cfdata->region_list = eina_list_free(cfdata->region_list); cfdata->region_list = eina_list_free(cfdata->region_list);
evas_hash_foreach(lang_node->region_hash, eina_hash_foreach(lang_node->region_hash,
_region_hash_cb, cfdata); _region_hash_cb, cfdata);
cfdata->region_list = cfdata->region_list =
eina_list_sort(cfdata->region_list, eina_list_sort(cfdata->region_list,
@ -1187,7 +1191,7 @@ _cfdata_language_go(const char *lang, const char *region, const char *codeset, c
{ {
E_Intl_Region_Node *reg_node; E_Intl_Region_Node *reg_node;
reg_node = evas_hash_find(lang_node->region_hash, region); reg_node = eina_hash_find(lang_node->region_hash, region);
if (reg_node) if (reg_node)
{ {
Eina_List *next; Eina_List *next;
@ -1237,8 +1241,8 @@ _cfdata_language_go(const char *lang, const char *region, const char *codeset, c
e_widget_ilist_go(cfdata->gui.reg_list); e_widget_ilist_go(cfdata->gui.reg_list);
} }
static Evas_Bool static Eina_Bool
_lang_hash_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata) _lang_hash_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
E_Intl_Language_Node *lang_node; E_Intl_Language_Node *lang_node;
@ -1250,8 +1254,8 @@ _lang_hash_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void
return 1; return 1;
} }
static Evas_Bool static Eina_Bool
_region_hash_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata) _region_hash_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
E_Intl_Region_Node *reg_node; E_Intl_Region_Node *reg_node;

46
src/modules/exebuf/e_exebuf.c
View File

@ -419,8 +419,14 @@ _e_exebuf_update(void)
if (!cmd_buf[0]) return; if (!cmd_buf[0]) return;
desktop = efreet_util_desktop_exec_find(cmd_buf); desktop = efreet_util_desktop_exec_find(cmd_buf);
fprintf(stderr, "0 %p\n", desktop);
if (desktop) fprintf(stderr, "[%s]\n", desktop->icon);
if (!desktop) desktop = efreet_util_desktop_name_find(cmd_buf); if (!desktop) desktop = efreet_util_desktop_name_find(cmd_buf);
fprintf(stderr, "1 %p\n", desktop);
if (desktop) fprintf(stderr, "[%s]\n", desktop->icon);
if (!desktop) desktop = efreet_util_desktop_generic_name_find(cmd_buf); if (!desktop) desktop = efreet_util_desktop_generic_name_find(cmd_buf);
fprintf(stderr, "2 %p\n", desktop);
if (desktop) fprintf(stderr, "[%s]\n", desktop->icon);
if (desktop) if (desktop)
{ {
o = e_util_desktop_icon_add(desktop, 24, exebuf->evas); o = e_util_desktop_icon_add(desktop, 24, exebuf->evas);
@ -450,7 +456,7 @@ static void
_e_exebuf_exec_term(void) _e_exebuf_exec_term(void)
{ {
char tmp[EXEBUFLEN]; char tmp[EXEBUFLEN];
const char *active_cmd; const char *active_cmd = NULL;
if (exe_sel) if (exe_sel)
{ {
@ -462,7 +468,7 @@ _e_exebuf_exec_term(void)
else else
active_cmd = cmd_buf; active_cmd = cmd_buf;
if (active_cmd[0]) if (active_cmd && active_cmd[0])
{ {
/* Copy the terminal command to the start of the string... /* Copy the terminal command to the start of the string...
* making sure it has a null terminator if greater than EXEBUFLEN */ * making sure it has a null terminator if greater than EXEBUFLEN */
@ -978,7 +984,7 @@ static void
_e_exebuf_matches_update(void) _e_exebuf_matches_update(void)
{ {
char *path, *file, buf[4096]; char *path, *file, buf[4096];
Evas_Hash *added = NULL; Eina_Hash *added = NULL;
Ecore_List *list; Ecore_List *list;
Eina_List *l; Eina_List *l;
int i, max; int i, max;
@ -1000,10 +1006,12 @@ _e_exebuf_matches_update(void)
exe = ecore_file_app_exe_get(desktop->exec); exe = ecore_file_app_exe_get(desktop->exec);
if (exe) if (exe)
{ {
if (!evas_hash_find(added, exe)) if (!eina_hash_find(added, exe))
{ {
eap_matches = eina_list_append(eap_matches, desktop); eap_matches = eina_list_append(eap_matches, desktop);
added = evas_hash_add(added, exe, desktop); if (!added)
added = eina_hash_string_superfast_new(NULL);
eina_hash_add(added, exe, desktop);
} }
free(exe); free(exe);
} }
@ -1025,10 +1033,12 @@ _e_exebuf_matches_update(void)
exe = ecore_file_app_exe_get(desktop->exec); exe = ecore_file_app_exe_get(desktop->exec);
if (exe) if (exe)
{ {
if (!evas_hash_find(added, exe)) if (!eina_hash_find(added, exe))
{ {
eap_matches = eina_list_append(eap_matches, desktop); eap_matches = eina_list_append(eap_matches, desktop);
added = evas_hash_add(added, exe, desktop); if (!added)
added = eina_hash_string_superfast_new(NULL);
eina_hash_add(added, exe, desktop);
} }
free(exe); free(exe);
} }
@ -1050,10 +1060,12 @@ _e_exebuf_matches_update(void)
exe = ecore_file_app_exe_get(desktop->exec); exe = ecore_file_app_exe_get(desktop->exec);
if (exe) if (exe)
{ {
if (!evas_hash_find(added, exe)) if (!eina_hash_find(added, exe))
{ {
eap_matches = eina_list_append(eap_matches, desktop); eap_matches = eina_list_append(eap_matches, desktop);
added = evas_hash_add(added, exe, desktop); if (!added)
added = eina_hash_string_superfast_new(NULL);
eina_hash_add(added, exe, desktop);
} }
free(exe); free(exe);
} }
@ -1075,10 +1087,12 @@ _e_exebuf_matches_update(void)
exe = ecore_file_app_exe_get(desktop->exec); exe = ecore_file_app_exe_get(desktop->exec);
if (exe) if (exe)
{ {
if (!evas_hash_find(added, exe)) if (!eina_hash_find(added, exe))
{ {
eap_matches = eina_list_append(eap_matches, desktop); eap_matches = eina_list_append(eap_matches, desktop);
added = evas_hash_add(added, exe, desktop); if (!added)
added = eina_hash_string_superfast_new(NULL);
eina_hash_add(added, exe, desktop);
} }
free(exe); free(exe);
} }
@ -1086,7 +1100,7 @@ _e_exebuf_matches_update(void)
ecore_list_destroy(list); ecore_list_destroy(list);
} }
if (added) evas_hash_free(added); if (added) eina_hash_free(added);
added = NULL; added = NULL;
snprintf(buf, sizeof(buf), "%s*", cmd_buf); snprintf(buf, sizeof(buf), "%s*", cmd_buf);
@ -1102,16 +1116,18 @@ _e_exebuf_matches_update(void)
{ {
if (e_util_glob_match(file, buf)) if (e_util_glob_match(file, buf))
{ {
if (!evas_hash_find(added, file)) if (!eina_hash_find(added, file))
{ {
exe_matches = eina_list_append(exe_matches, strdup(file)); exe_matches = eina_list_append(exe_matches, strdup(file));
added = evas_hash_direct_add(added, file, file); if (!added)
added = eina_hash_string_superfast_new(NULL);
eina_hash_direct_add(added, file, file);
} }
} }
} }
} }
} }
if (added) evas_hash_free(added); if (added) eina_hash_free(added);
added = NULL; added = NULL;
eap_matches = eina_list_sort(eap_matches, eina_list_count(eap_matches), _e_exebuf_cb_sort_eap); eap_matches = eina_list_sort(eap_matches, eina_list_count(eap_matches), _e_exebuf_cb_sort_eap);

27
src/modules/fileman/e_fwin.c
View File

@ -90,7 +90,7 @@ static void _e_fwin_cb_exec_cmd_changed(void *data, void *data2);
static void _e_fwin_cb_open(void *data, E_Dialog *dia); static void _e_fwin_cb_open(void *data, E_Dialog *dia);
static void _e_fwin_cb_close(void *data, E_Dialog *dia); static void _e_fwin_cb_close(void *data, E_Dialog *dia);
static void _e_fwin_cb_dialog_free(void *obj); static void _e_fwin_cb_dialog_free(void *obj);
static Evas_Bool _e_fwin_cb_hash_foreach(const Evas_Hash *hash __UNUSED__, const void *key, void *data __UNUSED__, void *fdata); static Eina_Bool _e_fwin_cb_hash_foreach(const Eina_Hash *hash __UNUSED__, const void *key, void *data __UNUSED__, void *fdata);
static E_Fwin_Exec_Type _e_fwin_file_is_exec(E_Fm2_Icon_Info *ici); static E_Fwin_Exec_Type _e_fwin_file_is_exec(E_Fm2_Icon_Info *ici);
static void _e_fwin_file_exec(E_Fwin *fwin, E_Fm2_Icon_Info *ici, E_Fwin_Exec_Type ext); static void _e_fwin_file_exec(E_Fwin *fwin, E_Fm2_Icon_Info *ici, E_Fwin_Exec_Type ext);
static void _e_fwin_file_open_dialog(E_Fwin *fwin, Eina_List *files, int always); static void _e_fwin_file_open_dialog(E_Fwin *fwin, Eina_List *files, int always);
@ -566,7 +566,7 @@ _e_fwin_custom_file_path_eval(E_Fwin *fwin, Efreet_Desktop *ef, const char *prev
const char *res, *ret = NULL; const char *res, *ret = NULL;
/* get a X-something custom tage from the .desktop for the dir */ /* get a X-something custom tage from the .desktop for the dir */
res = ecore_hash_get(ef->x, key); res = eina_hash_find(ef->x, key);
/* free the old path */ /* free the old path */
if (prev_path) eina_stringshare_del(prev_path); if (prev_path) eina_stringshare_del(prev_path);
/* if there was no key found - return NULL */ /* if there was no key found - return NULL */
@ -932,8 +932,8 @@ _e_fwin_cb_dialog_free(void *obj)
E_FREE(fad); E_FREE(fad);
} }
static Evas_Bool static Eina_Bool
_e_fwin_cb_hash_foreach(const Evas_Hash *hash __UNUSED__, const void *key, void *data __UNUSED__, void *fdata) _e_fwin_cb_hash_foreach(const Eina_Hash *hash __UNUSED__, const void *key, void *data __UNUSED__, void *fdata)
{ {
Eina_List **mlist; Eina_List **mlist;
@ -1075,7 +1075,7 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Eina_List *files, int always)
Evas *evas; Evas *evas;
Eina_List *l = NULL, *apps = NULL, *mlist = NULL; Eina_List *l = NULL, *apps = NULL, *mlist = NULL;
Ecore_List *cats = NULL; Ecore_List *cats = NULL;
Evas_Hash *mimes = NULL; Eina_Hash *mimes = NULL;
Efreet_Desktop *desk = NULL; Efreet_Desktop *desk = NULL;
E_Fwin_Apps_Dialog *fad; E_Fwin_Apps_Dialog *fad;
E_Fm2_Icon_Info *ici; E_Fm2_Icon_Info *ici;
@ -1298,15 +1298,19 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Eina_List *files, int always)
if (ici->link) if (ici->link)
{ {
f = e_fm_mime_filename_get(ici->link); f = e_fm_mime_filename_get(ici->link);
mimes = evas_hash_del(mimes, f, (void *)1); eina_hash_del(mimes, f, (void *)1);
mimes = evas_hash_direct_add(mimes, f, (void *)1); if (!mimes)
mimes = eina_hash_string_superfast_new(NULL);
eina_hash_direct_add(mimes, f, (void *)1);
} }
else else
{ {
snprintf(buf, sizeof(buf), "%s/%s", snprintf(buf, sizeof(buf), "%s/%s",
e_fm2_real_path_get(fwin->fm_obj), ici->file); e_fm2_real_path_get(fwin->fm_obj), ici->file);
mimes = evas_hash_del(mimes, ici->mime, (void *)1); eina_hash_del(mimes, ici->mime, (void *)1);
mimes = evas_hash_direct_add(mimes, ici->mime, (void *)1); if (!mimes)
mimes = eina_hash_string_superfast_new(NULL);
eina_hash_direct_add(mimes, ici->mime, (void *)1);
} }
} }
} }
@ -1314,8 +1318,8 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Eina_List *files, int always)
/* 2. for each mimetype list apps that handle it */ /* 2. for each mimetype list apps that handle it */
if (mimes) if (mimes)
{ {
evas_hash_foreach(mimes, _e_fwin_cb_hash_foreach, &mlist); eina_hash_foreach(mimes, _e_fwin_cb_hash_foreach, &mlist);
evas_hash_free(mimes); eina_hash_free(mimes);
} }
/* 3. add apps to a list so its a unique app list */ /* 3. add apps to a list so its a unique app list */
apps = NULL; apps = NULL;
@ -1707,6 +1711,7 @@ _e_fwin_config_set(E_Fwin *fwin)
fmc.selection.single = 0; fmc.selection.single = 0;
fmc.selection.windows_modifiers = 0; fmc.selection.windows_modifiers = 0;
e_fm2_config_set(fwin->fm_obj, &fmc); e_fm2_config_set(fwin->fm_obj, &fmc);
e_fm2_icon_menu_flags_set(fwin->fm_obj, E_FM2_MENU_NO_VIEW_MENU);
} }
static void static void

22
src/modules/illume/e_kbd_dict.c
View File

@ -522,7 +522,7 @@ _e_kbd_dict_find(E_Kbd_Dict *kd, const char *word)
*/ */
tword = alloca(strlen(word) + 1); tword = alloca(strlen(word) + 1);
_e_kbd_dict_normalized_strcpy(tword, word); _e_kbd_dict_normalized_strcpy(tword, word);
p = evas_hash_find(kd->matches.leads, tword); p = eina_hash_find(kd->matches.leads, tword);
if (p) return p; if (p) return p;
p2 = strlen(tword); p2 = strlen(tword);
while (tword[0]) while (tword[0])
@ -530,7 +530,7 @@ _e_kbd_dict_find(E_Kbd_Dict *kd, const char *word)
p2 = evas_string_char_prev_get(tword, p2, &i); p2 = evas_string_char_prev_get(tword, p2, &i);
if (p2 < 0) break; if (p2 < 0) break;
tword[p2] = 0; tword[p2] = 0;
p = evas_hash_find(kd->matches.leads, tword); p = eina_hash_find(kd->matches.leads, tword);
if (p) if (p)
return _e_kbd_dict_find_pointer(kd, p, p2, word); return _e_kbd_dict_find_pointer(kd, p, p2, word);
} }
@ -628,12 +628,12 @@ e_kbd_dict_word_letter_clear(E_Kbd_Dict *kd)
e_kbd_dict_word_letter_delete(kd); e_kbd_dict_word_letter_delete(kd);
if (kd->matches.deadends) if (kd->matches.deadends)
{ {
evas_hash_free(kd->matches.deadends); eina_hash_free(kd->matches.deadends);
kd->matches.deadends = NULL; kd->matches.deadends = NULL;
} }
if (kd->matches.leads) if (kd->matches.leads)
{ {
evas_hash_free(kd->matches.leads); eina_hash_free(kd->matches.leads);
kd->matches.leads = NULL; kd->matches.leads = NULL;
} }
while (kd->matches.list) while (kd->matches.list)
@ -737,18 +737,24 @@ _e_kbd_dict_matches_lookup_iter(E_Kbd_Dict *kd, Eina_List *word,
{ {
kl = l->data; kl = l->data;
strcpy(bufapp, kl->letter); strcpy(bufapp, kl->letter);
if ((kd->matches.deadends) && evas_hash_find(kd->matches.deadends, buf)) if ((kd->matches.deadends) && eina_hash_find(kd->matches.deadends, buf))
continue; continue;
p = evas_hash_find(kd->matches.leads, buf); p = eina_hash_find(kd->matches.leads, buf);
if (p) p = _e_kbd_dict_find_pointer(kd, p, baselen, buf); if (p) p = _e_kbd_dict_find_pointer(kd, p, baselen, buf);
else p = _e_kbd_dict_find(kd, buf); else p = _e_kbd_dict_find(kd, buf);
if (!p) if (!p)
{ {
kd->matches.deadends = evas_hash_add(kd->matches.deadends, buf, kd); if (!kd->matches.deadends)
kd->matches.deadends = eina_hash_string_superfast_new(NULL);
eina_hash_add(kd->matches.deadends, buf, kd);
continue; continue;
} }
else else
kd->matches.leads = evas_hash_add(kd->matches.leads, buf, p); {
if (!kd->matches.leads)
kd->matches.leads = eina_hash_string_superfast_new(NULL);
eina_hash_add(kd->matches.leads, buf, p);
}
if ((!more->next) || (!more->next->data)) if ((!more->next) || (!more->next->data))
{ {
d = dist + kl->dist; d = dist + kl->dist;

4
src/modules/illume/e_kbd_dict.h
View File

@ -36,8 +36,8 @@ struct _E_Kbd_Dict
Eina_List *letters; Eina_List *letters;
} word; } word;
struct { struct {
Evas_Hash *deadends; Eina_Hash *deadends;
Evas_Hash *leads; Eina_Hash *leads;
Eina_List *list; Eina_List *list;
Eina_List *list_ptr; Eina_List *list_ptr;
} matches; } matches;

2
src/modules/illume/e_mod_win.c
View File

@ -1110,7 +1110,7 @@ _apps_populate(void)
if ((desktop) && (desktop->x)) if ((desktop) && (desktop->x))
{ {
icon = ecore_hash_get(desktop->x, "X-Application-Screenshot"); icon = eina_hash_find(desktop->x, "X-Application-Screenshot");
if (icon) icon = strdup(icon); if (icon) icon = strdup(icon);
} }
if ((!icon) && (subentry->icon)) if ((!icon) && (subentry->icon))

18
src/modules/mixer/e_mod_main.c
View File

@ -78,7 +78,9 @@ _mixer_gadget_configuration_new(E_Mixer_Module_Config *mod_conf, const char *id)
} }
conf->id = eina_stringshare_add(id); conf->id = eina_stringshare_add(id);
mod_conf->gadgets = evas_hash_direct_add(mod_conf->gadgets, conf->id, conf); if (!mod_conf->gadgets)
mod_conf->gadgets = eina_hash_string_superfast_new(NULL);
eina_hash_direct_add(mod_conf->gadgets, conf->id, conf);
return conf; return conf;
} }
@ -105,12 +107,14 @@ _mixer_gadget_configuration_free(E_Mixer_Module_Config *mod_conf, E_Mixer_Gadget
return; return;
if (!conf) if (!conf)
return; return;
mod_conf->gadgets = evas_hash_del(mod_conf->gadgets, conf->id, conf); eina_hash_del(mod_conf->gadgets, conf->id, conf);
if (!eina_hash_population(mod_conf->gadgets))
eina_hash_free(mod_conf->gadgets);
_mixer_gadget_configuration_free_int(conf); _mixer_gadget_configuration_free_int(conf);
} }
static Evas_Bool static Eina_Bool
_mixer_gadget_configuration_free_foreach(const Evas_Hash *hash, const void *key, void *hdata, void *fdata) _mixer_gadget_configuration_free_foreach(const Eina_Hash *hash, const void *key, void *hdata, void *fdata)
{ {
_mixer_gadget_configuration_free_int(hdata); _mixer_gadget_configuration_free_int(hdata);
return 1; return 1;
@ -143,9 +147,9 @@ _mixer_module_configuration_free(E_Mixer_Module_Config *conf)
if (!conf) if (!conf)
return; return;
evas_hash_foreach(conf->gadgets, eina_hash_foreach(conf->gadgets,
_mixer_gadget_configuration_free_foreach, NULL); _mixer_gadget_configuration_free_foreach, NULL);
evas_hash_free(conf->gadgets); eina_hash_free(conf->gadgets);
free(conf); free(conf);
} }
@ -866,7 +870,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
return NULL; return NULL;
} }
conf = evas_hash_find(ctxt->conf->gadgets, id); conf = eina_hash_find(ctxt->conf->gadgets, id);
if (!conf) if (!conf)
{ {
conf = _mixer_gadget_configuration_new(ctxt->conf, id); conf = _mixer_gadget_configuration_new(ctxt->conf, id);

2
src/modules/mixer/e_mod_main.h
View File

@ -24,7 +24,7 @@ typedef struct E_Mixer_Module_Config
{ {
int version; int version;
const char *default_gc_id; const char *default_gc_id;
Evas_Hash *gadgets; Eina_Hash *gadgets;
} E_Mixer_Module_Config; } E_Mixer_Module_Config;
typedef struct E_Mixer_Instance typedef struct E_Mixer_Instance

1
src/modules/syscon/e_mod_main.c
View File

@ -118,6 +118,7 @@ _e_mod_menu_add(void *data, E_Menu *m)
{ {
E_Menu_Item *mi; E_Menu_Item *mi;
fprintf(stderr, "Adding SYSCON menu !!\n");
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("System")); e_menu_item_label_set(mi, _("System"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/system"); e_util_menu_item_edje_icon_set(mi, "enlightenment/system");

32
src/modules/temperature/e_mod_main.c
View File

@ -37,8 +37,8 @@ static void _temperature_face_cb_post_menu(void *data, E_Menu *m);
static void _temperature_face_level_set(Config_Face *inst, double level); static void _temperature_face_level_set(Config_Face *inst, double level);
static void _temperature_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi); static void _temperature_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi);
static Evas_Bool _temperature_face_shutdown(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *hdata, void *fdata __UNUSED__); static Eina_Bool _temperature_face_shutdown(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *hdata, void *fdata __UNUSED__);
static Evas_Bool _temperature_face_id_max(const Evas_Hash *hash __UNUSED__, const void *key, void *hdata __UNUSED__, void *fdata); static Eina_Bool _temperature_face_id_max(const Eina_Hash *hash __UNUSED__, const void *key, void *hdata __UNUSED__, void *fdata);
static E_Config_DD *conf_edd = NULL; static E_Config_DD *conf_edd = NULL;
static E_Config_DD *conf_face_edd = NULL; static E_Config_DD *conf_face_edd = NULL;
@ -54,7 +54,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
E_Gadcon_Client *gcc; E_Gadcon_Client *gcc;
Config_Face *inst; Config_Face *inst;
inst = evas_hash_find(temperature_config->faces, id); inst = eina_hash_find(temperature_config->faces, id);
if (!inst) if (!inst)
{ {
inst = E_NEW(Config_Face, 1); inst = E_NEW(Config_Face, 1);
@ -65,7 +65,9 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
inst->sensor_type = SENSOR_TYPE_NONE; inst->sensor_type = SENSOR_TYPE_NONE;
inst->sensor_name = NULL; inst->sensor_name = NULL;
inst->units = CELCIUS; inst->units = CELCIUS;
temperature_config->faces = evas_hash_direct_add(temperature_config->faces, inst->id, inst); if (!temperature_config->faces)
temperature_config->faces = eina_hash_string_superfast_new(NULL);
eina_hash_direct_add(temperature_config->faces, inst->id, inst);
} }
if (!inst->id) eina_stringshare_add(id); if (!inst->id) eina_stringshare_add(id);
E_CONFIG_LIMIT(inst->poll_interval, 1, 1024); E_CONFIG_LIMIT(inst->poll_interval, 1, 1024);
@ -174,7 +176,9 @@ _gc_id_new(E_Gadcon_Client_Class *client_class)
inst->sensor_type = SENSOR_TYPE_NONE; inst->sensor_type = SENSOR_TYPE_NONE;
inst->sensor_name = NULL; inst->sensor_name = NULL;
inst->units = CELCIUS; inst->units = CELCIUS;
temperature_config->faces = evas_hash_direct_add(temperature_config->faces, inst->id, inst); if (!temperature_config->faces)
temperature_config->faces = eina_hash_string_superfast_new(NULL);
eina_hash_direct_add(temperature_config->faces, inst->id, inst);
return inst->id; return inst->id;
} }
@ -321,8 +325,8 @@ _temperature_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi)
config_temperature_module(inst); config_temperature_module(inst);
} }
static Evas_Bool static Eina_Bool
_temperature_face_shutdown(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *hdata, void *fdata __UNUSED__) _temperature_face_shutdown(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *hdata, void *fdata __UNUSED__)
{ {
Config_Face *inst; Config_Face *inst;
@ -330,11 +334,11 @@ _temperature_face_shutdown(const Evas_Hash *hash __UNUSED__, const void *key __U
if (inst->sensor_name) eina_stringshare_del(inst->sensor_name); if (inst->sensor_name) eina_stringshare_del(inst->sensor_name);
if (inst->id) eina_stringshare_del(inst->id); if (inst->id) eina_stringshare_del(inst->id);
free(inst); free(inst);
return 1; return EINA_TRUE;
} }
static Evas_Bool static Eina_Bool
_temperature_face_id_max(const Evas_Hash *hash __UNUSED__, const void *key, void *hdata __UNUSED__, void *fdata) _temperature_face_id_max(const Eina_Hash *hash __UNUSED__, const void *key, void *hdata __UNUSED__, void *fdata)
{ {
const char *p; const char *p;
int *max; int *max;
@ -344,7 +348,7 @@ _temperature_face_id_max(const Evas_Hash *hash __UNUSED__, const void *key, void
p = strrchr(key, '.'); p = strrchr(key, '.');
if (p) num = atoi(p + 1); if (p) num = atoi(p + 1);
if (num > *max) *max = num; if (num > *max) *max = num;
return 1; return EINA_TRUE;
} }
void void
@ -458,7 +462,7 @@ e_modapi_init(E_Module *m)
if (!temperature_config) if (!temperature_config)
temperature_config = E_NEW(Config, 1); temperature_config = E_NEW(Config, 1);
else else
evas_hash_foreach(temperature_config->faces, _temperature_face_id_max, &uuid); eina_hash_foreach(temperature_config->faces, _temperature_face_id_max, &uuid);
temperature_config->module = m; temperature_config->module = m;
e_gadcon_provider_register(&_gadcon_class); e_gadcon_provider_register(&_gadcon_class);
@ -469,8 +473,8 @@ EAPI int
e_modapi_shutdown(E_Module *m) e_modapi_shutdown(E_Module *m)
{ {
e_gadcon_provider_unregister(&_gadcon_class); e_gadcon_provider_unregister(&_gadcon_class);
evas_hash_foreach(temperature_config->faces, _temperature_face_shutdown, NULL); eina_hash_foreach(temperature_config->faces, _temperature_face_shutdown, NULL);
evas_hash_free(temperature_config->faces); eina_hash_free(temperature_config->faces);
free(temperature_config); free(temperature_config);
temperature_config = NULL; temperature_config = NULL;
E_CONFIG_DD_FREE(conf_face_edd); E_CONFIG_DD_FREE(conf_face_edd);

2
src/modules/temperature/e_mod_main.h
View File

@ -57,7 +57,7 @@ struct _Config_Face
struct _Config struct _Config
{ {
/* saved * loaded config values */ /* saved * loaded config values */
Evas_Hash *faces; Eina_Hash *faces;
/* config state */ /* config state */
E_Module *module; E_Module *module;
}; };

21
src/preload/e_precache.c
View File

@ -53,9 +53,9 @@ log_close(void)
static void static void
log_write(const char *type, const char *file) log_write(const char *type, const char *file)
{ {
static Evas_Hash *s_hash = NULL; static Eina_Hash *s_hash = NULL;
static Evas_Hash *o_hash = NULL; static Eina_Hash *o_hash = NULL;
static Evas_Hash *d_hash = NULL; static Eina_Hash *d_hash = NULL;
char buf[2]; char buf[2];
if ((e_precache_end) && (*e_precache_end)) if ((e_precache_end) && (*e_precache_end))
@ -65,18 +65,21 @@ log_write(const char *type, const char *file)
} }
if (type[0] == 's') if (type[0] == 's')
{ {
if (evas_hash_find(s_hash, file)) return; if (eina_hash_find(s_hash, file)) return;
s_hash = evas_hash_add(s_hash, file, (void *)1); if (!s_hash) s_hash = eina_hash_string_superfast_new(NULL);
eina_hash_add(s_hash, file, (void *)1);
} }
else if (type[0] == 'o') else if (type[0] == 'o')
{ {
if (evas_hash_find(o_hash, file)) return; if (eina_hash_find(o_hash, file)) return;
o_hash = evas_hash_add(o_hash, file, (void *)1); if (!o_hash) o_hash = eina_hash_string_superfast_new(NULL);
eina_hash_add(o_hash, file, (void *)1);
} }
else if (type[0] == 'd') else if (type[0] == 'd')
{ {
if (evas_hash_find(d_hash, file)) return; if (eina_hash_find(d_hash, file)) return;
d_hash = evas_hash_add(d_hash, file, (void *)1); if (!d_hash) d_hash = eina_hash_string_superfast_new(NULL);
eina_hash_add(d_hash, file, (void *)1);
} }
buf[0] = type[0]; buf[1] = ' '; buf[0] = type[0]; buf[1] = ' ';
write(log_fd, buf, 2); write(log_fd, buf, 2);