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

Switch to eina_stringshare. 

This could also change the usage of string share in E17.



SVN revision: 36679
This commit is contained in:
Cedric BAIL 2008-10-15 15:12:56 +00:00
parent 9e02df4fef
commit 3d6749983b
90 changed files with 1096 additions and 1079 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/bin/e.h
View File

@ -72,6 +72,7 @@
#include <Ecore_Job.h> #include <Ecore_Job.h>
#include <Ecore_File.h> #include <Ecore_File.h>
#include <Eet.h> #include <Eet.h>
#include <eina_stringshare.h>
#include <Edje.h> #include <Edje.h>
#include <Efreet.h> #include <Efreet.h>
#include <Efreet_Mime.h> #include <Efreet_Mime.h>

46
src/bin/e_actions.c
View File

@ -2049,12 +2049,12 @@ static void
_delayed_action_free(Delayed_Action *da) _delayed_action_free(Delayed_Action *da)
{ {
if (da->obj) e_object_unref(da->obj); if (da->obj) e_object_unref(da->obj);
if (da->keyname) evas_stringshare_del(da->keyname); if (da->keyname) eina_stringshare_del(da->keyname);
if (da->timer) ecore_timer_del(da->timer); if (da->timer) ecore_timer_del(da->timer);
if (da->def.action) evas_stringshare_del(da->def.action); if (da->def.action) eina_stringshare_del(da->def.action);
if (da->def.params) evas_stringshare_del(da->def.params); if (da->def.params) eina_stringshare_del(da->def.params);
if (da->delayed.action) evas_stringshare_del(da->delayed.action); if (da->delayed.action) eina_stringshare_del(da->delayed.action);
if (da->delayed.params) evas_stringshare_del(da->delayed.params); if (da->delayed.params) eina_stringshare_del(da->delayed.params);
free(da); free(da);
} }
@ -2097,7 +2097,7 @@ _delayed_action_list_parse_action(const char *str, double *delay, const char **a
buf[0] = 0; buf[0] = 0;
sscanf(str, "%10s %1000s", fbuf, buf); sscanf(str, "%10s %1000s", fbuf, buf);
*action = evas_stringshare_add(buf); *action = eina_stringshare_add(buf);
*delay = atof(fbuf); *delay = atof(fbuf);
p = strchr(str, ' '); p = strchr(str, ' ');
if (p) if (p)
@ -2107,7 +2107,7 @@ _delayed_action_list_parse_action(const char *str, double *delay, const char **a
if (p) if (p)
{ {
p++; p++;
*params = evas_stringshare_add(p); *params = eina_stringshare_add(p);
} }
} }
} }
@ -2175,7 +2175,7 @@ _delayed_action_key_add(E_Object *obj, const char *params, Ecore_X_Event_Key_Dow
e_object_ref(da->obj); e_object_ref(da->obj);
} }
da->mouse = 0; da->mouse = 0;
da->keyname = evas_stringshare_add(ev->keyname); da->keyname = eina_stringshare_add(ev->keyname);
if (params) _delayed_action_list_parse(da, params); if (params) _delayed_action_list_parse(da, params);
_delayed_actions = evas_list_append(_delayed_actions, da); _delayed_actions = evas_list_append(_delayed_actions, da);
} }
@ -2731,7 +2731,7 @@ e_action_predef_name_set(const char *act_grp, const char *act_name, const char *
actg = E_NEW(E_Action_Group, 1); actg = E_NEW(E_Action_Group, 1);
if (!actg) return; if (!actg) return;
actg->act_grp = evas_stringshare_add(act_grp); actg->act_grp = eina_stringshare_add(act_grp);
actg->acts = NULL; actg->acts = NULL;
action_groups = evas_list_append(action_groups, actg); action_groups = evas_list_append(action_groups, actg);
@ -2753,10 +2753,10 @@ e_action_predef_name_set(const char *act_grp, const char *act_name, const char *
actd = E_NEW(E_Action_Description, 1); actd = E_NEW(E_Action_Description, 1);
if (!actd) return; if (!actd) return;
actd->act_name = evas_stringshare_add(act_name); actd->act_name = eina_stringshare_add(act_name);
actd->act_cmd = act_cmd == NULL ? NULL : evas_stringshare_add(act_cmd); actd->act_cmd = act_cmd == NULL ? NULL : eina_stringshare_add(act_cmd);
actd->act_params = act_params == NULL ? NULL : evas_stringshare_add(act_params); actd->act_params = act_params == NULL ? NULL : eina_stringshare_add(act_params);
actd->param_example = param_example == NULL ? NULL : evas_stringshare_add(param_example); actd->param_example = param_example == NULL ? NULL : eina_stringshare_add(param_example);
actd->editable = editable; actd->editable = editable;
actg->acts = evas_list_append(actg->acts, actd); actg->acts = evas_list_append(actg->acts, actd);
@ -2786,17 +2786,17 @@ e_action_predef_name_del(const char *act_grp, const char *act_name)
{ {
actg->acts = evas_list_remove(actg->acts, actd); actg->acts = evas_list_remove(actg->acts, actd);
if (actd->act_name) evas_stringshare_del(actd->act_name); if (actd->act_name) eina_stringshare_del(actd->act_name);
if (actd->act_cmd) evas_stringshare_del(actd->act_cmd); if (actd->act_cmd) eina_stringshare_del(actd->act_cmd);
if (actd->act_params) evas_stringshare_del(actd->act_params); if (actd->act_params) eina_stringshare_del(actd->act_params);
if (actd->param_example) evas_stringshare_del(actd->param_example); if (actd->param_example) eina_stringshare_del(actd->param_example);
E_FREE(actd); E_FREE(actd);
if (!evas_list_count(actg->acts)) if (!evas_list_count(actg->acts))
{ {
action_groups = evas_list_remove(action_groups, actg); action_groups = evas_list_remove(action_groups, actg);
if (actg->act_grp) evas_stringshare_del(actg->act_grp); if (actg->act_grp) eina_stringshare_del(actg->act_grp);
E_FREE(actg); E_FREE(actg);
} }
break; break;
@ -2818,16 +2818,16 @@ e_action_predef_name_all_del(void)
{ {
actd = actg->acts->data; actd = actg->acts->data;
if (actd->act_name) evas_stringshare_del(actd->act_name); if (actd->act_name) eina_stringshare_del(actd->act_name);
if (actd->act_cmd) evas_stringshare_del(actd->act_cmd); if (actd->act_cmd) eina_stringshare_del(actd->act_cmd);
if (actd->act_params) evas_stringshare_del(actd->act_params); if (actd->act_params) eina_stringshare_del(actd->act_params);
if (actd->param_example) evas_stringshare_del(actd->param_example); if (actd->param_example) eina_stringshare_del(actd->param_example);
E_FREE(actd); E_FREE(actd);
actg->acts = evas_list_remove_list(actg->acts, actg->acts); actg->acts = evas_list_remove_list(actg->acts, actg->acts);
} }
if (actg->act_grp) evas_stringshare_del(actg->act_grp); if (actg->act_grp) eina_stringshare_del(actg->act_grp);
E_FREE(actg); E_FREE(actg);
action_groups = evas_list_remove_list(action_groups, action_groups); action_groups = evas_list_remove_list(action_groups, action_groups);

8
src/bin/e_bg.c
View File

@ -255,13 +255,13 @@ e_bg_default_set(char *file)
if (e_config->desktop_default_background) if (e_config->desktop_default_background)
{ {
e_filereg_deregister(e_config->desktop_default_background); e_filereg_deregister(e_config->desktop_default_background);
evas_stringshare_del(e_config->desktop_default_background); eina_stringshare_del(e_config->desktop_default_background);
} }
if (file) if (file)
{ {
e_filereg_register(file); e_filereg_register(file);
e_config->desktop_default_background = evas_stringshare_add(file); e_config->desktop_default_background = eina_stringshare_add(file);
} }
else else
e_config->desktop_default_background = NULL; e_config->desktop_default_background = NULL;
@ -286,7 +286,7 @@ e_bg_add(int container, int zone, int desk_x, int desk_y, char *file)
cfbg->zone = zone; cfbg->zone = zone;
cfbg->desk_x = desk_x; cfbg->desk_x = desk_x;
cfbg->desk_y = desk_y; cfbg->desk_y = desk_y;
cfbg->file = evas_stringshare_add(file); cfbg->file = eina_stringshare_add(file);
e_config->desktop_backgrounds = evas_list_append(e_config->desktop_backgrounds, cfbg); e_config->desktop_backgrounds = evas_list_append(e_config->desktop_backgrounds, cfbg);
e_filereg_register(cfbg->file); e_filereg_register(cfbg->file);
@ -316,7 +316,7 @@ e_bg_del(int container, int zone, int desk_x, int desk_y)
{ {
e_config->desktop_backgrounds = evas_list_remove_list(e_config->desktop_backgrounds, l); e_config->desktop_backgrounds = evas_list_remove_list(e_config->desktop_backgrounds, l);
e_filereg_deregister(cfbg->file); e_filereg_deregister(cfbg->file);
if (cfbg->file) evas_stringshare_del(cfbg->file); if (cfbg->file) eina_stringshare_del(cfbg->file);
free(cfbg); free(cfbg);
break; break;
} }

44
src/bin/e_bindings.c
View File

@ -126,8 +126,8 @@ e_bindings_mouse_add(E_Binding_Context ctxt, int button, E_Binding_Modifier mod,
bind->button = button; bind->button = button;
bind->mod = mod; bind->mod = mod;
bind->any_mod = any_mod; bind->any_mod = any_mod;
if (action) bind->action = evas_stringshare_add(action); if (action) bind->action = eina_stringshare_add(action);
if (params) bind->params = evas_stringshare_add(params); if (params) bind->params = eina_stringshare_add(params);
mouse_bindings = evas_list_append(mouse_bindings, bind); mouse_bindings = evas_list_append(mouse_bindings, bind);
} }
@ -315,11 +315,11 @@ e_bindings_key_add(E_Binding_Context ctxt, const char *key, E_Binding_Modifier m
bind = calloc(1, sizeof(E_Binding_Key)); bind = calloc(1, sizeof(E_Binding_Key));
bind->ctxt = ctxt; bind->ctxt = ctxt;
bind->key = evas_stringshare_add(key); bind->key = eina_stringshare_add(key);
bind->mod = mod; bind->mod = mod;
bind->any_mod = any_mod; bind->any_mod = any_mod;
if (action) bind->action = evas_stringshare_add(action); if (action) bind->action = eina_stringshare_add(action);
if (params) bind->params = evas_stringshare_add(params); if (params) bind->params = eina_stringshare_add(params);
key_bindings = evas_list_append(key_bindings, bind); key_bindings = evas_list_append(key_bindings, bind);
} }
@ -523,12 +523,12 @@ e_bindings_signal_add(E_Binding_Context ctxt, const char *sig, const char *src,
bind = calloc(1, sizeof(E_Binding_Signal)); bind = calloc(1, sizeof(E_Binding_Signal));
bind->ctxt = ctxt; bind->ctxt = ctxt;
if (sig) bind->sig = evas_stringshare_add(sig); if (sig) bind->sig = eina_stringshare_add(sig);
if (src) bind->src = evas_stringshare_add(src); if (src) bind->src = eina_stringshare_add(src);
bind->mod = mod; bind->mod = mod;
bind->any_mod = any_mod; bind->any_mod = any_mod;
if (action) bind->action = evas_stringshare_add(action); if (action) bind->action = eina_stringshare_add(action);
if (params) bind->params = evas_stringshare_add(params); if (params) bind->params = eina_stringshare_add(params);
signal_bindings = evas_list_append(signal_bindings, bind); signal_bindings = evas_list_append(signal_bindings, bind);
} }
@ -624,8 +624,8 @@ e_bindings_wheel_add(E_Binding_Context ctxt, int direction, int z, E_Binding_Mod
bind->z = z; bind->z = z;
bind->mod = mod; bind->mod = mod;
bind->any_mod = any_mod; bind->any_mod = any_mod;
if (action) bind->action = evas_stringshare_add(action); if (action) bind->action = eina_stringshare_add(action);
if (params) bind->params = evas_stringshare_add(params); if (params) bind->params = eina_stringshare_add(params);
wheel_bindings = evas_list_append(wheel_bindings, bind); wheel_bindings = evas_list_append(wheel_bindings, bind);
} }
@ -787,35 +787,35 @@ e_bindings_wheel_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_X_Eve
static void static void
_e_bindings_mouse_free(E_Binding_Mouse *bind) _e_bindings_mouse_free(E_Binding_Mouse *bind)
{ {
if (bind->action) evas_stringshare_del(bind->action); if (bind->action) eina_stringshare_del(bind->action);
if (bind->params) evas_stringshare_del(bind->params); if (bind->params) eina_stringshare_del(bind->params);
free(bind); free(bind);
} }
static void static void
_e_bindings_key_free(E_Binding_Key *bind) _e_bindings_key_free(E_Binding_Key *bind)
{ {
if (bind->key) evas_stringshare_del(bind->key); if (bind->key) eina_stringshare_del(bind->key);
if (bind->action) evas_stringshare_del(bind->action); if (bind->action) eina_stringshare_del(bind->action);
if (bind->params) evas_stringshare_del(bind->params); if (bind->params) eina_stringshare_del(bind->params);
free(bind); free(bind);
} }
static void static void
_e_bindings_signal_free(E_Binding_Signal *bind) _e_bindings_signal_free(E_Binding_Signal *bind)
{ {
if (bind->sig) evas_stringshare_del(bind->sig); if (bind->sig) eina_stringshare_del(bind->sig);
if (bind->src) evas_stringshare_del(bind->src); if (bind->src) eina_stringshare_del(bind->src);
if (bind->action) evas_stringshare_del(bind->action); if (bind->action) eina_stringshare_del(bind->action);
if (bind->params) evas_stringshare_del(bind->params); if (bind->params) eina_stringshare_del(bind->params);
free(bind); free(bind);
} }
static void static void
_e_bindings_wheel_free(E_Binding_Wheel *bind) _e_bindings_wheel_free(E_Binding_Wheel *bind)
{ {
if (bind->action) evas_stringshare_del(bind->action); if (bind->action) eina_stringshare_del(bind->action);
if (bind->params) evas_stringshare_del(bind->params); if (bind->params) eina_stringshare_del(bind->params);
free(bind); free(bind);
} }

20
src/bin/e_border.c
View File

@ -3670,8 +3670,8 @@ _e_border_free(E_Border *bd)
} }
if (bd->client.netwm.extra_types) if (bd->client.netwm.extra_types)
free(bd->client.netwm.extra_types); free(bd->client.netwm.extra_types);
if (bd->client.border.name) evas_stringshare_del(bd->client.border.name); if (bd->client.border.name) eina_stringshare_del(bd->client.border.name);
if (bd->bordername) evas_stringshare_del(bd->bordername); if (bd->bordername) eina_stringshare_del(bd->bordername);
if (bd->client.icccm.title) free(bd->client.icccm.title); if (bd->client.icccm.title) free(bd->client.icccm.title);
if (bd->client.icccm.name) free(bd->client.icccm.name); if (bd->client.icccm.name) free(bd->client.icccm.name);
if (bd->client.icccm.class) free(bd->client.icccm.class); if (bd->client.icccm.class) free(bd->client.icccm.class);
@ -3689,8 +3689,8 @@ _e_border_free(E_Border *bd)
if (bd->client.netwm.name) free(bd->client.netwm.name); if (bd->client.netwm.name) free(bd->client.netwm.name);
if (bd->client.netwm.icon_name) free(bd->client.netwm.icon_name); if (bd->client.netwm.icon_name) free(bd->client.netwm.icon_name);
e_object_del(E_OBJECT(bd->shape)); e_object_del(E_OBJECT(bd->shape));
if (bd->internal_icon) evas_stringshare_del(bd->internal_icon); if (bd->internal_icon) eina_stringshare_del(bd->internal_icon);
if (bd->internal_icon_key) evas_stringshare_del(bd->internal_icon_key); if (bd->internal_icon_key) eina_stringshare_del(bd->internal_icon_key);
if (bd->icon_object) evas_object_del(bd->icon_object); if (bd->icon_object) evas_object_del(bd->icon_object);
evas_object_del(bd->bg_object); evas_object_del(bd->bg_object);
e_canvas_del(bd->bg_ecore_evas); e_canvas_del(bd->bg_ecore_evas);
@ -6152,8 +6152,8 @@ _e_border_eval(E_Border *bd)
{ {
if (rem->prop.border) if (rem->prop.border)
{ {
if (bd->bordername) evas_stringshare_del(bd->bordername); if (bd->bordername) eina_stringshare_del(bd->bordername);
if (rem->prop.border) bd->bordername = evas_stringshare_add(rem->prop.border); if (rem->prop.border) bd->bordername = eina_stringshare_add(rem->prop.border);
else bd->bordername = NULL; else bd->bordername = NULL;
bd->client.border.changed = 1; bd->client.border.changed = 1;
} }
@ -6257,8 +6257,8 @@ _e_border_eval(E_Border *bd)
if ((!bd->client.border.name) || (strcmp(bd->client.border.name, bordername))) if ((!bd->client.border.name) || (strcmp(bd->client.border.name, bordername)))
{ {
if (bd->client.border.name) evas_stringshare_del(bd->client.border.name); if (bd->client.border.name) eina_stringshare_del(bd->client.border.name);
bd->client.border.name = evas_stringshare_add(bordername); bd->client.border.name = eina_stringshare_add(bordername);
if (bd->bg_object) if (bd->bg_object)
{ {
@ -6283,8 +6283,8 @@ _e_border_eval(E_Border *bd)
{ {
/* Reset default border style to default */ /* Reset default border style to default */
if (e_config->theme_default_border_style) if (e_config->theme_default_border_style)
evas_stringshare_del(e_config->theme_default_border_style); eina_stringshare_del(e_config->theme_default_border_style);
e_config->theme_default_border_style = evas_stringshare_add("default"); e_config->theme_default_border_style = eina_stringshare_add("default");
e_config_save_queue(); e_config_save_queue();
} }
} }

4
src/bin/e_color_class.c
View File

@ -41,7 +41,7 @@ e_color_class_set(const char *color_class, int r, int g, int b, int a, int r2, i
{ {
cc = E_NEW(E_Color_Class, 1); cc = E_NEW(E_Color_Class, 1);
e_config->color_classes = evas_list_append(e_config->color_classes, cc); e_config->color_classes = evas_list_append(e_config->color_classes, cc);
cc->name = evas_stringshare_add(color_class); cc->name = eina_stringshare_add(color_class);
cc->r = cc->g = cc->b = cc->a = 255; cc->r = cc->g = cc->b = cc->a = 255;
cc->r2 = cc->g2 = cc->b2 = cc->a2 = 255; cc->r2 = cc->g2 = cc->b2 = cc->a2 = 255;
cc->r3 = cc->g3 = cc->b3 = cc->a3 = 255; cc->r3 = cc->g3 = cc->b3 = cc->a3 = 255;
@ -77,7 +77,7 @@ e_color_class_del(const char *name)
{ {
e_config->color_classes = evas_list_remove(e_config->color_classes, cc); e_config->color_classes = evas_list_remove(e_config->color_classes, cc);
edje_color_class_del(cc->name); edje_color_class_del(cc->name);
evas_stringshare_del(cc->name); eina_stringshare_del(cc->name);
E_FREE(cc); E_FREE(cc);
e_config_save_queue(); e_config_save_queue();

166
src/bin/e_config.c
View File

@ -678,9 +678,9 @@ e_config_init(void)
#define IFCFGEND } #define IFCFGEND }
IFCFG(0x008d); IFCFG(0x008d);
e_config->show_splash = 1; e_config->show_splash = 1;
e_config->init_default_theme = evas_stringshare_add("default.edj"); e_config->init_default_theme = eina_stringshare_add("default.edj");
e_config->desktop_default_background = NULL; e_config->desktop_default_background = NULL;
e_config->desktop_default_name = evas_stringshare_add(_("Desktop %i, %i")); e_config->desktop_default_name = eina_stringshare_add(_("Desktop %i, %i"));
e_config->menus_scroll_speed = 1000.0; e_config->menus_scroll_speed = 1000.0;
e_config->menus_fast_mouse_move_threshhold = 300.0; e_config->menus_fast_mouse_move_threshhold = 300.0;
e_config->menus_click_drag_timeout = DEF_MENUCLICK; e_config->menus_click_drag_timeout = DEF_MENUCLICK;
@ -750,8 +750,8 @@ e_config_init(void)
e_config->kill_timer_wait = 10.0; e_config->kill_timer_wait = 10.0;
e_config->ping_clients = 1; e_config->ping_clients = 1;
e_config->transition_start = NULL; e_config->transition_start = NULL;
e_config->transition_desk = evas_stringshare_add("vswipe"); e_config->transition_desk = eina_stringshare_add("vswipe");
e_config->transition_change = evas_stringshare_add("crossfade"); e_config->transition_change = eina_stringshare_add("crossfade");
e_config->move_info_follows = 1; e_config->move_info_follows = 1;
e_config->resize_info_follows = 1; e_config->resize_info_follows = 1;
e_config->move_info_visible = 1; e_config->move_info_visible = 1;
@ -790,7 +790,7 @@ e_config_init(void)
e_config->exebuf_pos_min_h = 160; e_config->exebuf_pos_min_h = 160;
e_config->exebuf_pos_max_w = 400; e_config->exebuf_pos_max_w = 400;
e_config->exebuf_pos_max_h = 320; e_config->exebuf_pos_max_h = 320;
e_config->exebuf_term_cmd = evas_stringshare_add("xterm -hold -e"); e_config->exebuf_term_cmd = eina_stringshare_add("xterm -hold -e");
e_config->color_classes = NULL; e_config->color_classes = NULL;
e_config->use_app_icon = 0; e_config->use_app_icon = 0;
e_config->cnfmdlg_disabled = 0; e_config->cnfmdlg_disabled = 0;
@ -826,7 +826,7 @@ e_config_init(void)
#define CFG_MODULE(_name, _enabled, _delayed, _priority) \ #define CFG_MODULE(_name, _enabled, _delayed, _priority) \
em = E_NEW(E_Config_Module, 1); \ em = E_NEW(E_Config_Module, 1); \
em->name = evas_stringshare_add(_name); \ em->name = eina_stringshare_add(_name); \
em->enabled = _enabled; \ em->enabled = _enabled; \
em->delayed = _delayed; \ em->delayed = _delayed; \
em->priority = _priority; \ em->priority = _priority; \
@ -889,7 +889,7 @@ e_config_init(void)
#define CFG_FONTFALLBACK(_name) \ #define CFG_FONTFALLBACK(_name) \
eff = E_NEW(E_Font_Fallback, 1); \ eff = E_NEW(E_Font_Fallback, 1); \
eff->name = evas_stringshare_add(_name); \ eff->name = eina_stringshare_add(_name); \
e_config->font_fallbacks = evas_list_append(e_config->font_fallbacks, eff) e_config->font_fallbacks = evas_list_append(e_config->font_fallbacks, eff)
CFG_FONTFALLBACK("New-Sung"); CFG_FONTFALLBACK("New-Sung");
@ -902,8 +902,8 @@ e_config_init(void)
#define CFG_FONTDEFAULT(_tclass, _name, _size) \ #define CFG_FONTDEFAULT(_tclass, _name, _size) \
efd = E_NEW(E_Font_Default, 1); \ efd = E_NEW(E_Font_Default, 1); \
efd->text_class = evas_stringshare_add(_tclass); \ efd->text_class = eina_stringshare_add(_tclass); \
efd->font = evas_stringshare_add(_name); \ efd->font = eina_stringshare_add(_name); \
efd->size = _size; \ efd->size = _size; \
e_config->font_defaults = evas_list_append(e_config->font_defaults, efd) e_config->font_defaults = evas_list_append(e_config->font_defaults, efd)
@ -913,8 +913,8 @@ e_config_init(void)
E_Config_Theme *et; E_Config_Theme *et;
et = E_NEW(E_Config_Theme, 1); et = E_NEW(E_Config_Theme, 1);
et->category = evas_stringshare_add("theme"); et->category = eina_stringshare_add("theme");
et->file = evas_stringshare_add("default.edj"); et->file = eina_stringshare_add("default.edj");
e_config->themes = evas_list_append(e_config->themes, et); e_config->themes = evas_list_append(e_config->themes, et);
} }
{ {
@ -926,8 +926,8 @@ e_config_init(void)
eb->button = _button; \ eb->button = _button; \
eb->modifiers = _modifiers; \ eb->modifiers = _modifiers; \
eb->any_mod = _anymod; \ eb->any_mod = _anymod; \
eb->action = _action == NULL ? NULL : evas_stringshare_add(_action); \ eb->action = _action == NULL ? NULL : eina_stringshare_add(_action); \
eb->params = _params == NULL ? NULL : evas_stringshare_add(_params); \ eb->params = _params == NULL ? NULL : eina_stringshare_add(_params); \
e_config->mouse_bindings = evas_list_append(e_config->mouse_bindings, eb) e_config->mouse_bindings = evas_list_append(e_config->mouse_bindings, eb)
/* /*
@ -953,11 +953,11 @@ e_config_init(void)
#define CFG_KEYBIND(_context, _key, _modifiers, _anymod, _action, _params) \ #define CFG_KEYBIND(_context, _key, _modifiers, _anymod, _action, _params) \
eb = E_NEW(E_Config_Binding_Key, 1); \ eb = E_NEW(E_Config_Binding_Key, 1); \
eb->context = _context; \ eb->context = _context; \
eb->key = evas_stringshare_add(_key); \ eb->key = eina_stringshare_add(_key); \
eb->modifiers = _modifiers; \ eb->modifiers = _modifiers; \
eb->any_mod = _anymod; \ eb->any_mod = _anymod; \
eb->action = _action == NULL ? NULL : evas_stringshare_add(_action); \ eb->action = _action == NULL ? NULL : eina_stringshare_add(_action); \
eb->params = _params == NULL ? NULL : evas_stringshare_add(_params); \ eb->params = _params == NULL ? NULL : eina_stringshare_add(_params); \
e_config->key_bindings = evas_list_append(e_config->key_bindings, eb) e_config->key_bindings = evas_list_append(e_config->key_bindings, eb)
/* /*
@ -1118,12 +1118,12 @@ e_config_init(void)
#define CFG_SIGNALBIND(_context, _signal, _source, _modifiers, _anymod, _action, _params) \ #define CFG_SIGNALBIND(_context, _signal, _source, _modifiers, _anymod, _action, _params) \
eb = E_NEW(E_Config_Binding_Signal, 1); \ eb = E_NEW(E_Config_Binding_Signal, 1); \
eb->context = _context; \ eb->context = _context; \
eb->signal = _signal == NULL ? NULL : evas_stringshare_add(_signal); \ eb->signal = _signal == NULL ? NULL : eina_stringshare_add(_signal); \
eb->source = _source == NULL ? NULL : evas_stringshare_add(_source); \ eb->source = _source == NULL ? NULL : eina_stringshare_add(_source); \
eb->modifiers = _modifiers; \ eb->modifiers = _modifiers; \
eb->any_mod = _anymod; \ eb->any_mod = _anymod; \
eb->action = _action == NULL ? NULL : evas_stringshare_add(_action); \ eb->action = _action == NULL ? NULL : eina_stringshare_add(_action); \
eb->params = _params == NULL ? NULL : evas_stringshare_add(_params); \ eb->params = _params == NULL ? NULL : eina_stringshare_add(_params); \
e_config->signal_bindings = evas_list_append(e_config->signal_bindings, eb) e_config->signal_bindings = evas_list_append(e_config->signal_bindings, eb)
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1,double", CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1,double",
@ -1249,8 +1249,8 @@ e_config_init(void)
eb->z = _z; \ eb->z = _z; \
eb->modifiers = _modifiers; \ eb->modifiers = _modifiers; \
eb->any_mod = _anymod; \ eb->any_mod = _anymod; \
eb->action = _action == NULL ? NULL : evas_stringshare_add(_action); \ eb->action = _action == NULL ? NULL : eina_stringshare_add(_action); \
eb->params = _params == NULL ? NULL : evas_stringshare_add(_params); \ eb->params = _params == NULL ? NULL : eina_stringshare_add(_params); \
e_config->wheel_bindings = evas_list_append(e_config->wheel_bindings, eb) e_config->wheel_bindings = evas_list_append(e_config->wheel_bindings, eb)
/* /*
@ -1308,7 +1308,7 @@ e_config_init(void)
#define CFG_SHELF(_name, _con, _zone, _pop, _lay, _orient, _fita, _fits, _style, _size, _overlap, _autohide, _autohide_show_action, _hide_timeout, _hide_duration, _desk_show_mode, _desk_list) \ #define CFG_SHELF(_name, _con, _zone, _pop, _lay, _orient, _fita, _fits, _style, _size, _overlap, _autohide, _autohide_show_action, _hide_timeout, _hide_duration, _desk_show_mode, _desk_list) \
cf_es = E_NEW(E_Config_Shelf, 1); \ cf_es = E_NEW(E_Config_Shelf, 1); \
cf_es->name = evas_stringshare_add(_name); \ cf_es->name = eina_stringshare_add(_name); \
cf_es->id = ++id; \ cf_es->id = ++id; \
cf_es->container = _con; \ cf_es->container = _con; \
cf_es->zone = _zone; \ cf_es->zone = _zone; \
@ -1317,7 +1317,7 @@ e_config_init(void)
cf_es->orient = _orient; \ cf_es->orient = _orient; \
cf_es->fit_along = _fita; \ cf_es->fit_along = _fita; \
cf_es->fit_size = _fits; \ cf_es->fit_size = _fits; \
cf_es->style = evas_stringshare_add(_style); \ cf_es->style = eina_stringshare_add(_style); \
cf_es->size = _size; \ cf_es->size = _size; \
cf_es->overlap = _overlap; \ cf_es->overlap = _overlap; \
cf_es->autohide = _autohide; \ cf_es->autohide = _autohide; \
@ -1351,8 +1351,8 @@ e_config_init(void)
IFCFGEND; IFCFGEND;
IFCFG(0x0096); /* the version # where this value(s) was introduced */ IFCFG(0x0096); /* the version # where this value(s) was introduced */
e_config->wallpaper_import_last_dev = evas_stringshare_add("~/"); e_config->wallpaper_import_last_dev = eina_stringshare_add("~/");
e_config->wallpaper_import_last_path = evas_stringshare_add("/"); e_config->wallpaper_import_last_path = eina_stringshare_add("/");
IFCFGEND; IFCFGEND;
IFCFG(0x0098); IFCFG(0x0098);
@ -1376,8 +1376,8 @@ e_config_init(void)
#define CFG_MIME_ICON(_mime, _icon) \ #define CFG_MIME_ICON(_mime, _icon) \
mi = E_NEW(E_Config_Mime_Icon, 1); \ mi = E_NEW(E_Config_Mime_Icon, 1); \
mi->mime = evas_stringshare_add(_mime); \ mi->mime = eina_stringshare_add(_mime); \
mi->icon = evas_stringshare_add(_icon); \ mi->icon = eina_stringshare_add(_icon); \
e_config->mime_icons = evas_list_append(e_config->mime_icons, mi) e_config->mime_icons = evas_list_append(e_config->mime_icons, mi)
CFG_MIME_ICON("image/jpeg", "THUMB"); CFG_MIME_ICON("image/jpeg", "THUMB");
@ -1393,7 +1393,7 @@ e_config_init(void)
IFCFGEND; IFCFGEND;
IFCFG(0x00103); IFCFG(0x00103);
e_config->theme_default_border_style = evas_stringshare_add("default"); e_config->theme_default_border_style = eina_stringshare_add("default");
IFCFGEND; IFCFGEND;
IFCFG(0x00104); IFCFG(0x00104);
@ -1419,19 +1419,19 @@ e_config_init(void)
e_config->gadcons = NULL; e_config->gadcons = NULL;
#define CFG_GADCON(_name) \ #define CFG_GADCON(_name) \
cf_gc = E_NEW(E_Config_Gadcon, 1);\ cf_gc = E_NEW(E_Config_Gadcon, 1);\
cf_gc->name = evas_stringshare_add(_name); \ cf_gc->name = eina_stringshare_add(_name); \
cf_gc->id = ++id; \ cf_gc->id = ++id; \
e_config->gadcons = evas_list_append(e_config->gadcons, cf_gc) e_config->gadcons = evas_list_append(e_config->gadcons, cf_gc)
#define CFG_GADCON_CLIENT(_name, _res, _size, _pos, _style, _autoscr, _resizable) \ #define CFG_GADCON_CLIENT(_name, _res, _size, _pos, _style, _autoscr, _resizable) \
cf_gcc = E_NEW(E_Config_Gadcon_Client, 1); \ cf_gcc = E_NEW(E_Config_Gadcon_Client, 1); \
cf_gcc->name = evas_stringshare_add(_name); \ cf_gcc->name = eina_stringshare_add(_name); \
cf_gcc->id = NULL; \ cf_gcc->id = NULL; \
cf_gcc->geom.res = _res; \ cf_gcc->geom.res = _res; \
cf_gcc->geom.size = _size; \ cf_gcc->geom.size = _size; \
cf_gcc->geom.pos = _pos; \ cf_gcc->geom.pos = _pos; \
cf_gcc->state_info.seq = 0; \ cf_gcc->state_info.seq = 0; \
cf_gcc->state_info.flags = 0; \ cf_gcc->state_info.flags = 0; \
if (_style) cf_gcc->style = evas_stringshare_add(_style); \ if (_style) cf_gcc->style = eina_stringshare_add(_style); \
else cf_gcc->style = NULL; \ else cf_gcc->style = NULL; \
cf_gcc->autoscroll = _autoscr; \ cf_gcc->autoscroll = _autoscr; \
cf_gcc->resizable = _resizable; \ cf_gcc->resizable = _resizable; \
@ -1513,7 +1513,7 @@ e_config_init(void)
e_config->mouse_accel_threshold = 4; e_config->mouse_accel_threshold = 4;
IFCFGEND; IFCFGEND;
if (!e_config->icon_theme) e_config->icon_theme = evas_stringshare_add("hicolor"); if (!e_config->icon_theme) e_config->icon_theme = eina_stringshare_add("hicolor");
IFCFG(0x113) IFCFG(0x113)
e_config->clientlist_max_caption_len = 0; e_config->clientlist_max_caption_len = 0;
@ -1727,7 +1727,7 @@ e_config_init(void)
/* FIXME: desklock personalized password id disabled for security reasons */ /* FIXME: desklock personalized password id disabled for security reasons */
e_config->desklock_auth_method = 0; e_config->desklock_auth_method = 0;
if (e_config->desklock_personal_passwd) if (e_config->desklock_personal_passwd)
evas_stringshare_del(e_config->desklock_personal_passwd); eina_stringshare_del(e_config->desklock_personal_passwd);
e_config->desklock_personal_passwd = NULL; e_config->desklock_personal_passwd = NULL;
e_config_save_queue(); e_config_save_queue();
@ -2124,7 +2124,7 @@ _e_config_free(void)
em = e_config->modules->data; em = e_config->modules->data;
e_config->modules = evas_list_remove_list(e_config->modules, e_config->modules); e_config->modules = evas_list_remove_list(e_config->modules, e_config->modules);
if (em->name) evas_stringshare_del(em->name); if (em->name) eina_stringshare_del(em->name);
E_FREE(em); E_FREE(em);
} }
while (e_config->font_fallbacks) while (e_config->font_fallbacks)
@ -2133,7 +2133,7 @@ _e_config_free(void)
eff = e_config->font_fallbacks->data; eff = e_config->font_fallbacks->data;
e_config->font_fallbacks = evas_list_remove_list(e_config->font_fallbacks, e_config->font_fallbacks); e_config->font_fallbacks = evas_list_remove_list(e_config->font_fallbacks, e_config->font_fallbacks);
if (eff->name) evas_stringshare_del(eff->name); if (eff->name) eina_stringshare_del(eff->name);
E_FREE(eff); E_FREE(eff);
} }
while (e_config->font_defaults) while (e_config->font_defaults)
@ -2142,8 +2142,8 @@ _e_config_free(void)
efd = e_config->font_defaults->data; efd = e_config->font_defaults->data;
e_config->font_defaults = evas_list_remove_list(e_config->font_defaults, e_config->font_defaults); e_config->font_defaults = evas_list_remove_list(e_config->font_defaults, e_config->font_defaults);
if (efd->text_class) evas_stringshare_del(efd->text_class); if (efd->text_class) eina_stringshare_del(efd->text_class);
if (efd->font) evas_stringshare_del(efd->font); if (efd->font) eina_stringshare_del(efd->font);
E_FREE(efd); E_FREE(efd);
} }
while (e_config->themes) while (e_config->themes)
@ -2152,8 +2152,8 @@ _e_config_free(void)
et = e_config->themes->data; et = e_config->themes->data;
e_config->themes = evas_list_remove_list(e_config->themes, e_config->themes); e_config->themes = evas_list_remove_list(e_config->themes, e_config->themes);
if (et->category) evas_stringshare_del(et->category); if (et->category) eina_stringshare_del(et->category);
if (et->file) evas_stringshare_del(et->file); if (et->file) eina_stringshare_del(et->file);
E_FREE(et); E_FREE(et);
} }
while (e_config->mouse_bindings) while (e_config->mouse_bindings)
@ -2162,8 +2162,8 @@ _e_config_free(void)
eb = e_config->mouse_bindings->data; eb = e_config->mouse_bindings->data;
e_config->mouse_bindings = evas_list_remove_list(e_config->mouse_bindings, e_config->mouse_bindings); e_config->mouse_bindings = evas_list_remove_list(e_config->mouse_bindings, e_config->mouse_bindings);
if (eb->action) evas_stringshare_del(eb->action); if (eb->action) eina_stringshare_del(eb->action);
if (eb->params) evas_stringshare_del(eb->params); if (eb->params) eina_stringshare_del(eb->params);
E_FREE(eb); E_FREE(eb);
} }
while (e_config->key_bindings) while (e_config->key_bindings)
@ -2172,9 +2172,9 @@ _e_config_free(void)
eb = e_config->key_bindings->data; eb = e_config->key_bindings->data;
e_config->key_bindings = evas_list_remove_list(e_config->key_bindings, e_config->key_bindings); e_config->key_bindings = evas_list_remove_list(e_config->key_bindings, e_config->key_bindings);
if (eb->key) evas_stringshare_del(eb->key); if (eb->key) eina_stringshare_del(eb->key);
if (eb->action) evas_stringshare_del(eb->action); if (eb->action) eina_stringshare_del(eb->action);
if (eb->params) evas_stringshare_del(eb->params); if (eb->params) eina_stringshare_del(eb->params);
E_FREE(eb); E_FREE(eb);
} }
while (e_config->signal_bindings) while (e_config->signal_bindings)
@ -2183,10 +2183,10 @@ _e_config_free(void)
eb = e_config->signal_bindings->data; eb = e_config->signal_bindings->data;
e_config->signal_bindings = evas_list_remove_list(e_config->signal_bindings, e_config->signal_bindings); e_config->signal_bindings = evas_list_remove_list(e_config->signal_bindings, e_config->signal_bindings);
if (eb->signal) evas_stringshare_del(eb->signal); if (eb->signal) eina_stringshare_del(eb->signal);
if (eb->source) evas_stringshare_del(eb->source); if (eb->source) eina_stringshare_del(eb->source);
if (eb->action) evas_stringshare_del(eb->action); if (eb->action) eina_stringshare_del(eb->action);
if (eb->params) evas_stringshare_del(eb->params); if (eb->params) eina_stringshare_del(eb->params);
E_FREE(eb); E_FREE(eb);
} }
while (e_config->wheel_bindings) while (e_config->wheel_bindings)
@ -2195,8 +2195,8 @@ _e_config_free(void)
eb = e_config->wheel_bindings->data; eb = e_config->wheel_bindings->data;
e_config->wheel_bindings = evas_list_remove_list(e_config->wheel_bindings, e_config->wheel_bindings); e_config->wheel_bindings = evas_list_remove_list(e_config->wheel_bindings, e_config->wheel_bindings);
if (eb->action) evas_stringshare_del(eb->action); if (eb->action) eina_stringshare_del(eb->action);
if (eb->params) evas_stringshare_del(eb->params); if (eb->params) eina_stringshare_del(eb->params);
E_FREE(eb); E_FREE(eb);
} }
while (e_config->path_append_data) while (e_config->path_append_data)
@ -2204,7 +2204,7 @@ _e_config_free(void)
E_Path_Dir *epd; E_Path_Dir *epd;
epd = e_config->path_append_data->data; epd = e_config->path_append_data->data;
e_config->path_append_data = evas_list_remove_list(e_config->path_append_data, e_config->path_append_data); e_config->path_append_data = evas_list_remove_list(e_config->path_append_data, e_config->path_append_data);
if (epd->dir) evas_stringshare_del(epd->dir); if (epd->dir) eina_stringshare_del(epd->dir);
E_FREE(epd); E_FREE(epd);
} }
while (e_config->path_append_images) while (e_config->path_append_images)
@ -2212,7 +2212,7 @@ _e_config_free(void)
E_Path_Dir *epd; E_Path_Dir *epd;
epd = e_config->path_append_images->data; epd = e_config->path_append_images->data;
e_config->path_append_images = evas_list_remove_list(e_config->path_append_images, e_config->path_append_images); e_config->path_append_images = evas_list_remove_list(e_config->path_append_images, e_config->path_append_images);
if (epd->dir) evas_stringshare_del(epd->dir); if (epd->dir) eina_stringshare_del(epd->dir);
E_FREE(epd); E_FREE(epd);
} }
while (e_config->path_append_fonts) while (e_config->path_append_fonts)
@ -2220,7 +2220,7 @@ _e_config_free(void)
E_Path_Dir *epd; E_Path_Dir *epd;
epd = e_config->path_append_fonts->data; epd = e_config->path_append_fonts->data;
e_config->path_append_fonts = evas_list_remove_list(e_config->path_append_fonts, e_config->path_append_fonts); e_config->path_append_fonts = evas_list_remove_list(e_config->path_append_fonts, e_config->path_append_fonts);
if (epd->dir) evas_stringshare_del(epd->dir); if (epd->dir) eina_stringshare_del(epd->dir);
E_FREE(epd); E_FREE(epd);
} }
while (e_config->path_append_themes) while (e_config->path_append_themes)
@ -2228,7 +2228,7 @@ _e_config_free(void)
E_Path_Dir *epd; E_Path_Dir *epd;
epd = e_config->path_append_themes->data; epd = e_config->path_append_themes->data;
e_config->path_append_themes = evas_list_remove_list(e_config->path_append_themes, e_config->path_append_themes); e_config->path_append_themes = evas_list_remove_list(e_config->path_append_themes, e_config->path_append_themes);
if (epd->dir) evas_stringshare_del(epd->dir); if (epd->dir) eina_stringshare_del(epd->dir);
E_FREE(epd); E_FREE(epd);
} }
while (e_config->path_append_init) while (e_config->path_append_init)
@ -2236,7 +2236,7 @@ _e_config_free(void)
E_Path_Dir *epd; E_Path_Dir *epd;
epd = e_config->path_append_init->data; epd = e_config->path_append_init->data;
e_config->path_append_init = evas_list_remove_list(e_config->path_append_init, e_config->path_append_init); e_config->path_append_init = evas_list_remove_list(e_config->path_append_init, e_config->path_append_init);
if (epd->dir) evas_stringshare_del(epd->dir); if (epd->dir) eina_stringshare_del(epd->dir);
E_FREE(epd); E_FREE(epd);
} }
while (e_config->path_append_icons) while (e_config->path_append_icons)
@ -2244,7 +2244,7 @@ _e_config_free(void)
E_Path_Dir *epd; E_Path_Dir *epd;
epd = e_config->path_append_icons->data; epd = e_config->path_append_icons->data;
e_config->path_append_icons = evas_list_remove_list(e_config->path_append_icons, e_config->path_append_icons); e_config->path_append_icons = evas_list_remove_list(e_config->path_append_icons, e_config->path_append_icons);
if (epd->dir) evas_stringshare_del(epd->dir); if (epd->dir) eina_stringshare_del(epd->dir);
E_FREE(epd); E_FREE(epd);
} }
while (e_config->path_append_modules) while (e_config->path_append_modules)
@ -2252,7 +2252,7 @@ _e_config_free(void)
E_Path_Dir *epd; E_Path_Dir *epd;
epd = e_config->path_append_modules->data; epd = e_config->path_append_modules->data;
e_config->path_append_modules = evas_list_remove_list(e_config->path_append_modules, e_config->path_append_modules); e_config->path_append_modules = evas_list_remove_list(e_config->path_append_modules, e_config->path_append_modules);
if (epd->dir) evas_stringshare_del(epd->dir); if (epd->dir) eina_stringshare_del(epd->dir);
E_FREE(epd); E_FREE(epd);
} }
while (e_config->path_append_backgrounds) while (e_config->path_append_backgrounds)
@ -2260,7 +2260,7 @@ _e_config_free(void)
E_Path_Dir *epd; E_Path_Dir *epd;
epd = e_config->path_append_backgrounds->data; epd = e_config->path_append_backgrounds->data;
e_config->path_append_backgrounds = evas_list_remove_list(e_config->path_append_backgrounds, e_config->path_append_backgrounds); e_config->path_append_backgrounds = evas_list_remove_list(e_config->path_append_backgrounds, e_config->path_append_backgrounds);
if (epd->dir) evas_stringshare_del(epd->dir); if (epd->dir) eina_stringshare_del(epd->dir);
E_FREE(epd); E_FREE(epd);
} }
while (e_config->path_append_messages) while (e_config->path_append_messages)
@ -2268,7 +2268,7 @@ _e_config_free(void)
E_Path_Dir *epd; E_Path_Dir *epd;
epd = e_config->path_append_messages->data; epd = e_config->path_append_messages->data;
e_config->path_append_messages = evas_list_remove_list(e_config->path_append_messages, e_config->path_append_messages); e_config->path_append_messages = evas_list_remove_list(e_config->path_append_messages, e_config->path_append_messages);
if (epd->dir) evas_stringshare_del(epd->dir); if (epd->dir) eina_stringshare_del(epd->dir);
E_FREE(epd); E_FREE(epd);
} }
while (e_config->remembers) while (e_config->remembers)
@ -2277,12 +2277,12 @@ _e_config_free(void)
rem = e_config->remembers->data; rem = e_config->remembers->data;
e_config->remembers = evas_list_remove_list(e_config->remembers, e_config->remembers); e_config->remembers = evas_list_remove_list(e_config->remembers, e_config->remembers);
if (rem->name) evas_stringshare_del(rem->name); if (rem->name) eina_stringshare_del(rem->name);
if (rem->class) evas_stringshare_del(rem->class); if (rem->class) eina_stringshare_del(rem->class);
if (rem->title) evas_stringshare_del(rem->title); if (rem->title) eina_stringshare_del(rem->title);
if (rem->role) evas_stringshare_del(rem->role); if (rem->role) eina_stringshare_del(rem->role);
if (rem->prop.border) evas_stringshare_del(rem->prop.border); if (rem->prop.border) eina_stringshare_del(rem->prop.border);
if (rem->prop.command) evas_stringshare_del(rem->prop.command); if (rem->prop.command) eina_stringshare_del(rem->prop.command);
E_FREE(rem); E_FREE(rem);
} }
@ -2292,25 +2292,25 @@ _e_config_free(void)
cc = e_config->color_classes->data; cc = e_config->color_classes->data;
e_config->color_classes = evas_list_remove_list(e_config->color_classes, e_config->color_classes); e_config->color_classes = evas_list_remove_list(e_config->color_classes, e_config->color_classes);
if (cc->name) evas_stringshare_del(cc->name); if (cc->name) eina_stringshare_del(cc->name);
E_FREE(cc); E_FREE(cc);
} }
if (e_config->init_default_theme) evas_stringshare_del(e_config->init_default_theme); if (e_config->init_default_theme) eina_stringshare_del(e_config->init_default_theme);
if (e_config->desktop_default_background) evas_stringshare_del(e_config->desktop_default_background); if (e_config->desktop_default_background) eina_stringshare_del(e_config->desktop_default_background);
if (e_config->desktop_default_name) evas_stringshare_del(e_config->desktop_default_name); if (e_config->desktop_default_name) eina_stringshare_del(e_config->desktop_default_name);
if (e_config->language) evas_stringshare_del(e_config->language); if (e_config->language) eina_stringshare_del(e_config->language);
if (e_config->transition_start) evas_stringshare_del(e_config->transition_start); if (e_config->transition_start) eina_stringshare_del(e_config->transition_start);
if (e_config->transition_desk) evas_stringshare_del(e_config->transition_desk); if (e_config->transition_desk) eina_stringshare_del(e_config->transition_desk);
if (e_config->transition_change) evas_stringshare_del(e_config->transition_change); if (e_config->transition_change) eina_stringshare_del(e_config->transition_change);
if (e_config->input_method) evas_stringshare_del(e_config->input_method); if (e_config->input_method) eina_stringshare_del(e_config->input_method);
if (e_config->exebuf_term_cmd) evas_stringshare_del(e_config->exebuf_term_cmd); if (e_config->exebuf_term_cmd) eina_stringshare_del(e_config->exebuf_term_cmd);
if (e_config->desklock_personal_passwd) evas_stringshare_del(e_config->desklock_personal_passwd); if (e_config->desklock_personal_passwd) eina_stringshare_del(e_config->desklock_personal_passwd);
if (e_config->desklock_background) evas_stringshare_del(e_config->desklock_background); if (e_config->desklock_background) eina_stringshare_del(e_config->desklock_background);
if (e_config->icon_theme) evas_stringshare_del(e_config->icon_theme); if (e_config->icon_theme) eina_stringshare_del(e_config->icon_theme);
if (e_config->wallpaper_import_last_dev) evas_stringshare_del(e_config->wallpaper_import_last_dev); if (e_config->wallpaper_import_last_dev) eina_stringshare_del(e_config->wallpaper_import_last_dev);
if (e_config->wallpaper_import_last_path) evas_stringshare_del(e_config->wallpaper_import_last_path); if (e_config->wallpaper_import_last_path) eina_stringshare_del(e_config->wallpaper_import_last_path);
if (e_config->theme_default_border_style) evas_stringshare_del(e_config->theme_default_border_style); if (e_config->theme_default_border_style) eina_stringshare_del(e_config->theme_default_border_style);
if (e_config->desklock_custom_desklock_cmd) evas_stringshare_del(e_config->desklock_custom_desklock_cmd); if (e_config->desklock_custom_desklock_cmd) eina_stringshare_del(e_config->desklock_custom_desklock_cmd);
E_FREE(e_config); E_FREE(e_config);
} }
} }

4
src/bin/e_config_data.c
View File

@ -11,8 +11,8 @@ e_config_descriptor_new(const char *name, int size)
eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION; eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION;
eddc.func.mem_alloc = NULL; eddc.func.mem_alloc = NULL;
eddc.func.mem_free = NULL; eddc.func.mem_free = NULL;
eddc.func.str_alloc = (char *(*)(const char *)) evas_stringshare_add; eddc.func.str_alloc = (char *(*)(const char *)) eina_stringshare_add;
eddc.func.str_free = (void (*)(const char *)) evas_stringshare_del; eddc.func.str_free = (void (*)(const char *)) eina_stringshare_del;
eddc.func.list_next = (void *(*)(void *)) evas_list_next; eddc.func.list_next = (void *(*)(void *)) evas_list_next;
eddc.func.list_append = (void *(*)(void *l, void *d)) evas_list_append; eddc.func.list_append = (void *(*)(void *l, void *d)) evas_list_append;
eddc.func.list_data = (void *(*)(void *)) evas_list_data; eddc.func.list_data = (void *(*)(void *)) evas_list_data;

16
src/bin/e_config_dialog.c
View File

@ -28,12 +28,12 @@ e_config_dialog_new(E_Container *con, const char *title, const char *name, const
cfd = E_OBJECT_ALLOC(E_Config_Dialog, E_CONFIG_DIALOG_TYPE, _e_config_dialog_free); cfd = E_OBJECT_ALLOC(E_Config_Dialog, E_CONFIG_DIALOG_TYPE, _e_config_dialog_free);
cfd->view = view; cfd->view = view;
cfd->con = con; cfd->con = con;
cfd->title = evas_stringshare_add(title); cfd->title = eina_stringshare_add(title);
cfd->name = evas_stringshare_add(name); cfd->name = eina_stringshare_add(name);
cfd->class = evas_stringshare_add(class); cfd->class = eina_stringshare_add(class);
if (icon) if (icon)
{ {
cfd->icon = evas_stringshare_add(icon); cfd->icon = eina_stringshare_add(icon);
cfd->icon_size = icon_size; cfd->icon_size = icon_size;
} }
cfd->data = data; cfd->data = data;
@ -140,10 +140,10 @@ _e_config_dialog_free(E_Config_Dialog *cfd)
{ {
_e_config_dialog_list = evas_list_remove(_e_config_dialog_list, cfd); _e_config_dialog_list = evas_list_remove(_e_config_dialog_list, cfd);
if (cfd->auto_apply_timer) _e_config_dialog_cb_auto_apply_timer(cfd); if (cfd->auto_apply_timer) _e_config_dialog_cb_auto_apply_timer(cfd);
if (cfd->title) evas_stringshare_del(cfd->title); if (cfd->title) eina_stringshare_del(cfd->title);
if (cfd->name) evas_stringshare_del(cfd->name); if (cfd->name) eina_stringshare_del(cfd->name);
if (cfd->class) evas_stringshare_del(cfd->class); if (cfd->class) eina_stringshare_del(cfd->class);
if (cfd->icon) evas_stringshare_del(cfd->icon); if (cfd->icon) eina_stringshare_del(cfd->icon);
if (cfd->cfdata) if (cfd->cfdata)
{ {
cfd->view->free_cfdata(cfd, cfd->cfdata); cfd->view->free_cfdata(cfd, cfd->cfdata);

32
src/bin/e_configure.c
View File

@ -184,11 +184,11 @@ _e_configure_registry_item_full_add(const char *path, int pri, const char *label
eci = E_NEW(E_Configure_It, 1); eci = E_NEW(E_Configure_It, 1);
if (!eci) goto done; if (!eci) goto done;
eci->item = evas_stringshare_add(item); eci->item = eina_stringshare_add(item);
eci->pri = pri; eci->pri = pri;
eci->label = evas_stringshare_add(label); eci->label = eina_stringshare_add(label);
if (icon_file) eci->icon_file = evas_stringshare_add(icon_file); if (icon_file) eci->icon_file = eina_stringshare_add(icon_file);
if (icon) eci->icon = evas_stringshare_add(icon); if (icon) eci->icon = eina_stringshare_add(icon);
eci->func = func; eci->func = func;
eci->generic_func = generic_func; eci->generic_func = generic_func;
eci->desktop = desktop; eci->desktop = desktop;
@ -262,10 +262,10 @@ e_configure_registry_item_del(const char *path)
if (!strcmp(item, eci->item)) if (!strcmp(item, eci->item))
{ {
ecat->items = evas_list_remove_list(ecat->items, ll); ecat->items = evas_list_remove_list(ecat->items, ll);
evas_stringshare_del(eci->item); eina_stringshare_del(eci->item);
evas_stringshare_del(eci->label); eina_stringshare_del(eci->label);
evas_stringshare_del(eci->icon); eina_stringshare_del(eci->icon);
if (eci->icon_file) evas_stringshare_del(eci->icon_file); if (eci->icon_file) eina_stringshare_del(eci->icon_file);
if (eci->desktop) efreet_desktop_free(eci->desktop); if (eci->desktop) efreet_desktop_free(eci->desktop);
free(eci); free(eci);
goto done; goto done;
@ -296,11 +296,11 @@ e_configure_registry_category_add(const char *path, int pri, const char *label,
ecat = E_NEW(E_Configure_Cat, 1); ecat = E_NEW(E_Configure_Cat, 1);
if (!ecat) return; if (!ecat) return;
ecat->cat = evas_stringshare_add(path); ecat->cat = eina_stringshare_add(path);
ecat->pri = pri; ecat->pri = pri;
ecat->label = evas_stringshare_add(label); ecat->label = eina_stringshare_add(label);
if (icon_file) ecat->icon_file = evas_stringshare_add(icon_file); if (icon_file) ecat->icon_file = eina_stringshare_add(icon_file);
if (icon) ecat->icon = evas_stringshare_add(icon); if (icon) ecat->icon = eina_stringshare_add(icon);
for (l = e_configure_registry; l; l = l->next) for (l = e_configure_registry; l; l = l->next)
{ {
E_Configure_Cat *ecat2; E_Configure_Cat *ecat2;
@ -332,10 +332,10 @@ e_configure_registry_category_del(const char *path)
{ {
if (ecat->items) goto done; if (ecat->items) goto done;
e_configure_registry = evas_list_remove_list(e_configure_registry, l); e_configure_registry = evas_list_remove_list(e_configure_registry, l);
evas_stringshare_del(ecat->cat); eina_stringshare_del(ecat->cat);
evas_stringshare_del(ecat->label); eina_stringshare_del(ecat->label);
if (ecat->icon) evas_stringshare_del(ecat->icon); if (ecat->icon) eina_stringshare_del(ecat->icon);
if (ecat->icon_file) evas_stringshare_del(ecat->icon_file); if (ecat->icon_file) eina_stringshare_del(ecat->icon_file);
free(ecat); free(ecat);
goto done; goto done;
} }

4
src/bin/e_container.c
View File

@ -116,7 +116,7 @@ e_container_new(E_Manager *man)
con->num = container_num; con->num = container_num;
container_num++; container_num++;
snprintf(name, sizeof(name), _("Container %d"), con->num); snprintf(name, sizeof(name), _("Container %d"), con->num);
con->name = evas_stringshare_add(name); con->name = eina_stringshare_add(name);
/* init layers */ /* init layers */
for (i = 0; i < 7; i++) for (i = 0; i < 7; i++)
@ -967,7 +967,7 @@ _e_container_free(E_Container *con)
{ {
ecore_x_window_del(con->win); ecore_x_window_del(con->win);
} }
if (con->name) evas_stringshare_del(con->name); if (con->name) eina_stringshare_del(con->name);
free(con); free(con);
} }

14
src/bin/e_desk.c
View File

@ -72,7 +72,7 @@ e_desk_new(E_Zone *zone, int x, int y)
(zone->num != cfname->zone)) continue; (zone->num != cfname->zone)) continue;
if ((cfname->desk_x != desk->x) || (cfname->desk_y != desk->y)) if ((cfname->desk_x != desk->x) || (cfname->desk_y != desk->y))
continue; continue;
desk->name = evas_stringshare_add(cfname->name); desk->name = eina_stringshare_add(cfname->name);
ok = 1; ok = 1;
break; break;
} }
@ -80,7 +80,7 @@ e_desk_new(E_Zone *zone, int x, int y)
if (!ok) if (!ok)
{ {
snprintf(name, sizeof(name), _(e_config->desktop_default_name), x, y); snprintf(name, sizeof(name), _(e_config->desktop_default_name), x, y);
desk->name = evas_stringshare_add(name); desk->name = eina_stringshare_add(name);
} }
return desk; return desk;
@ -93,8 +93,8 @@ e_desk_name_set(E_Desk *desk, const char *name)
E_OBJECT_CHECK(desk); E_OBJECT_CHECK(desk);
E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE); E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE);
if (desk->name) evas_stringshare_del(desk->name); if (desk->name) eina_stringshare_del(desk->name);
desk->name = evas_stringshare_add(name); desk->name = eina_stringshare_add(name);
ev = E_NEW(E_Event_Desk_Name_Change, 1); ev = E_NEW(E_Event_Desk_Name_Change, 1);
ev->desk = desk; ev->desk = desk;
@ -114,7 +114,7 @@ e_desk_name_add(int container, int zone, int desk_x, int desk_y, const char *nam
cfname->zone = zone; cfname->zone = zone;
cfname->desk_x = desk_x; cfname->desk_x = desk_x;
cfname->desk_y = desk_y; cfname->desk_y = desk_y;
if (name) cfname->name = evas_stringshare_add(name); if (name) cfname->name = eina_stringshare_add(name);
e_config->desktop_names = evas_list_append(e_config->desktop_names, cfname); e_config->desktop_names = evas_list_append(e_config->desktop_names, cfname);
} }
@ -133,7 +133,7 @@ e_desk_name_del(int container, int zone, int desk_x, int desk_y)
{ {
e_config->desktop_names = e_config->desktop_names =
evas_list_remove_list(e_config->desktop_names, l); evas_list_remove_list(e_config->desktop_names, l);
if (cfname->name) evas_stringshare_del(cfname->name); if (cfname->name) eina_stringshare_del(cfname->name);
free(cfname); free(cfname);
break; break;
} }
@ -507,7 +507,7 @@ e_desk_prev(E_Zone *zone)
static void static void
_e_desk_free(E_Desk *desk) _e_desk_free(E_Desk *desk)
{ {
if (desk->name) evas_stringshare_del(desk->name); if (desk->name) eina_stringshare_del(desk->name);
if (desk->animator) ecore_animator_del(desk->animator); if (desk->animator) ecore_animator_del(desk->animator);
free(desk); free(desk);
} }

4
src/bin/e_dialog.c
View File

@ -160,11 +160,11 @@ e_dialog_border_icon_set(E_Dialog *dia, const char *icon)
if (!border) return; if (!border) return;
if (border->internal_icon) if (border->internal_icon)
{ {
evas_stringshare_del(border->internal_icon); eina_stringshare_del(border->internal_icon);
border->internal_icon = NULL; border->internal_icon = NULL;
} }
if (icon) if (icon)
border->internal_icon = evas_stringshare_add(icon); border->internal_icon = eina_stringshare_add(icon);
} }
EAPI void EAPI void

4
src/bin/e_eap_editor.c
View File

@ -47,8 +47,8 @@ static void _e_desktop_edit_cb_exec_select_cancel(void *data, E_Dialog *
static void _e_desktop_editor_exec_update(E_Config_Dialog_Data *cfdata); static void _e_desktop_editor_exec_update(E_Config_Dialog_Data *cfdata);
static void _e_desktop_edit_select_cb(void *data, Evas_Object *obj); static void _e_desktop_edit_select_cb(void *data, Evas_Object *obj);
#define IFADD(src, dst) if (src) dst = evas_stringshare_add(src); else dst = NULL #define IFADD(src, dst) if (src) dst = eina_stringshare_add(src); else dst = NULL
#define IFDEL(src) if (src) evas_stringshare_del(src); src = NULL; #define IFDEL(src) if (src) eina_stringshare_del(src); src = NULL;
#define IFDUP(src, dst) if (src) dst = strdup(src); else dst = NULL #define IFDUP(src, dst) if (src) dst = strdup(src); else dst = NULL
#define IFFREE(src) if (src) free(src); src = NULL; #define IFFREE(src) if (src) free(src); src = NULL;

4
src/bin/e_exec.c
View File

@ -110,7 +110,7 @@ e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec,
e_object_ref(E_OBJECT(launch->zone)); e_object_ref(E_OBJECT(launch->zone));
} }
if (launch_method) if (launch_method)
launch->launch_method = evas_stringshare_add(launch_method); launch->launch_method = eina_stringshare_add(launch_method);
if (desktop) if (desktop)
{ {
@ -264,7 +264,7 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
if (!remaining) if (!remaining)
{ {
if (launch->launch_method) evas_stringshare_del(launch->launch_method); if (launch->launch_method) eina_stringshare_del(launch->launch_method);
if (launch->zone) e_object_unref(E_OBJECT(launch->zone)); if (launch->zone) e_object_unref(E_OBJECT(launch->zone));
free(launch); free(launch);
} }

28
src/bin/e_exehist.c
View File

@ -84,8 +84,8 @@ e_exehist_add(const char *launch_method, const char *exe)
_e_exehist_unload_queue(); _e_exehist_unload_queue();
return; return;
} }
ei->launch_method = evas_stringshare_add(launch_method); ei->launch_method = eina_stringshare_add(launch_method);
ei->exe = evas_stringshare_add(exe); ei->exe = eina_stringshare_add(exe);
ei->exetime = ecore_time_get(); ei->exetime = ecore_time_get();
_e_exehist->history = evas_list_append(_e_exehist->history, ei); _e_exehist->history = evas_list_append(_e_exehist->history, ei);
_e_exehist_limit(); _e_exehist_limit();
@ -207,8 +207,8 @@ e_exehist_mime_desktop_add(const char *mime, Efreet_Desktop *desktop)
_e_exehist_unload_queue(); _e_exehist_unload_queue();
return; return;
} }
if (ei->exe) evas_stringshare_del(ei->exe); if (ei->exe) eina_stringshare_del(ei->exe);
if (ei->launch_method) evas_stringshare_del(ei->launch_method); if (ei->launch_method) eina_stringshare_del(ei->launch_method);
free(ei); free(ei);
_e_exehist->mimes = evas_list_remove_list(_e_exehist->mimes, l); _e_exehist->mimes = evas_list_remove_list(_e_exehist->mimes, l);
_e_exehist_changes++; _e_exehist_changes++;
@ -221,8 +221,8 @@ e_exehist_mime_desktop_add(const char *mime, Efreet_Desktop *desktop)
_e_exehist_unload_queue(); _e_exehist_unload_queue();
return; return;
} }
ei->launch_method = evas_stringshare_add(mime); ei->launch_method = eina_stringshare_add(mime);
ei->exe = evas_stringshare_add(f); ei->exe = eina_stringshare_add(f);
ei->exetime = ecore_time_get(); ei->exetime = ecore_time_get();
_e_exehist->mimes = evas_list_append(_e_exehist->mimes, ei); _e_exehist->mimes = evas_list_append(_e_exehist->mimes, ei);
_e_exehist_limit(); _e_exehist_limit();
@ -287,8 +287,8 @@ _e_exehist_clear(void)
E_Exehist_Item *ei; E_Exehist_Item *ei;
ei = _e_exehist->history->data; ei = _e_exehist->history->data;
if (ei->exe) evas_stringshare_del(ei->exe); if (ei->exe) eina_stringshare_del(ei->exe);
if (ei->launch_method) evas_stringshare_del(ei->launch_method); if (ei->launch_method) eina_stringshare_del(ei->launch_method);
free(ei); free(ei);
_e_exehist->history = evas_list_remove_list(_e_exehist->history, _e_exehist->history); _e_exehist->history = evas_list_remove_list(_e_exehist->history, _e_exehist->history);
} }
@ -297,8 +297,8 @@ _e_exehist_clear(void)
E_Exehist_Item *ei; E_Exehist_Item *ei;
ei = _e_exehist->mimes->data; ei = _e_exehist->mimes->data;
if (ei->exe) evas_stringshare_del(ei->exe); if (ei->exe) eina_stringshare_del(ei->exe);
if (ei->launch_method) evas_stringshare_del(ei->launch_method); if (ei->launch_method) eina_stringshare_del(ei->launch_method);
free(ei); free(ei);
_e_exehist->mimes = evas_list_remove_list(_e_exehist->mimes, _e_exehist->mimes); _e_exehist->mimes = evas_list_remove_list(_e_exehist->mimes, _e_exehist->mimes);
} }
@ -327,8 +327,8 @@ _e_exehist_limit(void)
E_Exehist_Item *ei; E_Exehist_Item *ei;
ei = _e_exehist->history->data; ei = _e_exehist->history->data;
if (ei->exe) evas_stringshare_del(ei->exe); if (ei->exe) eina_stringshare_del(ei->exe);
if (ei->launch_method) evas_stringshare_del(ei->launch_method); if (ei->launch_method) eina_stringshare_del(ei->launch_method);
free(ei); free(ei);
_e_exehist->history = evas_list_remove_list(_e_exehist->history, _e_exehist->history); _e_exehist->history = evas_list_remove_list(_e_exehist->history, _e_exehist->history);
} }
@ -337,8 +337,8 @@ _e_exehist_limit(void)
E_Exehist_Item *ei; E_Exehist_Item *ei;
ei = _e_exehist->mimes->data; ei = _e_exehist->mimes->data;
if (ei->exe) evas_stringshare_del(ei->exe); if (ei->exe) eina_stringshare_del(ei->exe);
if (ei->launch_method) evas_stringshare_del(ei->launch_method); if (ei->launch_method) eina_stringshare_del(ei->launch_method);
free(ei); free(ei);
_e_exehist->mimes = evas_list_remove_list(_e_exehist->mimes, _e_exehist->mimes); _e_exehist->mimes = evas_list_remove_list(_e_exehist->mimes, _e_exehist->mimes);
} }

6
src/bin/e_filereg.c
View File

@ -50,7 +50,7 @@ e_filereg_register(const char *path)
} }
fi = E_NEW(Filereg_Item, 1); fi = E_NEW(Filereg_Item, 1);
if (!fi) return 0; if (!fi) return 0;
fi->path = evas_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); _e_filereg = evas_hash_add(_e_filereg, path, fi);
return 1; return 1;
@ -68,7 +68,7 @@ e_filereg_deregister(const char *path)
if (fi->ref_count == 0) if (fi->ref_count == 0)
{ {
_e_filereg = evas_hash_del(_e_filereg, path, fi); _e_filereg = evas_hash_del(_e_filereg, path, fi);
if (fi->path) evas_stringshare_del(fi->path); if (fi->path) eina_stringshare_del(fi->path);
E_FREE(fi); E_FREE(fi);
} }
} }
@ -93,7 +93,7 @@ _filereg_hash_cb_free(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED
fi = data; fi = data;
if (!fi) return 1; if (!fi) return 1;
if (fi->path) evas_stringshare_del(fi->path); if (fi->path) eina_stringshare_del(fi->path);
E_FREE(fi); E_FREE(fi);
return 1; return 1;
} }

210
src/bin/e_fm.c
View File

@ -397,6 +397,7 @@ e_fm2_init(void)
const char *homedir; const char *homedir;
char path[PATH_MAX]; char path[PATH_MAX];
eina_stringshare_init();
ecore_job_init(); ecore_job_init();
_e_storage_volume_edd_init(); _e_storage_volume_edd_init();
homedir = e_user_homedir_get(); homedir = e_user_homedir_get();
@ -439,6 +440,7 @@ e_fm2_shutdown(void)
_e_storage_volume_edd_shutdown(); _e_storage_volume_edd_shutdown();
efreet_mime_shutdown(); efreet_mime_shutdown();
ecore_job_shutdown(); ecore_job_shutdown();
eina_stringshare_shutdown();
return 1; return 1;
} }
@ -560,15 +562,15 @@ e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path)
if (sd->realpath) _e_fm2_client_monitor_del(sd->id, sd->realpath); if (sd->realpath) _e_fm2_client_monitor_del(sd->id, sd->realpath);
sd->listing = 0; sd->listing = 0;
if (sd->dev) evas_stringshare_del(sd->dev); if (sd->dev) eina_stringshare_del(sd->dev);
if (sd->path) evas_stringshare_del(sd->path); if (sd->path) eina_stringshare_del(sd->path);
if (sd->realpath) evas_stringshare_del(sd->realpath); if (sd->realpath) eina_stringshare_del(sd->realpath);
sd->dev = sd->path = sd->realpath = NULL; sd->dev = sd->path = sd->realpath = NULL;
sd->order_file = 0; sd->order_file = 0;
if (dev) sd->dev = evas_stringshare_add(dev); if (dev) sd->dev = eina_stringshare_add(dev);
if (path) sd->path = evas_stringshare_add(path); if (path) sd->path = eina_stringshare_add(path);
sd->realpath = realpath; sd->realpath = realpath;
_e_fm2_queue_free(obj); _e_fm2_queue_free(obj);
_e_fm2_regions_free(obj); _e_fm2_regions_free(obj);
@ -663,9 +665,9 @@ e_fm2_custom_theme_set(Evas_Object *obj, const char *path)
if (!sd) return; // safety if (!sd) return; // safety
if (!evas_object_type_get(obj)) return; // safety if (!evas_object_type_get(obj)) return; // safety
if (strcmp(evas_object_type_get(obj), "e_fm")) return; // safety if (strcmp(evas_object_type_get(obj), "e_fm")) return; // safety
if (sd->custom_theme) evas_stringshare_del(sd->custom_theme); if (sd->custom_theme) eina_stringshare_del(sd->custom_theme);
if (path) if (path)
sd->custom_theme = evas_stringshare_add(path); sd->custom_theme = eina_stringshare_add(path);
else else
sd->custom_theme = NULL; sd->custom_theme = NULL;
_e_fm2_theme_edje_object_set(sd, sd->drop, "base/theme/fileman", _e_fm2_theme_edje_object_set(sd, sd->drop, "base/theme/fileman",
@ -685,9 +687,9 @@ e_fm2_custom_theme_content_set(Evas_Object *obj, const char *content)
if (!sd) return; // safety if (!sd) return; // safety
if (!evas_object_type_get(obj)) return; // safety if (!evas_object_type_get(obj)) return; // safety
if (strcmp(evas_object_type_get(obj), "e_fm")) return; // safety if (strcmp(evas_object_type_get(obj), "e_fm")) return; // safety
if (sd->custom_theme) evas_stringshare_del(sd->custom_theme); if (sd->custom_theme) eina_stringshare_del(sd->custom_theme);
if (content) if (content)
sd->custom_theme_content = evas_stringshare_add(content); sd->custom_theme_content = eina_stringshare_add(content);
else else
sd->custom_theme_content = NULL; sd->custom_theme_content = NULL;
_e_fm2_theme_edje_object_set(sd, sd->drop, "base/theme/fileman", _e_fm2_theme_edje_object_set(sd, sd->drop, "base/theme/fileman",
@ -803,10 +805,10 @@ e_fm2_config_set(Evas_Object *obj, E_Fm2_Config *cfg)
sd->config = E_NEW(E_Fm2_Config, 1); sd->config = E_NEW(E_Fm2_Config, 1);
if (!sd->config) return; if (!sd->config) return;
memcpy(sd->config, cfg, sizeof(E_Fm2_Config)); memcpy(sd->config, cfg, sizeof(E_Fm2_Config));
if (cfg->icon.key_hint) sd->config->icon.key_hint = evas_stringshare_add(cfg->icon.key_hint); if (cfg->icon.key_hint) sd->config->icon.key_hint = eina_stringshare_add(cfg->icon.key_hint);
if (cfg->theme.background) sd->config->theme.background = evas_stringshare_add(cfg->theme.background); if (cfg->theme.background) sd->config->theme.background = eina_stringshare_add(cfg->theme.background);
if (cfg->theme.frame) sd->config->theme.frame = evas_stringshare_add(cfg->theme.frame); if (cfg->theme.frame) sd->config->theme.frame = eina_stringshare_add(cfg->theme.frame);
if (cfg->theme.icons) sd->config->theme.icons = evas_stringshare_add(cfg->theme.icons); if (cfg->theme.icons) sd->config->theme.icons = eina_stringshare_add(cfg->theme.icons);
} }
EAPI E_Fm2_Config * EAPI E_Fm2_Config *
@ -1014,7 +1016,7 @@ e_fm2_icons_update(Evas_Object *obj)
ic = l->data; ic = l->data;
if (ic->info.icon) evas_stringshare_del(ic->info.icon); if (ic->info.icon) eina_stringshare_del(ic->info.icon);
ic->info.icon = NULL; ic->info.icon = NULL;
ic->info.icon_type = 0; ic->info.icon_type = 0;
@ -1028,10 +1030,10 @@ e_fm2_icons_update(Evas_Object *obj)
{ {
if (cf->icon.valid) if (cf->icon.valid)
{ {
if (ic->info.icon) evas_stringshare_del(ic->info.icon); if (ic->info.icon) eina_stringshare_del(ic->info.icon);
ic->info.icon = NULL; ic->info.icon = NULL;
if (cf->icon.icon) if (cf->icon.icon)
ic->info.icon = evas_stringshare_add(cf->icon.icon); ic->info.icon = eina_stringshare_add(cf->icon.icon);
ic->info.icon_type = cf->icon.type; ic->info.icon_type = cf->icon.type;
} }
} }
@ -1818,16 +1820,16 @@ _e_fm2_file_force_update(const char *path)
sizeof(struct stat)); sizeof(struct stat));
finf.broken_link = ic->info.broken_link; finf.broken_link = ic->info.broken_link;
if (ic->info.link) if (ic->info.link)
finf.lnk = evas_stringshare_add(ic->info.link); finf.lnk = eina_stringshare_add(ic->info.link);
if (ic->info.real_link) if (ic->info.real_link)
finf.rlnk = evas_stringshare_add(ic->info.real_link); finf.rlnk = eina_stringshare_add(ic->info.real_link);
ic->removable_state_change = 1; ic->removable_state_change = 1;
_e_fm2_live_file_changed(l->data, ecore_file_file_get(path), _e_fm2_live_file_changed(l->data, ecore_file_file_get(path),
&finf); &finf);
if (ic->info.link) if (ic->info.link)
evas_stringshare_del(ic->info.link); eina_stringshare_del(ic->info.link);
if (ic->info.real_link) if (ic->info.real_link)
evas_stringshare_del(ic->info.real_link); eina_stringshare_del(ic->info.real_link);
} }
} }
} }
@ -2297,7 +2299,7 @@ _e_fm2_dev_path_map(const char *dev, const char *path)
buf[len - 1] = 0; buf[len - 1] = 0;
len--; len--;
} }
return evas_stringshare_add(buf); return eina_stringshare_add(buf);
} }
static void static void
@ -2410,7 +2412,7 @@ _e_fm_file_buffer_clear(void)
{ {
while (_e_fm_file_buffer) while (_e_fm_file_buffer)
{ {
evas_stringshare_del(evas_list_data(_e_fm_file_buffer)); eina_stringshare_del(evas_list_data(_e_fm_file_buffer));
_e_fm_file_buffer = evas_list_remove_list(_e_fm_file_buffer, _e_fm_file_buffer); _e_fm_file_buffer = evas_list_remove_list(_e_fm_file_buffer, _e_fm_file_buffer);
} }
@ -2504,7 +2506,7 @@ _e_fm2_file_paste(void *data, E_Menu *m, E_Menu_Item *mi)
/* Check if file is protected. */ /* Check if file is protected. */
if (e_filereg_file_protected(filepath)) if (e_filereg_file_protected(filepath))
{ {
evas_stringshare_del(filepath); eina_stringshare_del(filepath);
paths = evas_list_remove_list(paths, paths); paths = evas_list_remove_list(paths, paths);
continue; continue;
} }
@ -2515,7 +2517,7 @@ _e_fm2_file_paste(void *data, E_Menu *m, E_Menu_Item *mi)
args = _e_fm_string_append_quoted(args, &size, &length, filepath); args = _e_fm_string_append_quoted(args, &size, &length, filepath);
args = _e_fm_string_append_char(args, &size, &length, ' '); args = _e_fm_string_append_char(args, &size, &length, ' ');
evas_stringshare_del(filepath); eina_stringshare_del(filepath);
paths = evas_list_remove_list(paths, paths); paths = evas_list_remove_list(paths, paths);
} }
@ -3111,10 +3113,10 @@ _e_fm2_regions_eval(Evas_Object *obj)
static void static void
_e_fm2_config_free(E_Fm2_Config *cfg) _e_fm2_config_free(E_Fm2_Config *cfg)
{ {
if (cfg->icon.key_hint) evas_stringshare_del(cfg->icon.key_hint); if (cfg->icon.key_hint) eina_stringshare_del(cfg->icon.key_hint);
if (cfg->theme.background) evas_stringshare_del(cfg->theme.background); if (cfg->theme.background) eina_stringshare_del(cfg->theme.background);
if (cfg->theme.frame) evas_stringshare_del(cfg->theme.frame); if (cfg->theme.frame) eina_stringshare_del(cfg->theme.frame);
if (cfg->theme.icons) evas_stringshare_del(cfg->theme.icons); if (cfg->theme.icons) eina_stringshare_del(cfg->theme.icons);
free(cfg); free(cfg);
} }
@ -3157,7 +3159,7 @@ _e_fm2_icon_find(Evas_Object *obj, const char *file)
return NULL; return NULL;
} }
/* Escape illegal caracters within an uri and return an evas_stringshare */ /* Escape illegal caracters within an uri and return an eina_stringshare */
static const char * static const char *
_e_fm2_uri_escape(const char *path) _e_fm2_uri_escape(const char *path)
{ {
@ -3182,7 +3184,7 @@ _e_fm2_uri_escape(const char *path)
} }
} }
return evas_stringshare_add(dest); return eina_stringshare_add(dest);
} }
/* Parse a single uri and return an E_Fm2_Uri struct. /* Parse a single uri and return an E_Fm2_Uri struct.
@ -3228,9 +3230,9 @@ _e_fm2_uri_parse(const char *val)
} }
uri = E_NEW(E_Fm2_Uri, 1); uri = E_NEW(E_Fm2_Uri, 1);
if (hostname[0]) uri->hostname = evas_stringshare_add(hostname); if (hostname[0]) uri->hostname = eina_stringshare_add(hostname);
else uri->hostname = NULL; else uri->hostname = NULL;
uri->path = evas_stringshare_add(path); uri->path = eina_stringshare_add(path);
return uri; return uri;
} }
@ -3257,9 +3259,9 @@ _e_fm2_uri_path_list_get(Evas_List *uri_list)
path_list = evas_list_append(path_list, uri->path); path_list = evas_list_append(path_list, uri->path);
} }
else else
evas_stringshare_del(uri->path); eina_stringshare_del(uri->path);
if (uri->hostname) evas_stringshare_del(uri->hostname); if (uri->hostname) eina_stringshare_del(uri->hostname);
E_FREE(uri); E_FREE(uri);
} }
@ -3303,11 +3305,11 @@ _e_fm2_icon_new(E_Fm2_Smart_Data *sd, const char *file, E_Fm2_Finfo *finf)
ic = E_NEW(E_Fm2_Icon, 1); ic = E_NEW(E_Fm2_Icon, 1);
ic->info.fm = sd->obj; ic->info.fm = sd->obj;
ic->info.ic = ic; ic->info.ic = ic;
ic->info.file = evas_stringshare_add(file); ic->info.file = eina_stringshare_add(file);
ic->sd = sd; ic->sd = sd;
if (!_e_fm2_icon_fill(ic, finf)) if (!_e_fm2_icon_fill(ic, finf))
{ {
evas_stringshare_del(ic->info.file); eina_stringshare_del(ic->info.file);
free(ic); free(ic);
return NULL; return NULL;
} }
@ -3317,14 +3319,14 @@ _e_fm2_icon_new(E_Fm2_Smart_Data *sd, const char *file, E_Fm2_Finfo *finf)
static void static void
_e_fm2_icon_unfill(E_Fm2_Icon *ic) _e_fm2_icon_unfill(E_Fm2_Icon *ic)
{ {
if (ic->info.mime) evas_stringshare_del(ic->info.mime); if (ic->info.mime) eina_stringshare_del(ic->info.mime);
if (ic->info.label) evas_stringshare_del(ic->info.label); if (ic->info.label) eina_stringshare_del(ic->info.label);
if (ic->info.comment) evas_stringshare_del(ic->info.comment); if (ic->info.comment) eina_stringshare_del(ic->info.comment);
if (ic->info.generic) evas_stringshare_del(ic->info.generic); if (ic->info.generic) eina_stringshare_del(ic->info.generic);
if (ic->info.icon) evas_stringshare_del(ic->info.icon); if (ic->info.icon) eina_stringshare_del(ic->info.icon);
if (ic->info.link) evas_stringshare_del(ic->info.link); if (ic->info.link) eina_stringshare_del(ic->info.link);
if (ic->info.real_link) evas_stringshare_del(ic->info.real_link); if (ic->info.real_link) eina_stringshare_del(ic->info.real_link);
if (ic->info.category) evas_stringshare_del(ic->info.category); if (ic->info.category) eina_stringshare_del(ic->info.category);
ic->info.mime = NULL; ic->info.mime = NULL;
ic->info.label = NULL; ic->info.label = NULL;
ic->info.comment = NULL; ic->info.comment = NULL;
@ -3377,9 +3379,9 @@ _e_fm2_icon_fill(E_Fm2_Icon *ic, E_Fm2_Finfo *finf)
{ {
memcpy(&(ic->info.statinfo), &(finf->st), sizeof(struct stat)); memcpy(&(ic->info.statinfo), &(finf->st), sizeof(struct stat));
if ((finf->lnk) && (finf->lnk[0])) if ((finf->lnk) && (finf->lnk[0]))
ic->info.link = evas_stringshare_add(finf->lnk); ic->info.link = eina_stringshare_add(finf->lnk);
if ((finf->rlnk) && (finf->rlnk[0])) if ((finf->rlnk) && (finf->rlnk[0]))
ic->info.real_link = evas_stringshare_add(finf->rlnk); ic->info.real_link = eina_stringshare_add(finf->rlnk);
ic->info.broken_link = finf->broken_link; ic->info.broken_link = finf->broken_link;
} }
else else
@ -3400,8 +3402,8 @@ _e_fm2_icon_fill(E_Fm2_Icon *ic, E_Fm2_Finfo *finf)
{ {
if (lnk[0] == '/') if (lnk[0] == '/')
{ {
ic->info.link = evas_stringshare_add(lnk); ic->info.link = eina_stringshare_add(lnk);
ic->info.real_link = evas_stringshare_add(lnk); ic->info.real_link = eina_stringshare_add(lnk);
} }
else else
{ {
@ -3411,10 +3413,10 @@ _e_fm2_icon_fill(E_Fm2_Icon *ic, E_Fm2_Finfo *finf)
rp = ecore_file_realpath(buf); rp = ecore_file_realpath(buf);
if (rp) if (rp)
{ {
ic->info.link = evas_stringshare_add(rp); ic->info.link = eina_stringshare_add(rp);
free(rp); free(rp);
} }
ic->info.real_link = evas_stringshare_add(lnk); ic->info.real_link = eina_stringshare_add(lnk);
} }
free(lnk); free(lnk);
} }
@ -3423,12 +3425,12 @@ _e_fm2_icon_fill(E_Fm2_Icon *ic, E_Fm2_Finfo *finf)
if (S_ISDIR(ic->info.statinfo.st_mode)) if (S_ISDIR(ic->info.statinfo.st_mode))
{ {
ic->info.mime = evas_stringshare_add("inode/directory"); ic->info.mime = eina_stringshare_add("inode/directory");
} }
if (!ic->info.mime) if (!ic->info.mime)
{ {
mime = e_fm_mime_filename_get(ic->info.file); mime = e_fm_mime_filename_get(ic->info.file);
if (mime) ic->info.mime = evas_stringshare_add(mime); if (mime) ic->info.mime = eina_stringshare_add(mime);
} }
if ((e_util_glob_case_match(ic->info.file, "*.desktop")) || if ((e_util_glob_case_match(ic->info.file, "*.desktop")) ||
@ -3441,9 +3443,9 @@ _e_fm2_icon_fill(E_Fm2_Icon *ic, E_Fm2_Finfo *finf)
{ {
if (cf->icon.icon) if (cf->icon.icon)
{ {
if (ic->info.icon) evas_stringshare_del(ic->info.icon); if (ic->info.icon) eina_stringshare_del(ic->info.icon);
ic->info.icon = NULL; ic->info.icon = NULL;
ic->info.icon = evas_stringshare_add(cf->icon.icon); ic->info.icon = eina_stringshare_add(cf->icon.icon);
} }
ic->info.icon_type = cf->icon.type; ic->info.icon_type = cf->icon.type;
} }
@ -3586,15 +3588,15 @@ _e_fm2_icon_free(E_Fm2_Icon *ic)
e_object_del(E_OBJECT(ic->prop_dialog)); e_object_del(E_OBJECT(ic->prop_dialog));
ic->prop_dialog = NULL; ic->prop_dialog = NULL;
} }
if (ic->info.file) evas_stringshare_del(ic->info.file); if (ic->info.file) eina_stringshare_del(ic->info.file);
if (ic->info.mime) evas_stringshare_del(ic->info.mime); if (ic->info.mime) eina_stringshare_del(ic->info.mime);
if (ic->info.label) evas_stringshare_del(ic->info.label); if (ic->info.label) eina_stringshare_del(ic->info.label);
if (ic->info.comment) evas_stringshare_del(ic->info.comment); if (ic->info.comment) eina_stringshare_del(ic->info.comment);
if (ic->info.generic) evas_stringshare_del(ic->info.generic); if (ic->info.generic) eina_stringshare_del(ic->info.generic);
if (ic->info.icon) evas_stringshare_del(ic->info.icon); if (ic->info.icon) eina_stringshare_del(ic->info.icon);
if (ic->info.link) evas_stringshare_del(ic->info.link); if (ic->info.link) eina_stringshare_del(ic->info.link);
if (ic->info.real_link) evas_stringshare_del(ic->info.real_link); if (ic->info.real_link) eina_stringshare_del(ic->info.real_link);
if (ic->info.category) evas_stringshare_del(ic->info.category); if (ic->info.category) eina_stringshare_del(ic->info.category);
free(ic); free(ic);
} }
@ -3843,7 +3845,7 @@ _e_fm2_icon_desktop_url_eval(const char *val)
path = p; path = p;
while (*path == '/') path++; while (*path == '/') path++;
path--; path--;
s = evas_stringshare_add(path); s = eina_stringshare_add(path);
free(p); free(p);
return s; return s;
} }
@ -3863,10 +3865,10 @@ _e_fm2_icon_desktop_load(E_Fm2_Icon *ic)
ic->info.removable = 0; ic->info.removable = 0;
ic->info.removable_full = 0; ic->info.removable_full = 0;
if (desktop->name) ic->info.label = evas_stringshare_add(desktop->name); if (desktop->name) ic->info.label = eina_stringshare_add(desktop->name);
if (desktop->generic_name) ic->info.generic = evas_stringshare_add(desktop->generic_name); if (desktop->generic_name) ic->info.generic = eina_stringshare_add(desktop->generic_name);
if (desktop->comment) ic->info.comment = evas_stringshare_add(desktop->comment); if (desktop->comment) ic->info.comment = eina_stringshare_add(desktop->comment);
if (desktop->icon) ic->info.icon = evas_stringshare_add(desktop->icon); if (desktop->icon) ic->info.icon = eina_stringshare_add(desktop->icon);
if (desktop->url) if (desktop->url)
ic->info.link = _e_fm2_icon_desktop_url_eval(desktop->url); ic->info.link = _e_fm2_icon_desktop_url_eval(desktop->url);
if (desktop->x) if (desktop->x)
@ -3902,12 +3904,12 @@ _e_fm2_icon_desktop_load(E_Fm2_Icon *ic)
return 1; return 1;
error: error:
if (ic->info.label) evas_stringshare_del(ic->info.label); if (ic->info.label) eina_stringshare_del(ic->info.label);
if (ic->info.comment) evas_stringshare_del(ic->info.comment); if (ic->info.comment) eina_stringshare_del(ic->info.comment);
if (ic->info.generic) evas_stringshare_del(ic->info.generic); if (ic->info.generic) eina_stringshare_del(ic->info.generic);
if (ic->info.icon) evas_stringshare_del(ic->info.icon); if (ic->info.icon) eina_stringshare_del(ic->info.icon);
if (ic->info.link) evas_stringshare_del(ic->info.link); if (ic->info.link) eina_stringshare_del(ic->info.link);
if (ic->info.category) evas_stringshare_del(ic->info.category); if (ic->info.category) eina_stringshare_del(ic->info.category);
ic->info.label = NULL; ic->info.label = NULL;
ic->info.comment = NULL; ic->info.comment = NULL;
ic->info.generic = NULL; ic->info.generic = NULL;
@ -4882,7 +4884,7 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
args = _e_fm_string_append_quoted(args, &size, &length, fp); args = _e_fm_string_append_quoted(args, &size, &length, fp);
args = _e_fm_string_append_char(args, &size, &length, ' '); args = _e_fm_string_append_char(args, &size, &length, ' ');
evas_stringshare_del(fp); eina_stringshare_del(fp);
} }
if (adjust_icons) if (adjust_icons)
{ {
@ -4917,7 +4919,7 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
args = _e_fm_string_append_quoted(args, &size, &length, fp); args = _e_fm_string_append_quoted(args, &size, &length, fp);
args = _e_fm_string_append_char(args, &size, &length, ' '); args = _e_fm_string_append_char(args, &size, &length, ' ');
evas_stringshare_del(fp); eina_stringshare_del(fp);
} }
snprintf(dirpath, sizeof(dirpath), "%s/%s", sd->realpath, sd->drop_icon->info.file); snprintf(dirpath, sizeof(dirpath), "%s/%s", sd->realpath, sd->drop_icon->info.file);
@ -4946,7 +4948,7 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
_e_fm_file_reorder(ecore_file_file_get(fp), sd->realpath, sd->drop_icon->info.file, sd->drop_after); _e_fm_file_reorder(ecore_file_file_get(fp), sd->realpath, sd->drop_icon->info.file, sd->drop_after);
evas_stringshare_del(fp); eina_stringshare_del(fp);
} }
args = _e_fm_string_append_quoted(args, &size, &length, sd->realpath); args = _e_fm_string_append_quoted(args, &size, &length, sd->realpath);
@ -4962,7 +4964,7 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
args = _e_fm_string_append_quoted(args, &size, &length, fp); args = _e_fm_string_append_quoted(args, &size, &length, fp);
args = _e_fm_string_append_char(args, &size, &length, ' '); args = _e_fm_string_append_char(args, &size, &length, ' ');
evas_stringshare_del(fp); eina_stringshare_del(fp);
} }
args = _e_fm_string_append_quoted(args, &size, &length, sd->realpath); args = _e_fm_string_append_quoted(args, &size, &length, sd->realpath);
} }
@ -5233,8 +5235,8 @@ _e_fm2_cb_drag_finished(E_Drag *drag, int dropped)
if (ic->obj_icon) evas_object_show(ic->obj_icon); if (ic->obj_icon) evas_object_show(ic->obj_icon);
} }
if (uri->hostname) evas_stringshare_del(uri->hostname); if (uri->hostname) eina_stringshare_del(uri->hostname);
evas_stringshare_del(uri->path); eina_stringshare_del(uri->path);
E_FREE(uri); E_FREE(uri);
} }
else else
@ -5365,7 +5367,7 @@ _e_fm2_cb_icon_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_inf
} }
sel = strcat(sel, s); sel = strcat(sel, s);
sel = strcat(sel, "\r\n"); sel = strcat(sel, "\r\n");
evas_stringshare_del(s); eina_stringshare_del(s);
ici->ic->drag.dnd = 1; ici->ic->drag.dnd = 1;
if (ici->ic->obj) evas_object_hide(ici->ic->obj); if (ici->ic->obj) evas_object_hide(ici->ic->obj);
@ -6152,10 +6154,10 @@ _e_fm2_smart_del(Evas_Object *obj)
if (sd->scroll_job) ecore_job_del(sd->scroll_job); if (sd->scroll_job) ecore_job_del(sd->scroll_job);
if (sd->resize_job) ecore_job_del(sd->resize_job); if (sd->resize_job) ecore_job_del(sd->resize_job);
if (sd->refresh_job) ecore_job_del(sd->refresh_job); if (sd->refresh_job) ecore_job_del(sd->refresh_job);
if (sd->custom_theme) evas_stringshare_del(sd->custom_theme); if (sd->custom_theme) eina_stringshare_del(sd->custom_theme);
if (sd->custom_theme_content) evas_stringshare_del(sd->custom_theme_content); if (sd->custom_theme_content) eina_stringshare_del(sd->custom_theme_content);
if (sd->dev) evas_stringshare_del(sd->dev); if (sd->dev) eina_stringshare_del(sd->dev);
if (sd->path) evas_stringshare_del(sd->path); if (sd->path) eina_stringshare_del(sd->path);
if (sd->mount) if (sd->mount)
{ {
e_fm2_hal_unmount(sd->mount); e_fm2_hal_unmount(sd->mount);
@ -6163,7 +6165,7 @@ _e_fm2_smart_del(Evas_Object *obj)
} }
if (sd->realpath) if (sd->realpath)
{ {
evas_stringshare_del(sd->realpath); eina_stringshare_del(sd->realpath);
} }
sd->dev = sd->path = sd->realpath = NULL; sd->dev = sd->path = sd->realpath = NULL;
if (sd->config) _e_fm2_config_free(sd->config); if (sd->config) _e_fm2_config_free(sd->config);
@ -7522,12 +7524,12 @@ _e_fm2_live_file_add(Evas_Object *obj, const char *file, const char *file_rel, i
if (!a) return; if (!a) return;
sd->live.actions = evas_list_append(sd->live.actions, a); sd->live.actions = evas_list_append(sd->live.actions, a);
a->type = FILE_ADD; a->type = FILE_ADD;
a->file = evas_stringshare_add(file); a->file = eina_stringshare_add(file);
if (file_rel) a->file2 = evas_stringshare_add(file_rel); if (file_rel) a->file2 = eina_stringshare_add(file_rel);
a->flags = after; a->flags = after;
if (finf) memcpy(&(a->finf), finf, sizeof(E_Fm2_Finfo)); if (finf) memcpy(&(a->finf), finf, sizeof(E_Fm2_Finfo));
if (a->finf.lnk) a->finf.lnk = evas_stringshare_add(a->finf.lnk); if (a->finf.lnk) a->finf.lnk = eina_stringshare_add(a->finf.lnk);
if (a->finf.rlnk) a->finf.rlnk = evas_stringshare_add(a->finf.rlnk); if (a->finf.rlnk) a->finf.rlnk = eina_stringshare_add(a->finf.rlnk);
_e_fm2_live_process_begin(obj); _e_fm2_live_process_begin(obj);
} }
@ -7543,7 +7545,7 @@ _e_fm2_live_file_del(Evas_Object *obj, const char *file)
if (!a) return; if (!a) return;
sd->live.actions = evas_list_append(sd->live.actions, a); sd->live.actions = evas_list_append(sd->live.actions, a);
a->type = FILE_DEL; a->type = FILE_DEL;
a->file = evas_stringshare_add(file); a->file = eina_stringshare_add(file);
_e_fm2_live_process_begin(obj); _e_fm2_live_process_begin(obj);
} }
@ -7559,10 +7561,10 @@ _e_fm2_live_file_changed(Evas_Object *obj, const char *file, E_Fm2_Finfo *finf)
if (!a) return; if (!a) return;
sd->live.actions = evas_list_append(sd->live.actions, a); sd->live.actions = evas_list_append(sd->live.actions, a);
a->type = FILE_CHANGE; a->type = FILE_CHANGE;
a->file = evas_stringshare_add(file); a->file = eina_stringshare_add(file);
if (finf) memcpy(&(a->finf), finf, sizeof(E_Fm2_Finfo)); if (finf) memcpy(&(a->finf), finf, sizeof(E_Fm2_Finfo));
if (a->finf.lnk) a->finf.lnk = evas_stringshare_add(a->finf.lnk); if (a->finf.lnk) a->finf.lnk = eina_stringshare_add(a->finf.lnk);
if (a->finf.rlnk) a->finf.rlnk = evas_stringshare_add(a->finf.rlnk); if (a->finf.rlnk) a->finf.rlnk = eina_stringshare_add(a->finf.rlnk);
_e_fm2_live_process_begin(obj); _e_fm2_live_process_begin(obj);
} }
@ -7591,10 +7593,10 @@ _e_fm2_live_process_end(Evas_Object *obj)
{ {
a = sd->live.actions->data; a = sd->live.actions->data;
sd->live.actions = evas_list_remove_list(sd->live.actions, sd->live.actions); sd->live.actions = evas_list_remove_list(sd->live.actions, sd->live.actions);
if (a->file) evas_stringshare_del(a->file); if (a->file) eina_stringshare_del(a->file);
if (a->file2) evas_stringshare_del(a->file2); if (a->file2) eina_stringshare_del(a->file2);
if (a->finf.lnk) evas_stringshare_del(a->finf.lnk); if (a->finf.lnk) eina_stringshare_del(a->finf.lnk);
if (a->finf.rlnk) evas_stringshare_del(a->finf.rlnk); if (a->finf.rlnk) eina_stringshare_del(a->finf.rlnk);
free(a); free(a);
} }
if (sd->live.idler) if (sd->live.idler)
@ -7697,10 +7699,10 @@ _e_fm2_live_process(Evas_Object *obj)
default: default:
break; break;
} }
if (a->file) evas_stringshare_del(a->file); if (a->file) eina_stringshare_del(a->file);
if (a->file2) evas_stringshare_del(a->file2); if (a->file2) eina_stringshare_del(a->file2);
if (a->finf.lnk) evas_stringshare_del(a->finf.lnk); if (a->finf.lnk) eina_stringshare_del(a->finf.lnk);
if (a->finf.rlnk) evas_stringshare_del(a->finf.rlnk); if (a->finf.rlnk) eina_stringshare_del(a->finf.rlnk);
free(a); free(a);
} }
@ -7778,7 +7780,7 @@ _e_fm2_theme_edje_object_set(E_Fm2_Smart_Data *sd, Evas_Object *o, const char *c
{ {
if (!ecore_file_exists(sd->custom_theme)) if (!ecore_file_exists(sd->custom_theme))
{ {
evas_stringshare_del(sd->custom_theme); eina_stringshare_del(sd->custom_theme);
sd->custom_theme = NULL; sd->custom_theme = NULL;
} }
} }
@ -7805,7 +7807,7 @@ _e_fm2_theme_edje_icon_object_set(E_Fm2_Smart_Data *sd, Evas_Object *o, const ch
{ {
if (!ecore_file_exists(sd->custom_theme)) if (!ecore_file_exists(sd->custom_theme))
{ {
evas_stringshare_del(sd->custom_theme); eina_stringshare_del(sd->custom_theme);
sd->custom_theme = NULL; sd->custom_theme = NULL;
} }
} }

24
src/bin/e_fm_custom.c
View File

@ -36,8 +36,8 @@ e_fm2_custom_file_init(void)
eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION; eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION;
eddc.func.mem_alloc = NULL; eddc.func.mem_alloc = NULL;
eddc.func.mem_free = NULL; eddc.func.mem_free = NULL;
eddc.func.str_alloc = (char *(*)(const char *)) evas_stringshare_add; eddc.func.str_alloc = (char *(*)(const char *)) eina_stringshare_add;
eddc.func.str_free = (void (*)(const char *)) evas_stringshare_del; eddc.func.str_free = (void (*)(const char *)) eina_stringshare_del;
eddc.func.list_next = (void *(*)(void *)) evas_list_next; eddc.func.list_next = (void *(*)(void *)) evas_list_next;
eddc.func.list_append = (void *(*)(void *l, void *d)) evas_list_append; eddc.func.list_append = (void *(*)(void *l, void *d)) evas_list_append;
eddc.func.list_data = (void *(*)(void *)) evas_list_data; eddc.func.list_data = (void *(*)(void *)) evas_list_data;
@ -108,9 +108,9 @@ e_fm2_custom_file_set(const char *path, E_Fm2_Custom_File *cf)
{ {
memcpy(cf2, cf, sizeof(E_Fm2_Custom_File)); memcpy(cf2, cf, sizeof(E_Fm2_Custom_File));
if (cf->icon.icon) if (cf->icon.icon)
cf2->icon.icon = evas_stringshare_add(cf->icon.icon); cf2->icon.icon = eina_stringshare_add(cf->icon.icon);
if (cf->label) if (cf->label)
cf2->label = evas_stringshare_add(cf->label); cf2->label = eina_stringshare_add(cf->label);
_e_fm2_custom_hash = evas_hash_add(_e_fm2_custom_hash, path, cf2); _e_fm2_custom_hash = evas_hash_add(_e_fm2_custom_hash, path, cf2);
} }
} }
@ -137,8 +137,8 @@ e_fm2_custom_file_del(const char *path)
{ {
_e_fm2_custom_hash = evas_hash_del(_e_fm2_custom_hash, _e_fm2_custom_hash = evas_hash_del(_e_fm2_custom_hash,
l->data, cf2); l->data, cf2);
if (cf2->icon.icon) evas_stringshare_del(cf2->icon.icon); if (cf2->icon.icon) eina_stringshare_del(cf2->icon.icon);
if (cf2->label) evas_stringshare_del(cf2->label); if (cf2->label) eina_stringshare_del(cf2->label);
free(cf2); free(cf2);
} }
} }
@ -163,8 +163,8 @@ e_fm2_custom_file_rename(const char *path, const char *new_path)
cf = evas_hash_find(_e_fm2_custom_hash, new_path); cf = evas_hash_find(_e_fm2_custom_hash, new_path);
if (cf) if (cf)
{ {
if (cf->icon.icon) evas_stringshare_del(cf->icon.icon); if (cf->icon.icon) eina_stringshare_del(cf->icon.icon);
if (cf->label) evas_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); _e_fm2_custom_hash = evas_hash_add(_e_fm2_custom_hash, new_path, cf2);
@ -186,8 +186,8 @@ e_fm2_custom_file_rename(const char *path, const char *new_path)
cf = evas_hash_find(_e_fm2_custom_hash, buf); cf = evas_hash_find(_e_fm2_custom_hash, buf);
if (cf) if (cf)
{ {
if (cf->icon.icon) evas_stringshare_del(cf->icon.icon); if (cf->icon.icon) eina_stringshare_del(cf->icon.icon);
if (cf->label) evas_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, _e_fm2_custom_hash = evas_hash_add(_e_fm2_custom_hash,
@ -276,8 +276,8 @@ _e_fm2_custom_file_hash_foreach(const Evas_Hash *hash, const char *key, void *da
E_Fm2_Custom_File *cf; E_Fm2_Custom_File *cf;
cf = data; cf = data;
if (cf->icon.icon) evas_stringshare_del(cf->icon.icon); if (cf->icon.icon) eina_stringshare_del(cf->icon.icon);
if (cf->label) evas_stringshare_del(cf->label); if (cf->label) eina_stringshare_del(cf->label);
free(cf); free(cf);
return 1; return 1;
} }

8
src/bin/e_fm_hal.c
View File

@ -398,8 +398,8 @@ e_fm2_hal_mount_del(E_Fm2_Mount *m)
{ {
if (!m) return; if (!m) return;
if (m->udi) evas_stringshare_del(m->udi); if (m->udi) eina_stringshare_del(m->udi);
if (m->mount_point) evas_stringshare_del(m->mount_point); if (m->mount_point) eina_stringshare_del(m->mount_point);
if (m->timeout) if (m->timeout)
{ {
@ -439,7 +439,7 @@ e_fm2_hal_mount(E_Volume *v,
m = calloc(1, sizeof(E_Fm2_Mount)); m = calloc(1, sizeof(E_Fm2_Mount));
if (!m) return NULL; if (!m) return NULL;
m->udi = evas_stringshare_add(v->udi); m->udi = eina_stringshare_add(v->udi);
m->mount_ok = mount_ok; m->mount_ok = mount_ok;
m->mount_fail = mount_fail; m->mount_fail = mount_fail;
m->unmount_ok = unmount_ok; m->unmount_ok = unmount_ok;
@ -480,7 +480,7 @@ _e_fm2_hal_mount_ok(E_Fm2_Mount *m)
if (!m) return; if (!m) return;
m->mounted = 1; m->mounted = 1;
if (m->volume) m->mount_point = evas_stringshare_add(m->volume->mount_point); if (m->volume) m->mount_point = eina_stringshare_add(m->volume->mount_point);
if (m->timeout) if (m->timeout)
{ {
ecore_timer_del(m->timeout); ecore_timer_del(m->timeout);

49
src/bin/e_fm_main.c
View File

@ -33,6 +33,7 @@
#include <Evas.h> #include <Evas.h>
#include <Efreet.h> #include <Efreet.h>
#include <Eet.h> #include <Eet.h>
#include <eina_stringshare.h>
#include "config.h" #include "config.h"
#define E_TYPEDEFS #define E_TYPEDEFS
@ -256,7 +257,7 @@ main(int argc, char **argv)
} }
ecore_init(); ecore_init();
ecore_string_init(); eina_stringshare_init();
ecore_app_args_set(argc, (const char **)argv); ecore_app_args_set(argc, (const char **)argv);
ecore_file_init(); ecore_file_init();
ecore_ipc_init(); ecore_ipc_init();
@ -321,7 +322,7 @@ main(int argc, char **argv)
ecore_ipc_shutdown(); ecore_ipc_shutdown();
ecore_file_shutdown(); ecore_file_shutdown();
ecore_string_shutdown(); eina_stringshare_shutdown();
ecore_shutdown(); ecore_shutdown();
return 0; return 0;
@ -1001,7 +1002,7 @@ _e_fm_monitor_start(int id, const char *path)
task->id = id; task->id = id;
task->type = E_FM_OP_MONITOR_START; task->type = E_FM_OP_MONITOR_START;
task->slave = NULL; task->slave = NULL;
task->src = evas_stringshare_add(path); task->src = eina_stringshare_add(path);
task->dst = NULL; task->dst = NULL;
task->rel = NULL; task->rel = NULL;
task->rel_to = 0; task->rel_to = 0;
@ -1055,7 +1056,7 @@ _e_fm_monitor_start_try(E_Fm_Task *task)
/* create a new dir entry */ /* create a new dir entry */
ed = calloc(1, sizeof(E_Dir)); ed = calloc(1, sizeof(E_Dir));
ed->id = task->id; ed->id = task->id;
ed->dir = evas_stringshare_add(task->src); ed->dir = eina_stringshare_add(task->src);
if (!ped) if (!ped)
{ {
/* if no previous monitoring dir exists - this one /* if no previous monitoring dir exists - this one
@ -1241,9 +1242,9 @@ _e_fm_task_remove(E_Fm_Task *task)
_e_fm_tasks = evas_list_remove_list(_e_fm_tasks, l); _e_fm_tasks = evas_list_remove_list(_e_fm_tasks, l);
if(task->src) evas_stringshare_del(task->src); if(task->src) eina_stringshare_del(task->src);
if(task->dst) evas_stringshare_del(task->dst); if(task->dst) eina_stringshare_del(task->dst);
if(task->rel) evas_stringshare_del(task->rel); if(task->rel) eina_stringshare_del(task->rel);
free(task); free(task);
} }
@ -1275,9 +1276,9 @@ _e_fm_mkdir(int id, const char *src, const char *rel, int rel_to, int x, int y)
task->id = id; task->id = id;
task->type = E_FM_OP_MKDIR; task->type = E_FM_OP_MKDIR;
task->slave = NULL; task->slave = NULL;
task->src = evas_stringshare_add(src); task->src = eina_stringshare_add(src);
task->dst = NULL; task->dst = NULL;
task->rel = evas_stringshare_add(rel); task->rel = eina_stringshare_add(rel);
task->x = x; task->x = x;
task->y = y; task->y = y;
@ -1353,7 +1354,7 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
if (fop) if (fop)
{ {
fop->id = e->ref; fop->id = e->ref;
fop->src = evas_stringshare_add(e->data); fop->src = eina_stringshare_add(e->data);
_e_fops = evas_list_append(_e_fops, fop); _e_fops = evas_list_append(_e_fops, fop);
fop->idler = ecore_idler_add(_e_cb_fop_trash_idler, fop); fop->idler = ecore_idler_add(_e_cb_fop_trash_idler, fop);
} }
@ -1538,13 +1539,13 @@ static int _e_fm_slave_run(E_Fm_Op_Type type, const char *args, int id)
if (!slave) return 0; if (!slave) return 0;
command = evas_stringshare_add(_e_prepare_command(type, args)); command = eina_stringshare_add(_e_prepare_command(type, args));
slave->id = id; slave->id = id;
slave->exe = ecore_exe_pipe_run(command, ECORE_EXE_PIPE_WRITE | ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_ERROR, slave ); slave->exe = ecore_exe_pipe_run(command, ECORE_EXE_PIPE_WRITE | ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_ERROR, slave );
// printf("EFM command: %s\n", command); // printf("EFM command: %s\n", command);
evas_stringshare_del(command); eina_stringshare_del(command);
_e_fm_slaves = evas_list_append(_e_fm_slaves, slave); _e_fm_slaves = evas_list_append(_e_fm_slaves, slave);
@ -1776,7 +1777,7 @@ _e_cb_recent_clean(void *data)
{ {
ed->recent_mods = evas_list_remove_list(ed->recent_mods, pl); ed->recent_mods = evas_list_remove_list(ed->recent_mods, pl);
if (!m->done) _e_file_add_mod(ed, m->path, 5, 0); if (!m->done) _e_file_add_mod(ed, m->path, 5, 0);
evas_stringshare_del(m->path); eina_stringshare_del(m->path);
free(m); free(m);
} }
} }
@ -1824,7 +1825,7 @@ _e_file_add_mod(E_Dir *ed, const char *path, E_Fm_Op_Type op, int listing)
if (!skip) if (!skip)
{ {
m = calloc(1, sizeof(E_Mod)); m = calloc(1, sizeof(E_Mod));
m->path = evas_stringshare_add(path); m->path = eina_stringshare_add(path);
m->mod = 1; m->mod = 1;
m->done = 1; m->done = 1;
m->timestamp = t_now; m->timestamp = t_now;
@ -2000,15 +2001,15 @@ _e_cb_fop_trash_idler(void *data)
/* Check that 'home trash' and subsequesnt dirs exists, create if not */ /* Check that 'home trash' and subsequesnt dirs exists, create if not */
snprintf(buf, sizeof(buf), "%s/Trash", efreet_data_home_get()); snprintf(buf, sizeof(buf), "%s/Trash", efreet_data_home_get());
trash_dir = evas_stringshare_add(buf); trash_dir = eina_stringshare_add(buf);
snprintf(buf, sizeof(buf), "%s/files", trash_dir); snprintf(buf, sizeof(buf), "%s/files", trash_dir);
if (!ecore_file_mkpath(buf)) return 0; if (!ecore_file_mkpath(buf)) return 0;
snprintf(buf, sizeof(buf), "%s/info", trash_dir); snprintf(buf, sizeof(buf), "%s/info", trash_dir);
if (!ecore_file_mkpath(buf)) return 0; if (!ecore_file_mkpath(buf)) return 0;
filename = evas_stringshare_add(strrchr(fop->src, '/')); filename = eina_stringshare_add(strrchr(fop->src, '/'));
escname = ecore_file_escape_name(filename); escname = ecore_file_escape_name(filename);
evas_stringshare_del(filename); eina_stringshare_del(filename);
/* Find path for info file. Pointer address is part of the filename to /* Find path for info file. Pointer address is part of the filename to
* alleviate some of the looping in case of multiple filenames with the * alleviate some of the looping in case of multiple filenames with the
@ -2019,7 +2020,7 @@ _e_cb_fop_trash_idler(void *data)
fop, i++); fop, i++);
} }
while (ecore_file_exists(buf)); while (ecore_file_exists(buf));
dest = evas_stringshare_add(buf); dest = eina_stringshare_add(buf);
/* Try to move the file */ /* Try to move the file */
if (rename(fop->src, dest)) if (rename(fop->src, dest))
@ -2052,10 +2053,10 @@ _e_cb_fop_trash_idler(void *data)
/* Could not create info file. Spec says to put orig file back */ /* Could not create info file. Spec says to put orig file back */
rename(dest, fop->src); rename(dest, fop->src);
if (dest) evas_stringshare_del(dest); if (dest) eina_stringshare_del(dest);
if (trash_dir) evas_stringshare_del(trash_dir); if (trash_dir) eina_stringshare_del(trash_dir);
evas_stringshare_del(fop->src); eina_stringshare_del(fop->src);
evas_stringshare_del(fop->dst); eina_stringshare_del(fop->dst);
free(fop); free(fop);
_e_fops = evas_list_remove(_e_fops, fop); _e_fops = evas_list_remove(_e_fops, fop);
return 0; return 0;
@ -2160,7 +2161,7 @@ _e_fm_reorder(const char *file, const char *dst, const char *relative, int after
static void static void
_e_dir_del(E_Dir *ed) _e_dir_del(E_Dir *ed)
{ {
evas_stringshare_del(ed->dir); eina_stringshare_del(ed->dir);
if (ed->idler) ecore_idler_del(ed->idler); if (ed->idler) ecore_idler_del(ed->idler);
if (ed->recent_clean) if (ed->recent_clean)
ecore_timer_del(ed->recent_clean); ecore_timer_del(ed->recent_clean);
@ -2169,7 +2170,7 @@ _e_dir_del(E_Dir *ed)
E_Mod *m; E_Mod *m;
m = ed->recent_mods->data; m = ed->recent_mods->data;
evas_stringshare_del(m->path); eina_stringshare_del(m->path);
free(m); free(m);
ed->recent_mods = evas_list_remove_list(ed->recent_mods, ed->recent_mods); ed->recent_mods = evas_list_remove_list(ed->recent_mods, ed->recent_mods);
} }

12
src/bin/e_fm_mime.c
View File

@ -106,7 +106,7 @@ e_fm_mime_icon_get(const char *mime)
return NULL; return NULL;
ok: ok:
val = (char *)evas_stringshare_add(buf); val = (char *)eina_stringshare_add(buf);
icon_map = evas_hash_add(icon_map, mime, val); icon_map = evas_hash_add(icon_map, mime, val);
return val; return val;
} }
@ -119,7 +119,7 @@ e_fm_mime_icon_cache_flush(void)
evas_hash_foreach(icon_map, _e_fm_mime_icon_foreach, &freelist); evas_hash_foreach(icon_map, _e_fm_mime_icon_foreach, &freelist);
while (freelist) while (freelist)
{ {
evas_stringshare_del(freelist->data); eina_stringshare_del(freelist->data);
freelist = evas_list_remove_list(freelist, freelist); freelist = evas_list_remove_list(freelist, freelist);
} }
evas_hash_free(icon_map); evas_hash_free(icon_map);
@ -141,8 +141,8 @@ e_fm2_mime_handler_new(const char *label, const char *icon_group,
handler = E_NEW(E_Fm2_Mime_Handler, 1); handler = E_NEW(E_Fm2_Mime_Handler, 1);
if (!handler) return NULL; if (!handler) return NULL;
handler->label = evas_stringshare_add(label); handler->label = eina_stringshare_add(label);
handler->icon_group = icon_group ? evas_stringshare_add(icon_group) : NULL; handler->icon_group = icon_group ? eina_stringshare_add(icon_group) : NULL;
handler->action_func = action_func; handler->action_func = action_func;
handler->action_data = action_data; handler->action_data = action_data;
handler->test_func = test_func; handler->test_func = test_func;
@ -156,8 +156,8 @@ e_fm2_mime_handler_free(E_Fm2_Mime_Handler *handler)
{ {
if (!handler) return; if (!handler) return;
evas_stringshare_del(handler->label); eina_stringshare_del(handler->label);
if (handler->icon_group) evas_stringshare_del(handler->icon_group); if (handler->icon_group) eina_stringshare_del(handler->icon_group);
E_FREE(handler); E_FREE(handler);
} }

44
src/bin/e_fm_op.c
View File

@ -23,6 +23,8 @@
#include <Ecore.h> #include <Ecore.h>
#include <Ecore_File.h> #include <Ecore_File.h>
#include <eina_stringshare.h>
#define E_TYPEDEFS #define E_TYPEDEFS
#include "e_fm_op.h" #include "e_fm_op.h"
#undef E_TYPEDEFS #undef E_TYPEDEFS
@ -181,10 +183,10 @@ main(int argc, char **argv)
name = ecore_file_file_get(argv[i]); name = ecore_file_file_get(argv[i]);
task = _e_fm_op_task_new(); task = _e_fm_op_task_new();
task->type = type; task->type = type;
task->src.name = evas_stringshare_add(argv[i]); task->src.name = eina_stringshare_add(argv[i]);
snprintf(buf, PATH_MAX, "%s%s%s", argv[last], byte, name); snprintf(buf, PATH_MAX, "%s%s%s", argv[last], byte, name);
task->dst.name = evas_stringshare_add(buf); task->dst.name = eina_stringshare_add(buf);
if (type == E_FM_OP_MOVE && rename(task->src.name, task->dst.name) == 0) if (type == E_FM_OP_MOVE && rename(task->src.name, task->dst.name) == 0)
_e_fm_op_task_free(task); _e_fm_op_task_free(task);
@ -201,8 +203,8 @@ main(int argc, char **argv)
task = _e_fm_op_task_new(); task = _e_fm_op_task_new();
task->type = type; task->type = type;
task->src.name = evas_stringshare_add(argv[2]); task->src.name = eina_stringshare_add(argv[2]);
task->dst.name = evas_stringshare_add(argv[3]); task->dst.name = eina_stringshare_add(argv[3]);
_e_fm_op_scan_queue = evas_list_append(_e_fm_op_scan_queue, task); _e_fm_op_scan_queue = evas_list_append(_e_fm_op_scan_queue, task);
} }
@ -222,7 +224,7 @@ main(int argc, char **argv)
{ {
task = _e_fm_op_task_new(); task = _e_fm_op_task_new();
task->type = type; task->type = type;
task->src.name = evas_stringshare_add(argv[i]); task->src.name = eina_stringshare_add(argv[i]);
_e_fm_op_scan_queue = evas_list_append(_e_fm_op_scan_queue, task); _e_fm_op_scan_queue = evas_list_append(_e_fm_op_scan_queue, task);
@ -281,9 +283,9 @@ _e_fm_op_task_free(void *t)
return; return;
if (task->src.name) if (task->src.name)
evas_stringshare_del(task->src.name); eina_stringshare_del(task->src.name);
if (task->dst.name) if (task->dst.name)
evas_stringshare_del(task->dst.name); eina_stringshare_del(task->dst.name);
if (task->data) if (task->data)
{ {
@ -730,12 +732,12 @@ _e_fm_op_scan_idler(void *data)
ntask->type = E_FM_OP_COPY_STAT_INFO; ntask->type = E_FM_OP_COPY_STAT_INFO;
ntask->src.name = evas_stringshare_add(task->src.name); ntask->src.name = eina_stringshare_add(task->src.name);
memcpy(&(ntask->src.st), &(task->src.st), sizeof(struct stat)); memcpy(&(ntask->src.st), &(task->src.st), sizeof(struct stat));
if (task->dst.name) if (task->dst.name)
{ {
ntask->dst.name = evas_stringshare_add(task->dst.name); ntask->dst.name = eina_stringshare_add(task->dst.name);
} }
else else
{ {
@ -765,13 +767,13 @@ _e_fm_op_scan_idler(void *data)
snprintf(buf, sizeof(buf), "%s/%s", task->src.name, snprintf(buf, sizeof(buf), "%s/%s", task->src.name,
de->d_name); de->d_name);
ntask->src.name = evas_stringshare_add(buf); ntask->src.name = eina_stringshare_add(buf);
if (task->dst.name) if (task->dst.name)
{ {
snprintf(buf, sizeof(buf), "%s/%s", task->dst.name, snprintf(buf, sizeof(buf), "%s/%s", task->dst.name,
de->d_name); de->d_name);
ntask->dst.name = evas_stringshare_add(buf); ntask->dst.name = eina_stringshare_add(buf);
} }
else else
{ {
@ -1319,10 +1321,10 @@ _e_fm_op_scan_atom(E_Fm_Op_Task * task)
_e_fm_op_update_progress(NULL, 0, task->src.st.st_size); _e_fm_op_update_progress(NULL, 0, task->src.st.st_size);
ctask = _e_fm_op_task_new(); ctask = _e_fm_op_task_new();
ctask->src.name = evas_stringshare_add(task->src.name); ctask->src.name = eina_stringshare_add(task->src.name);
memcpy(&(ctask->src.st), &(task->src.st), sizeof(struct stat)); memcpy(&(ctask->src.st), &(task->src.st), sizeof(struct stat));
if (task->dst.name) if (task->dst.name)
ctask->dst.name = evas_stringshare_add(task->dst.name); ctask->dst.name = eina_stringshare_add(task->dst.name);
ctask->type = E_FM_OP_COPY; ctask->type = E_FM_OP_COPY;
_e_fm_op_work_queue = evas_list_append(_e_fm_op_work_queue, ctask); _e_fm_op_work_queue = evas_list_append(_e_fm_op_work_queue, ctask);
@ -1332,10 +1334,10 @@ _e_fm_op_scan_atom(E_Fm_Op_Task * task)
_e_fm_op_update_progress(NULL, 0, REMOVECHUNKSIZE); _e_fm_op_update_progress(NULL, 0, REMOVECHUNKSIZE);
ctask = _e_fm_op_task_new(); ctask = _e_fm_op_task_new();
ctask->src.name = evas_stringshare_add(task->src.name); ctask->src.name = eina_stringshare_add(task->src.name);
memcpy(&(ctask->src.st), &(task->src.st), sizeof(struct stat)); memcpy(&(ctask->src.st), &(task->src.st), sizeof(struct stat));
if (task->dst.name) if (task->dst.name)
ctask->dst.name = evas_stringshare_add(task->dst.name); ctask->dst.name = eina_stringshare_add(task->dst.name);
ctask->type = E_FM_OP_COPY_STAT_INFO; ctask->type = E_FM_OP_COPY_STAT_INFO;
_e_fm_op_work_queue = evas_list_append(_e_fm_op_work_queue, ctask); _e_fm_op_work_queue = evas_list_append(_e_fm_op_work_queue, ctask);
@ -1345,10 +1347,10 @@ _e_fm_op_scan_atom(E_Fm_Op_Task * task)
_e_fm_op_update_progress(NULL, 0, REMOVECHUNKSIZE); _e_fm_op_update_progress(NULL, 0, REMOVECHUNKSIZE);
rtask = _e_fm_op_task_new(); rtask = _e_fm_op_task_new();
rtask->src.name = evas_stringshare_add(task->src.name); rtask->src.name = eina_stringshare_add(task->src.name);
memcpy(&(rtask->src.st), &(task->src.st), sizeof(struct stat)); memcpy(&(rtask->src.st), &(task->src.st), sizeof(struct stat));
if (task->dst.name) if (task->dst.name)
rtask->dst.name = evas_stringshare_add(task->dst.name); rtask->dst.name = eina_stringshare_add(task->dst.name);
rtask->type = E_FM_OP_REMOVE; rtask->type = E_FM_OP_REMOVE;
_e_fm_op_work_queue = evas_list_prepend(_e_fm_op_work_queue, rtask); _e_fm_op_work_queue = evas_list_prepend(_e_fm_op_work_queue, rtask);
@ -1360,10 +1362,10 @@ _e_fm_op_scan_atom(E_Fm_Op_Task * task)
_e_fm_op_update_progress(NULL, 0, task->src.st.st_size); _e_fm_op_update_progress(NULL, 0, task->src.st.st_size);
ctask = _e_fm_op_task_new(); ctask = _e_fm_op_task_new();
ctask->src.name = evas_stringshare_add(task->src.name); ctask->src.name = eina_stringshare_add(task->src.name);
memcpy(&(ctask->src.st), &(task->src.st), sizeof(struct stat)); memcpy(&(ctask->src.st), &(task->src.st), sizeof(struct stat));
if (task->dst.name) if (task->dst.name)
ctask->dst.name = evas_stringshare_add(task->dst.name); ctask->dst.name = eina_stringshare_add(task->dst.name);
ctask->type = E_FM_OP_COPY; ctask->type = E_FM_OP_COPY;
_e_fm_op_work_queue = evas_list_prepend(_e_fm_op_work_queue, ctask); _e_fm_op_work_queue = evas_list_prepend(_e_fm_op_work_queue, ctask);
@ -1372,10 +1374,10 @@ _e_fm_op_scan_atom(E_Fm_Op_Task * task)
_e_fm_op_update_progress(NULL, 0, REMOVECHUNKSIZE); _e_fm_op_update_progress(NULL, 0, REMOVECHUNKSIZE);
rtask = _e_fm_op_task_new(); rtask = _e_fm_op_task_new();
rtask->src.name = evas_stringshare_add(task->src.name); rtask->src.name = eina_stringshare_add(task->src.name);
memcpy(&(rtask->src.st), &(task->src.st), sizeof(struct stat)); memcpy(&(rtask->src.st), &(task->src.st), sizeof(struct stat));
if (task->dst.name) if (task->dst.name)
rtask->dst.name = evas_stringshare_add(task->dst.name); rtask->dst.name = eina_stringshare_add(task->dst.name);
rtask->type = E_FM_OP_REMOVE; rtask->type = E_FM_OP_REMOVE;
/* We put remove task after the separator. Work idler won't go /* We put remove task after the separator. Work idler won't go

16
src/bin/e_fm_prop.c
View File

@ -233,7 +233,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
if (strcmp(mi->mime, cfdata->mime)) continue; if (strcmp(mi->mime, cfdata->mime)) continue;
if (mi->icon) if (mi->icon)
{ {
evas_stringshare_del(mi->icon); eina_stringshare_del(mi->icon);
mi->icon = NULL; mi->icon = NULL;
} }
found = 1; found = 1;
@ -242,7 +242,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
if ((!found) && (cfdata->icon_type != 0)) if ((!found) && (cfdata->icon_type != 0))
{ {
mi = E_NEW(E_Config_Mime_Icon, 1); mi = E_NEW(E_Config_Mime_Icon, 1);
mi->mime = evas_stringshare_add(cfdata->mime); mi->mime = eina_stringshare_add(cfdata->mime);
e_config->mime_icons = evas_list_append(e_config->mime_icons, mi); e_config->mime_icons = evas_list_append(e_config->mime_icons, mi);
} }
/* FIXME: modify mime info */ /* FIXME: modify mime info */
@ -251,18 +251,18 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
if (found) if (found)
{ {
e_config->mime_icons = evas_list_remove(e_config->mime_icons, mi); e_config->mime_icons = evas_list_remove(e_config->mime_icons, mi);
if (mi->mime) evas_stringshare_del(mi->mime); if (mi->mime) eina_stringshare_del(mi->mime);
if (mi->icon) evas_stringshare_del(mi->icon); if (mi->icon) eina_stringshare_del(mi->icon);
free(mi); free(mi);
} }
} }
else if (cfdata->icon_type == 1) else if (cfdata->icon_type == 1)
{ {
mi->icon = evas_stringshare_add("THUMB"); mi->icon = eina_stringshare_add("THUMB");
} }
else if (cfdata->icon_type == 2) else if (cfdata->icon_type == 2)
{ {
mi->icon = evas_stringshare_add(cfdata->icon); mi->icon = eina_stringshare_add(cfdata->icon);
} }
e_config_save_queue(); e_config_save_queue();
e_fm_mime_icon_cache_flush(); e_fm_mime_icon_cache_flush();
@ -276,10 +276,10 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
cf->icon.type = cfdata->icon_type; cf->icon.type = cfdata->icon_type;
if (cf->icon.icon) if (cf->icon.icon)
evas_stringshare_del(cf->icon.icon); eina_stringshare_del(cf->icon.icon);
cf->icon.icon = NULL; cf->icon.icon = NULL;
if (cfdata->icon_type == 2) if (cfdata->icon_type == 2)
cf->icon.icon = evas_stringshare_add(cfdata->icon); cf->icon.icon = eina_stringshare_add(cfdata->icon);
if (cfdata->icon_type == 0) if (cfdata->icon_type == 0)
cf->icon.valid = 0; cf->icon.valid = 0;
else else

40
src/bin/e_font.c
View File

@ -111,7 +111,7 @@ e_font_available_list(void)
efa = E_NEW(E_Font_Available, 1); efa = E_NEW(E_Font_Available, 1);
evas_font = l->data; evas_font = l->data;
efa->name = evas_stringshare_add(evas_font); efa->name = eina_stringshare_add(evas_font);
e_fonts = evas_list_append(e_fonts, efa); e_fonts = evas_list_append(e_fonts, efa);
} }
@ -129,7 +129,7 @@ e_font_available_list_free(Evas_List *available)
{ {
efa = available->data; efa = available->data;
available = evas_list_remove_list(available, available); available = evas_list_remove_list(available, available);
if (efa->name) evas_stringshare_del(efa->name); if (efa->name) eina_stringshare_del(efa->name);
E_FREE(efa); E_FREE(efa);
} }
} }
@ -142,11 +142,11 @@ e_font_properties_free(E_Font_Properties *efp)
const char *str; const char *str;
str = efp->styles->data; str = efp->styles->data;
if (str) evas_stringshare_del(str); if (str) eina_stringshare_del(str);
efp->styles = evas_list_remove_list(efp->styles, efp->styles); efp->styles = evas_list_remove_list(efp->styles, efp->styles);
} }
if (efp->name) evas_stringshare_del(efp->name); if (efp->name) eina_stringshare_del(efp->name);
free(efp); free(efp);
} }
@ -207,7 +207,7 @@ _e_font_fontconfig_name_parse(Evas_Hash **font_hash, E_Font_Properties *efp, con
if (efp == NULL) if (efp == NULL)
{ {
efp = calloc(1, sizeof(E_Font_Properties)); efp = calloc(1, sizeof(E_Font_Properties));
efp->name = evas_stringshare_add(name); efp->name = eina_stringshare_add(name);
if (font_hash) *font_hash = evas_hash_add(*font_hash, name, efp); if (font_hash) *font_hash = evas_hash_add(*font_hash, name, efp);
} }
s2 = strchr(style, ','); s2 = strchr(style, ',');
@ -219,11 +219,11 @@ _e_font_fontconfig_name_parse(Evas_Hash **font_hash, E_Font_Properties *efp, con
style_old = style; style_old = style;
style = calloc(sizeof(char), len + 1); style = calloc(sizeof(char), len + 1);
strncpy(style, style_old, len); strncpy(style, style_old, len);
efp->styles = evas_list_append(efp->styles, evas_stringshare_add(style)); efp->styles = evas_list_append(efp->styles, eina_stringshare_add(style));
free(style); free(style);
} }
else else
efp->styles = evas_list_append(efp->styles, evas_stringshare_add(style)); efp->styles = evas_list_append(efp->styles, eina_stringshare_add(style));
} }
free(name); free(name);
} }
@ -233,7 +233,7 @@ _e_font_fontconfig_name_parse(Evas_Hash **font_hash, E_Font_Properties *efp, con
if (efp == NULL) if (efp == NULL)
{ {
efp = calloc(1, sizeof(E_Font_Properties)); efp = calloc(1, sizeof(E_Font_Properties));
efp->name = evas_stringshare_add(font); efp->name = eina_stringshare_add(font);
if (font_hash) *font_hash = evas_hash_add(*font_hash, font, efp); if (font_hash) *font_hash = evas_hash_add(*font_hash, font, efp);
} }
} }
@ -285,9 +285,9 @@ e_font_fontconfig_name_get(const char *name, const char *style)
char buf[256]; char buf[256];
if (name == NULL) return NULL; if (name == NULL) return NULL;
if (style == NULL || style[0] == 0) return evas_stringshare_add(name); if (style == NULL || style[0] == 0) return eina_stringshare_add(name);
snprintf(buf, 256, "%s"E_TOK_STYLE"%s", name, style); snprintf(buf, 256, "%s"E_TOK_STYLE"%s", name, style);
return evas_stringshare_add(buf); return eina_stringshare_add(buf);
} }
EAPI void EAPI void
@ -300,7 +300,7 @@ e_font_fallback_clear(void)
eff = e_config->font_fallbacks->data; eff = e_config->font_fallbacks->data;
e_config->font_fallbacks = e_config->font_fallbacks =
evas_list_remove_list(e_config->font_fallbacks, e_config->font_fallbacks); evas_list_remove_list(e_config->font_fallbacks, e_config->font_fallbacks);
if (eff->name) evas_stringshare_del(eff->name); if (eff->name) eina_stringshare_del(eff->name);
E_FREE(eff); E_FREE(eff);
} }
} }
@ -313,7 +313,7 @@ e_font_fallback_append(const char *font)
e_font_fallback_remove(font); e_font_fallback_remove(font);
eff = E_NEW(E_Font_Fallback, 1); eff = E_NEW(E_Font_Fallback, 1);
eff->name = evas_stringshare_add(font); eff->name = eina_stringshare_add(font);
e_config->font_fallbacks = evas_list_append(e_config->font_fallbacks, eff); e_config->font_fallbacks = evas_list_append(e_config->font_fallbacks, eff);
} }
@ -325,7 +325,7 @@ e_font_fallback_prepend(const char *font)
e_font_fallback_remove(font); e_font_fallback_remove(font);
eff = E_NEW(E_Font_Fallback, 1); eff = E_NEW(E_Font_Fallback, 1);
eff->name = evas_stringshare_add(font); eff->name = eina_stringshare_add(font);
e_config->font_fallbacks = evas_list_prepend(e_config->font_fallbacks, eff); e_config->font_fallbacks = evas_list_prepend(e_config->font_fallbacks, eff);
} }
@ -343,7 +343,7 @@ e_font_fallback_remove(const char *font)
{ {
e_config->font_fallbacks = e_config->font_fallbacks =
evas_list_remove_list(e_config->font_fallbacks, next); evas_list_remove_list(e_config->font_fallbacks, next);
if (eff->name) evas_stringshare_del(eff->name); if (eff->name) eina_stringshare_del(eff->name);
E_FREE(eff); E_FREE(eff);
break; break;
} }
@ -368,8 +368,8 @@ e_font_default_set(const char *text_class, const char *font, Evas_Font_Size size
efd = evas_list_data(next); efd = evas_list_data(next);
if (!strcmp(efd->text_class, text_class)) if (!strcmp(efd->text_class, text_class))
{ {
if (efd->font) evas_stringshare_del(efd->font); if (efd->font) eina_stringshare_del(efd->font);
efd->font = evas_stringshare_add(font); efd->font = eina_stringshare_add(font);
efd->size = size; efd->size = size;
/* move to the front of the list */ /* move to the front of the list */
e_config->font_defaults = e_config->font_defaults =
@ -382,8 +382,8 @@ e_font_default_set(const char *text_class, const char *font, Evas_Font_Size size
/* the text class doesnt exist */ /* the text class doesnt exist */
efd = E_NEW(E_Font_Default, 1); efd = E_NEW(E_Font_Default, 1);
efd->text_class = evas_stringshare_add(text_class); efd->text_class = eina_stringshare_add(text_class);
efd->font = evas_stringshare_add(font); efd->font = eina_stringshare_add(font);
efd->size = size; efd->size = size;
e_config->font_defaults = evas_list_prepend(e_config->font_defaults, efd); e_config->font_defaults = evas_list_prepend(e_config->font_defaults, efd);
@ -431,8 +431,8 @@ e_font_default_remove(const char *text_class)
{ {
e_config->font_defaults = e_config->font_defaults =
evas_list_remove_list(e_config->font_defaults, next); evas_list_remove_list(e_config->font_defaults, next);
if (efd->text_class) evas_stringshare_del(efd->text_class); if (efd->text_class) eina_stringshare_del(efd->text_class);
if (efd->font) evas_stringshare_del(efd->font); if (efd->font) eina_stringshare_del(efd->font);
E_FREE(efd); E_FREE(efd);
edje_text_class_del(text_class); edje_text_class_del(text_class);
return; return;

44
src/bin/e_gadcon.c
View File

@ -263,12 +263,12 @@ e_gadcon_swallowed_new(const char *name, int id, Evas_Object *obj, char *swallow
gc = E_OBJECT_ALLOC(E_Gadcon, E_GADCON_TYPE, _e_gadcon_free); gc = E_OBJECT_ALLOC(E_Gadcon, E_GADCON_TYPE, _e_gadcon_free);
if (!gc) return NULL; if (!gc) return NULL;
gc->name = evas_stringshare_add(name); gc->name = eina_stringshare_add(name);
gc->id = id; gc->id = id;
gc->layout_policy = E_GADCON_LAYOUT_POLICY_PANEL; gc->layout_policy = E_GADCON_LAYOUT_POLICY_PANEL;
gc->edje.o_parent = obj; gc->edje.o_parent = obj;
gc->edje.swallow_name = evas_stringshare_add(swallow_name); gc->edje.swallow_name = eina_stringshare_add(swallow_name);
gc->orient = E_GADCON_ORIENT_HORIZ; gc->orient = E_GADCON_ORIENT_HORIZ;
gc->evas = evas_object_evas_get(obj); gc->evas = evas_object_evas_get(obj);
@ -307,7 +307,7 @@ e_gadcon_swallowed_new(const char *name, int id, Evas_Object *obj, char *swallow
if (!gc->cf) if (!gc->cf)
{ {
gc->cf = E_NEW(E_Config_Gadcon, 1); gc->cf = E_NEW(E_Config_Gadcon, 1);
gc->cf->name = evas_stringshare_add(gc->name); gc->cf->name = eina_stringshare_add(gc->name);
gc->cf->id = gc->id; gc->cf->id = gc->id;
e_config->gadcons = evas_list_append(e_config->gadcons, gc->cf); e_config->gadcons = evas_list_append(e_config->gadcons, gc->cf);
e_config_save_queue(); e_config_save_queue();
@ -388,7 +388,7 @@ e_gadcon_populate(E_Gadcon *gc)
if ((!cf_gcc->id) && if ((!cf_gcc->id) &&
(_e_gadcon_client_class_feature_check(cc, "id_new", cc->func.id_new))) (_e_gadcon_client_class_feature_check(cc, "id_new", cc->func.id_new)))
cf_gcc->id = evas_stringshare_add(cc->func.id_new()); cf_gcc->id = eina_stringshare_add(cc->func.id_new());
if (!cf_gcc->style) if (!cf_gcc->style)
{ {
@ -470,7 +470,7 @@ e_gadcon_populate_class(E_Gadcon *gc, const E_Gadcon_Client_Class *cc)
if ((!cf_gcc->id) && if ((!cf_gcc->id) &&
(_e_gadcon_client_class_feature_check(cc, "id_new", cc->func.id_new))) (_e_gadcon_client_class_feature_check(cc, "id_new", cc->func.id_new)))
cf_gcc->id = evas_stringshare_add(cc->func.id_new()); cf_gcc->id = eina_stringshare_add(cc->func.id_new());
gcc = cc->func.init(gc, cf_gcc->name, cf_gcc->id, gcc = cc->func.init(gc, cf_gcc->name, cf_gcc->id,
cf_gcc->style); cf_gcc->style);
@ -747,8 +747,8 @@ e_gadcon_client_config_new(E_Gadcon *gc, const char *name)
cf_gcc = E_NEW(E_Config_Gadcon_Client, 1); cf_gcc = E_NEW(E_Config_Gadcon_Client, 1);
if (!cf_gcc) return NULL; if (!cf_gcc) return NULL;
cf_gcc->name = evas_stringshare_add(name); cf_gcc->name = eina_stringshare_add(name);
cf_gcc->id = evas_stringshare_add(cc->func.id_new()); cf_gcc->id = eina_stringshare_add(cc->func.id_new());
cf_gcc->geom.res = 800; cf_gcc->geom.res = 800;
cf_gcc->geom.size = 80; cf_gcc->geom.size = 80;
cf_gcc->geom.pos = cf_gcc->geom.res - cf_gcc->geom.size; cf_gcc->geom.pos = cf_gcc->geom.res - cf_gcc->geom.size;
@ -765,9 +765,9 @@ e_gadcon_client_config_del(E_Config_Gadcon *cf_gc, E_Config_Gadcon_Client *cf_gc
{ {
if (!cf_gcc) return; if (!cf_gcc) return;
if (cf_gcc->name) evas_stringshare_del(cf_gcc->name); if (cf_gcc->name) eina_stringshare_del(cf_gcc->name);
if (cf_gcc->id) evas_stringshare_del(cf_gcc->id); if (cf_gcc->id) eina_stringshare_del(cf_gcc->id);
if (cf_gcc->style) evas_stringshare_del(cf_gcc->style); if (cf_gcc->style) eina_stringshare_del(cf_gcc->style);
if (cf_gc) cf_gc->clients = evas_list_remove(cf_gc->clients, cf_gcc); if (cf_gc) cf_gc->clients = evas_list_remove(cf_gc->clients, cf_gcc);
free(cf_gcc); free(cf_gcc);
} }
@ -781,7 +781,7 @@ e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id, const char *
E_OBJECT_TYPE_CHECK_RETURN(gc, E_GADCON_TYPE, NULL); E_OBJECT_TYPE_CHECK_RETURN(gc, E_GADCON_TYPE, NULL);
gcc = E_OBJECT_ALLOC(E_Gadcon_Client, E_GADCON_CLIENT_TYPE, _e_gadcon_client_free); gcc = E_OBJECT_ALLOC(E_Gadcon_Client, E_GADCON_CLIENT_TYPE, _e_gadcon_client_free);
if (!gcc) return NULL; if (!gcc) return NULL;
gcc->name = evas_stringshare_add(name); gcc->name = eina_stringshare_add(name);
gcc->gadcon = gc; gcc->gadcon = gc;
gcc->o_base = base_obj; gcc->o_base = base_obj;
if (gc->clients) if (gc->clients)
@ -794,7 +794,7 @@ e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id, const char *
if ((gc->frame_request.func) && (style)) if ((gc->frame_request.func) && (style))
{ {
gcc->o_frame = gc->frame_request.func(gc->frame_request.data, gcc, style); gcc->o_frame = gc->frame_request.func(gc->frame_request.data, gcc, style);
gcc->style = evas_stringshare_add(style); gcc->style = eina_stringshare_add(style);
if (gcc->o_frame) if (gcc->o_frame)
{ {
edje_object_size_min_calc(gcc->o_frame, &(gcc->pad.w), &(gcc->pad.h)); edje_object_size_min_calc(gcc->o_frame, &(gcc->pad.w), &(gcc->pad.h));
@ -1349,8 +1349,8 @@ _e_gadcon_free(E_Gadcon *gc)
e_gadcon_unpopulate(gc); e_gadcon_unpopulate(gc);
gadcons = evas_list_remove(gadcons, gc); gadcons = evas_list_remove(gadcons, gc);
if (gc->o_container) evas_object_del(gc->o_container); if (gc->o_container) evas_object_del(gc->o_container);
evas_stringshare_del(gc->name); eina_stringshare_del(gc->name);
evas_stringshare_del(gc->edje.swallow_name); eina_stringshare_del(gc->edje.swallow_name);
if (gc->config_dialog) e_object_del(E_OBJECT(gc->config_dialog)); if (gc->config_dialog) e_object_del(E_OBJECT(gc->config_dialog));
if (gc->drop_handler) e_drop_handler_del(gc->drop_handler); if (gc->drop_handler) e_drop_handler_del(gc->drop_handler);
free(gc); free(gc);
@ -1381,10 +1381,10 @@ _e_gadcon_client_free(E_Gadcon_Client *gcc)
gcc->gadcon->clients = evas_list_remove(gcc->gadcon->clients, gcc); gcc->gadcon->clients = evas_list_remove(gcc->gadcon->clients, gcc);
if (gcc->o_box) evas_object_del(gcc->o_box); if (gcc->o_box) evas_object_del(gcc->o_box);
if (gcc->o_frame) evas_object_del(gcc->o_frame); if (gcc->o_frame) evas_object_del(gcc->o_frame);
evas_stringshare_del(gcc->name); eina_stringshare_del(gcc->name);
if (gcc->scroll_timer) ecore_timer_del(gcc->scroll_timer); if (gcc->scroll_timer) ecore_timer_del(gcc->scroll_timer);
if (gcc->scroll_animator) ecore_animator_del(gcc->scroll_animator); if (gcc->scroll_animator) ecore_animator_del(gcc->scroll_animator);
if (gcc->style) evas_stringshare_del(gcc->style); if (gcc->style) eina_stringshare_del(gcc->style);
free(gcc); free(gcc);
} }
@ -1495,10 +1495,10 @@ _e_gadcon_client_save(E_Gadcon_Client *gcc)
gcc->cf->state_info.seq = gcc->state_info.seq; gcc->cf->state_info.seq = gcc->state_info.seq;
gcc->cf->state_info.flags = gcc->state_info.flags; gcc->cf->state_info.flags = gcc->state_info.flags;
gcc->cf->autoscroll = gcc->autoscroll; gcc->cf->autoscroll = gcc->autoscroll;
if (gcc->cf->style) evas_stringshare_del(gcc->cf->style); if (gcc->cf->style) eina_stringshare_del(gcc->cf->style);
gcc->cf->style = NULL; gcc->cf->style = NULL;
if (gcc->style) if (gcc->style)
gcc->cf->style = evas_stringshare_add(gcc->style); gcc->cf->style = eina_stringshare_add(gcc->style);
gcc->cf->resizable = gcc->resizable; gcc->cf->resizable = gcc->resizable;
e_config_save_queue(); e_config_save_queue();
} }
@ -2371,8 +2371,8 @@ _e_gadcon_client_cb_menu_style_plain(void *data, E_Menu *m, E_Menu_Item *mi)
gcc = data; gcc = data;
gc = gcc->gadcon; gc = gcc->gadcon;
if (gcc->style) evas_stringshare_del(gcc->style); if (gcc->style) eina_stringshare_del(gcc->style);
gcc->style = evas_stringshare_add(E_GADCON_CLIENT_STYLE_PLAIN); gcc->style = eina_stringshare_add(E_GADCON_CLIENT_STYLE_PLAIN);
_e_gadcon_client_save(gcc); _e_gadcon_client_save(gcc);
e_gadcon_unpopulate(gc); e_gadcon_unpopulate(gc);
e_gadcon_populate(gc); e_gadcon_populate(gc);
@ -2386,8 +2386,8 @@ _e_gadcon_client_cb_menu_style_inset(void *data, E_Menu *m, E_Menu_Item *mi)
gcc = data; gcc = data;
gc = gcc->gadcon; gc = gcc->gadcon;
if (gcc->style) evas_stringshare_del(gcc->style); if (gcc->style) eina_stringshare_del(gcc->style);
gcc->style = evas_stringshare_add(E_GADCON_CLIENT_STYLE_INSET); gcc->style = eina_stringshare_add(E_GADCON_CLIENT_STYLE_INSET);
_e_gadcon_client_save(gcc); _e_gadcon_client_save(gcc);
e_gadcon_unpopulate(gc); e_gadcon_unpopulate(gc);
e_gadcon_populate(gc); e_gadcon_populate(gc);

26
src/bin/e_init.c
View File

@ -45,8 +45,8 @@ e_init_shutdown(void)
{ {
/* if not killed, kill init */ /* if not killed, kill init */
e_init_hide(); e_init_hide();
if (title) evas_stringshare_del(title); if (title) eina_stringshare_del(title);
if (version) evas_stringshare_del(version); if (version) eina_stringshare_del(version);
title = NULL; title = NULL;
version = NULL; version = NULL;
ecore_event_handler_del(exe_del_handler); ecore_event_handler_del(exe_del_handler);
@ -65,13 +65,13 @@ e_init_show(void)
if (!e_config->init_default_theme) if (!e_config->init_default_theme)
s = e_path_find(path_init, "default.edj"); s = e_path_find(path_init, "default.edj");
else if (e_config->init_default_theme[0] == '/') else if (e_config->init_default_theme[0] == '/')
s = evas_stringshare_add(e_config->init_default_theme); s = eina_stringshare_add(e_config->init_default_theme);
else else
s = e_path_find(path_init, e_config->init_default_theme); s = e_path_find(path_init, e_config->init_default_theme);
if (s) theme = strdup(e_util_filename_escape(s)); if (s) theme = strdup(e_util_filename_escape(s));
else theme = strdup("XdX"); else theme = strdup("XdX");
if (s) evas_stringshare_del(s); if (s) eina_stringshare_del(s);
if (title) tit = strdup(e_util_filename_escape(title)); if (title) tit = strdup(e_util_filename_escape(title));
else tit = strdup("XtX"); else tit = strdup("XtX");
@ -102,15 +102,15 @@ e_init_hide(void)
EAPI void EAPI void
e_init_title_set(const char *str) e_init_title_set(const char *str)
{ {
if (title) evas_stringshare_del(title); if (title) eina_stringshare_del(title);
title = evas_stringshare_add(str); title = eina_stringshare_add(str);
} }
EAPI void EAPI void
e_init_version_set(const char *str) e_init_version_set(const char *str)
{ {
if (version) evas_stringshare_del(version); if (version) eina_stringshare_del(version);
version = evas_stringshare_add(str); version = eina_stringshare_add(str);
} }
EAPI void EAPI void
@ -120,7 +120,7 @@ e_init_status_set(const char *str)
// printf("---STAT %p %s\n", client, str); // printf("---STAT %p %s\n", client, str);
if (!client) if (!client)
{ {
stats = evas_list_append(stats, evas_stringshare_add(str)); stats = evas_list_append(stats, eina_stringshare_add(str));
return; return;
} }
// printf("---SEND\n"); // printf("---SEND\n");
@ -187,7 +187,7 @@ e_init_client_data(Ecore_Ipc_Event_Client_Data *e)
stats = evas_list_remove_list(stats, stats); stats = evas_list_remove_list(stats, stats);
// printf("---SPOOL %s\n", s); // printf("---SPOOL %s\n", s);
e_init_status_set(s); e_init_status_set(s);
evas_stringshare_del(s); eina_stringshare_del(s);
} }
} }
else if (e->minor == 2) else if (e->minor == 2)
@ -319,7 +319,7 @@ e_init_init(void)
if (!e_config->init_default_theme) if (!e_config->init_default_theme)
s = e_path_find(path_init, "default.edj"); s = e_path_find(path_init, "default.edj");
else if (e_config->init_default_theme[0] == '/') else if (e_config->init_default_theme[0] == '/')
s = evas_stringshare_add(e_config->init_default_theme); s = eina_stringshare_add(e_config->init_default_theme);
else else
s = e_path_find(path_init, e_config->init_default_theme); s = e_path_find(path_init, e_config->init_default_theme);
@ -350,13 +350,13 @@ e_init_init(void)
{ {
o = edje_object_add(_e_init_evas); o = edje_object_add(_e_init_evas);
edje_object_file_set(o, s, "e/init/splash"); edje_object_file_set(o, s, "e/init/splash");
if (s) evas_stringshare_del(s); if (s) eina_stringshare_del(s);
_e_init_object = o; _e_init_object = o;
evas_object_move(o, 0, 0); evas_object_move(o, 0, 0);
evas_object_resize(o, w, h); evas_object_resize(o, w, h);
evas_object_show(o); evas_object_show(o);
} }
if (s) evas_stringshare_del(s); if (s) eina_stringshare_del(s);
edje_object_part_text_set(_e_init_object, "e.text.disable_text", edje_object_part_text_set(_e_init_object, "e.text.disable_text",
_("Disable splash screen")); _("Disable splash screen"));

34
src/bin/e_int_config_modules.c
View File

@ -216,8 +216,8 @@ _fill_type_hash(void)
cft = E_NEW(CFType, 1); cft = E_NEW(CFType, 1);
if (!cft) continue; if (!cft) continue;
cft->key = evas_stringshare_add(_types[i].key); cft->key = eina_stringshare_add(_types[i].key);
cft->name = evas_stringshare_add(_types[i].name); cft->name = eina_stringshare_add(_types[i].name);
types_hash = evas_hash_direct_add(types_hash, cft->key, cft); types_hash = evas_hash_direct_add(types_hash, cft->key, cft);
} }
} }
@ -249,7 +249,7 @@ _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 = ecore_hash_get(desk->x, "X-Enlightenment-ModuleType");
if (!type) type = evas_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 = evas_hash_find(types_hash, type);
@ -257,7 +257,7 @@ _load_modules(const char *dir)
{ {
if (evas_hash_find(cft->modules, mod)) if (evas_hash_find(cft->modules, mod))
{ {
if ((!desk->x) && (type)) evas_stringshare_del(type); if ((!desk->x) && (type)) eina_stringshare_del(type);
if (desk) efreet_desktop_free(desk); if (desk) efreet_desktop_free(desk);
continue; continue;
} }
@ -266,13 +266,13 @@ _load_modules(const char *dir)
/* module not in it's type hash, add */ /* module not in it's type hash, add */
cfm = E_NEW(CFModule, 1); cfm = E_NEW(CFModule, 1);
if (!cfm) continue; if (!cfm) continue;
cfm->short_name = evas_stringshare_add(mod); cfm->short_name = eina_stringshare_add(mod);
if (desk->name) cfm->name = evas_stringshare_add(desk->name); if (desk->name) cfm->name = eina_stringshare_add(desk->name);
if (desk->icon) cfm->icon = evas_stringshare_add(desk->icon); if (desk->icon) cfm->icon = eina_stringshare_add(desk->icon);
if (desk->comment) cfm->comment = evas_stringshare_add(desk->comment); if (desk->comment) cfm->comment = eina_stringshare_add(desk->comment);
if (desk->orig_path) if (desk->orig_path)
cfm->orig_path = evas_stringshare_add(desk->orig_path); cfm->orig_path = eina_stringshare_add(desk->orig_path);
if ((!desk->x) && (type)) evas_stringshare_del(type); if ((!desk->x) && (type)) eina_stringshare_del(type);
efreet_desktop_free(desk); efreet_desktop_free(desk);
if (e_module_find(mod)) cfm->enabled = 1; if (e_module_find(mod)) cfm->enabled = 1;
@ -350,8 +350,8 @@ _types_hash_cb_free(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__
CFType *type = NULL; CFType *type = NULL;
if (!(type = data)) return 1; if (!(type = data)) return 1;
if (type->key) evas_stringshare_del(type->key); if (type->key) eina_stringshare_del(type->key);
if (type->name) evas_stringshare_del(type->name); if (type->name) eina_stringshare_del(type->name);
if (type->modules) if (type->modules)
{ {
evas_hash_foreach(type->modules, _mod_hash_cb_free, NULL); evas_hash_foreach(type->modules, _mod_hash_cb_free, NULL);
@ -369,11 +369,11 @@ _mod_hash_cb_free(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
CFModule *mod = NULL; CFModule *mod = NULL;
if (!(mod = data)) return 1; if (!(mod = data)) return 1;
if (mod->short_name) evas_stringshare_del(mod->short_name); if (mod->short_name) eina_stringshare_del(mod->short_name);
if (mod->name) evas_stringshare_del(mod->name); if (mod->name) eina_stringshare_del(mod->name);
if (mod->icon) evas_stringshare_del(mod->icon); if (mod->icon) eina_stringshare_del(mod->icon);
if (mod->comment) evas_stringshare_del(mod->comment); if (mod->comment) eina_stringshare_del(mod->comment);
if (mod->orig_path) evas_stringshare_del(mod->orig_path); if (mod->orig_path) eina_stringshare_del(mod->orig_path);
E_FREE(mod); E_FREE(mod);
return 1; return 1;
} }

4
src/bin/e_int_menus.c
View File

@ -1611,7 +1611,7 @@ _e_int_menus_shelves_add_cb(void *data, E_Menu *m, E_Menu_Item *mi)
con = e_container_current_get(e_manager_current_get()); con = e_container_current_get(e_manager_current_get());
zone = e_zone_current_get(con); zone = e_zone_current_get(con);
cs = E_NEW(E_Config_Shelf, 1); cs = E_NEW(E_Config_Shelf, 1);
cs->name = evas_stringshare_add("shelf"); cs->name = eina_stringshare_add("shelf");
cs->container = con->num; cs->container = con->num;
cs->zone = zone->num; cs->zone = zone->num;
cs->popup = 1; cs->popup = 1;
@ -1619,7 +1619,7 @@ _e_int_menus_shelves_add_cb(void *data, E_Menu *m, E_Menu_Item *mi)
cs->orient = E_GADCON_ORIENT_CORNER_BR; cs->orient = E_GADCON_ORIENT_CORNER_BR;
cs->fit_along = 1; cs->fit_along = 1;
cs->fit_size = 0; cs->fit_size = 0;
cs->style = evas_stringshare_add("default"); cs->style = eina_stringshare_add("default");
cs->size = 40; cs->size = 40;
cs->overlap = 0; cs->overlap = 0;
e_config->shelves = evas_list_append(e_config->shelves, cs); e_config->shelves = evas_list_append(e_config->shelves, cs);

26
src/bin/e_int_shelf_config.c
View File

@ -229,40 +229,40 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
case MODE_BOTTOM_MIDDLE: case MODE_BOTTOM_MIDDLE:
cfdata->escfg->orient = E_GADCON_ORIENT_BOTTOM; cfdata->escfg->orient = E_GADCON_ORIENT_BOTTOM;
if (cfdata->escfg->style) evas_stringshare_del(cfdata->escfg->style); if (cfdata->escfg->style) eina_stringshare_del(cfdata->escfg->style);
cfdata->escfg->style = evas_stringshare_add("default"); cfdata->escfg->style = eina_stringshare_add("default");
cfdata->escfg->fit_along = 1; cfdata->escfg->fit_along = 1;
cfdata->escfg->popup = 1; cfdata->escfg->popup = 1;
cfdata->escfg->layer = 200; cfdata->escfg->layer = 200;
break; break;
case MODE_BOTTOM_ALL: case MODE_BOTTOM_ALL:
cfdata->escfg->orient = E_GADCON_ORIENT_BOTTOM; cfdata->escfg->orient = E_GADCON_ORIENT_BOTTOM;
if (cfdata->escfg->style) evas_stringshare_del(cfdata->escfg->style); if (cfdata->escfg->style) eina_stringshare_del(cfdata->escfg->style);
cfdata->escfg->style = evas_stringshare_add("default"); cfdata->escfg->style = eina_stringshare_add("default");
cfdata->escfg->fit_along = 0; cfdata->escfg->fit_along = 0;
cfdata->escfg->popup = 1; cfdata->escfg->popup = 1;
cfdata->escfg->layer = 200; cfdata->escfg->layer = 200;
break; break;
case MODE_BOTTOM_DESKTOP: case MODE_BOTTOM_DESKTOP:
cfdata->escfg->orient = E_GADCON_ORIENT_BOTTOM; cfdata->escfg->orient = E_GADCON_ORIENT_BOTTOM;
if (cfdata->escfg->style) evas_stringshare_del(cfdata->escfg->style); if (cfdata->escfg->style) eina_stringshare_del(cfdata->escfg->style);
cfdata->escfg->style = evas_stringshare_add("invisible"); cfdata->escfg->style = eina_stringshare_add("invisible");
cfdata->escfg->fit_along = 0; cfdata->escfg->fit_along = 0;
cfdata->escfg->popup = 0; cfdata->escfg->popup = 0;
cfdata->escfg->layer = 1; cfdata->escfg->layer = 1;
break; break;
case MODE_TOP_ALL: case MODE_TOP_ALL:
cfdata->escfg->orient = E_GADCON_ORIENT_TOP; cfdata->escfg->orient = E_GADCON_ORIENT_TOP;
if (cfdata->escfg->style) evas_stringshare_del(cfdata->escfg->style); if (cfdata->escfg->style) eina_stringshare_del(cfdata->escfg->style);
cfdata->escfg->style = evas_stringshare_add("default"); cfdata->escfg->style = eina_stringshare_add("default");
cfdata->escfg->fit_along = 0; cfdata->escfg->fit_along = 0;
cfdata->escfg->popup = 1; cfdata->escfg->popup = 1;
cfdata->escfg->layer = 200; cfdata->escfg->layer = 200;
break; break;
case MODE_TOP_DESKTOP: case MODE_TOP_DESKTOP:
cfdata->escfg->orient = E_GADCON_ORIENT_TOP; cfdata->escfg->orient = E_GADCON_ORIENT_TOP;
if (cfdata->escfg->style) evas_stringshare_del(cfdata->escfg->style); if (cfdata->escfg->style) eina_stringshare_del(cfdata->escfg->style);
cfdata->escfg->style = evas_stringshare_add("invisible"); cfdata->escfg->style = eina_stringshare_add("invisible");
cfdata->escfg->fit_along = 0; cfdata->escfg->fit_along = 0;
cfdata->escfg->popup = 0; cfdata->escfg->popup = 0;
cfdata->escfg->layer = 1; cfdata->escfg->layer = 1;
@ -305,14 +305,14 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
/* Only change style is we need to */ /* Only change style is we need to */
if (!cfdata->escfg->style) if (!cfdata->escfg->style)
{ {
cfdata->escfg->style = evas_stringshare_add(cfdata->style); cfdata->escfg->style = eina_stringshare_add(cfdata->style);
e_shelf_style_set(cfdata->es, cfdata->style); e_shelf_style_set(cfdata->es, cfdata->style);
} }
else if ((cfdata->escfg->style) && else if ((cfdata->escfg->style) &&
(strcmp(cfdata->escfg->style, cfdata->style))) (strcmp(cfdata->escfg->style, cfdata->style)))
{ {
if (cfdata->escfg->style) evas_stringshare_del(cfdata->escfg->style); if (cfdata->escfg->style) eina_stringshare_del(cfdata->escfg->style);
cfdata->escfg->style = evas_stringshare_add(cfdata->style); cfdata->escfg->style = eina_stringshare_add(cfdata->style);
e_shelf_style_set(cfdata->es, cfdata->style); e_shelf_style_set(cfdata->es, cfdata->style);
} }

24
src/bin/e_intl.c
View File

@ -86,9 +86,9 @@ e_intl_shutdown(void)
E_FREE(_e_intl_orig_xmodifiers); E_FREE(_e_intl_orig_xmodifiers);
if (_e_intl_imc_personal_path) if (_e_intl_imc_personal_path)
evas_stringshare_del(_e_intl_imc_personal_path); eina_stringshare_del(_e_intl_imc_personal_path);
if (_e_intl_imc_system_path) if (_e_intl_imc_system_path)
evas_stringshare_del(_e_intl_imc_system_path); eina_stringshare_del(_e_intl_imc_system_path);
e_intl_data_shutdown(); e_intl_data_shutdown();
@ -409,7 +409,7 @@ e_intl_imc_personal_path_get(void)
char buf[4096]; char buf[4096];
snprintf(buf, sizeof(buf), "%s/.e/e/input_methods", e_user_homedir_get()); snprintf(buf, sizeof(buf), "%s/.e/e/input_methods", e_user_homedir_get());
_e_intl_imc_personal_path = evas_stringshare_add(buf); _e_intl_imc_personal_path = eina_stringshare_add(buf);
} }
return _e_intl_imc_personal_path; return _e_intl_imc_personal_path;
} }
@ -422,7 +422,7 @@ e_intl_imc_system_path_get(void)
char buf[4096]; char buf[4096];
snprintf(buf, sizeof(buf), "%s/data/input_methods", e_prefix_data_get()); snprintf(buf, sizeof(buf), "%s/data/input_methods", e_prefix_data_get());
_e_intl_imc_system_path = evas_stringshare_add(buf); _e_intl_imc_system_path = eina_stringshare_add(buf);
} }
return _e_intl_imc_system_path; return _e_intl_imc_system_path;
} }
@ -751,22 +751,22 @@ e_intl_locale_parts_get(const char *locale)
if (language[0] != 0) if (language[0] != 0)
{ {
locale_parts->mask |= E_INTL_LOC_LANG; locale_parts->mask |= E_INTL_LOC_LANG;
locale_parts->lang = evas_stringshare_add(language); locale_parts->lang = eina_stringshare_add(language);
} }
if (territory[0] != 0) if (territory[0] != 0)
{ {
locale_parts->mask |= E_INTL_LOC_REGION; locale_parts->mask |= E_INTL_LOC_REGION;
locale_parts->region = evas_stringshare_add(territory); locale_parts->region = eina_stringshare_add(territory);
} }
if (codeset[0] != 0) if (codeset[0] != 0)
{ {
locale_parts->mask |= E_INTL_LOC_CODESET; locale_parts->mask |= E_INTL_LOC_CODESET;
locale_parts->codeset = evas_stringshare_add(codeset); locale_parts->codeset = eina_stringshare_add(codeset);
} }
if (modifier[0] != 0) if (modifier[0] != 0)
{ {
locale_parts->mask |= E_INTL_LOC_MODIFIER; locale_parts->mask |= E_INTL_LOC_MODIFIER;
locale_parts->modifier = evas_stringshare_add(modifier); locale_parts->modifier = eina_stringshare_add(modifier);
} }
return locale_parts; return locale_parts;
@ -777,10 +777,10 @@ e_intl_locale_parts_free(E_Locale_Parts *locale_parts)
{ {
if (locale_parts != NULL) if (locale_parts != NULL)
{ {
if (locale_parts->lang) evas_stringshare_del(locale_parts->lang); if (locale_parts->lang) eina_stringshare_del(locale_parts->lang);
if (locale_parts->region) evas_stringshare_del(locale_parts->region); if (locale_parts->region) eina_stringshare_del(locale_parts->region);
if (locale_parts->codeset) evas_stringshare_del(locale_parts->codeset); if (locale_parts->codeset) eina_stringshare_del(locale_parts->codeset);
if (locale_parts->modifier) evas_stringshare_del(locale_parts->modifier); if (locale_parts->modifier) eina_stringshare_del(locale_parts->modifier);
E_FREE(locale_parts); E_FREE(locale_parts);
} }
} }

12
src/bin/e_intl_data.c
View File

@ -65,12 +65,12 @@ e_intl_input_method_config_free(E_Input_Method_Config *imc)
{ {
if (imc != NULL) if (imc != NULL)
{ {
if (imc->e_im_name) evas_stringshare_del(imc->e_im_name); if (imc->e_im_name) eina_stringshare_del(imc->e_im_name);
if (imc->gtk_im_module) evas_stringshare_del(imc->gtk_im_module); if (imc->gtk_im_module) eina_stringshare_del(imc->gtk_im_module);
if (imc->qt_im_module) evas_stringshare_del(imc->qt_im_module); if (imc->qt_im_module) eina_stringshare_del(imc->qt_im_module);
if (imc->xmodifiers) evas_stringshare_del(imc->xmodifiers); if (imc->xmodifiers) eina_stringshare_del(imc->xmodifiers);
if (imc->e_im_exec) evas_stringshare_del(imc->e_im_exec); if (imc->e_im_exec) eina_stringshare_del(imc->e_im_exec);
if (imc->e_im_setup_exec) evas_stringshare_del(imc->e_im_setup_exec); if (imc->e_im_setup_exec) eina_stringshare_del(imc->e_im_setup_exec);
E_FREE(imc); E_FREE(imc);
} }
} }

110
src/bin/e_ipc_handlers.h
View File

@ -1066,9 +1066,9 @@ break;
#elif (TYPE == E_WM_IN) #elif (TYPE == E_WM_IN)
STRING(s, HDL); STRING(s, HDL);
/* TODO: Check if file exists */ /* TODO: Check if file exists */
if (e_config->desktop_default_background) evas_stringshare_del(e_config->desktop_default_background); if (e_config->desktop_default_background) eina_stringshare_del(e_config->desktop_default_background);
e_config->desktop_default_background = NULL; e_config->desktop_default_background = NULL;
if (s) e_config->desktop_default_background = evas_stringshare_add(s); if (s) e_config->desktop_default_background = eina_stringshare_add(s);
e_bg_update(); e_bg_update();
SAVE; SAVE;
END_STRING(s); END_STRING(s);
@ -1448,9 +1448,9 @@ break;
#elif (TYPE == E_WM_IN) #elif (TYPE == E_WM_IN)
STRING(s, HDL); STRING(s, HDL);
/* TODO: Check if language exists */ /* TODO: Check if language exists */
if (e_config->language) evas_stringshare_del(e_config->language); if (e_config->language) eina_stringshare_del(e_config->language);
e_config->language = NULL; e_config->language = NULL;
if (s) e_config->language = evas_stringshare_add(s); if (s) e_config->language = eina_stringshare_add(s);
if ((e_config->language) && (e_config->language[0] != 0)) if ((e_config->language) && (e_config->language[0] != 0))
e_intl_language_set(e_config->language); e_intl_language_set(e_config->language);
else else
@ -1508,9 +1508,9 @@ break;
E_Path_Dir *p; E_Path_Dir *p;
if (s) { if (s) {
dat = evas_list_append(dat, evas_stringshare_add(s)); dat = evas_list_append(dat, eina_stringshare_add(s));
FOR(dir_list) { p = l->data; FOR(dir_list) { p = l->data;
dat = evas_list_append(dat, evas_stringshare_add(p->dir)); dat = evas_list_append(dat, eina_stringshare_add(p->dir));
} }
} }
@ -1521,7 +1521,7 @@ break;
const char *dir; const char *dir;
dir = dat->data; dir = dat->data;
evas_stringshare_del(dir); eina_stringshare_del(dir);
dat = evas_list_remove_list(dat, dat); dat = evas_list_remove_list(dat, dat);
} }
e_path_dir_list_free(dir_list); e_path_dir_list_free(dir_list);
@ -2545,8 +2545,8 @@ break;
d->button = v->val3; d->button = v->val3;
d->mod = v->val2; d->mod = v->val2;
d->any_mod = v->val4; d->any_mod = v->val4;
d->action = ((v->str1) ? evas_stringshare_add(v->str1) : NULL); d->action = ((v->str1) ? eina_stringshare_add(v->str1) : NULL);
d->params = ((v->str2) ? evas_stringshare_add(v->str2) : NULL); d->params = ((v->str2) ? eina_stringshare_add(v->str2) : NULL);
r->bindings[count] = d; r->bindings[count] = d;
count++; count++;
@ -2651,8 +2651,8 @@ break;
eb->button = bind.button; eb->button = bind.button;
eb->modifiers = bind.modifiers; eb->modifiers = bind.modifiers;
eb->any_mod = bind.any_mod; eb->any_mod = bind.any_mod;
if (bind.action) eb->action = evas_stringshare_add(bind.action); if (bind.action) eb->action = eina_stringshare_add(bind.action);
if (bind.params) eb->params = evas_stringshare_add(bind.params); if (bind.params) eb->params = eina_stringshare_add(bind.params);
e_border_button_bindings_ungrab_all(); e_border_button_bindings_ungrab_all();
e_bindings_mouse_add(bind.context, bind.button, bind.modifiers, e_bindings_mouse_add(bind.context, bind.button, bind.modifiers,
bind.any_mod, bind.action, bind.params); bind.any_mod, bind.action, bind.params);
@ -2752,8 +2752,8 @@ break;
if (eb) if (eb)
{ {
e_config->mouse_bindings = evas_list_remove(e_config->mouse_bindings, eb); e_config->mouse_bindings = evas_list_remove(e_config->mouse_bindings, eb);
if (eb->action) evas_stringshare_del(eb->action); if (eb->action) eina_stringshare_del(eb->action);
if (eb->params) evas_stringshare_del(eb->params); if (eb->params) eina_stringshare_del(eb->params);
E_FREE(eb); E_FREE(eb);
e_border_button_bindings_ungrab_all(); e_border_button_bindings_ungrab_all();
e_bindings_mouse_del(bind.context, bind.button, bind.modifiers, e_bindings_mouse_del(bind.context, bind.button, bind.modifiers,
@ -2869,11 +2869,11 @@ break;
d = malloc(sizeof(E_Response_Binding_Key_Data)); d = malloc(sizeof(E_Response_Binding_Key_Data));
d->ctx = v->val1; d->ctx = v->val1;
d->key = ((v->str1) ? evas_stringshare_add(v->str1) : NULL); d->key = ((v->str1) ? eina_stringshare_add(v->str1) : NULL);
d->mod = v->val2; d->mod = v->val2;
d->any_mod = v->val3; d->any_mod = v->val3;
d->action = ((v->str2) ? evas_stringshare_add(v->str2) : NULL); d->action = ((v->str2) ? eina_stringshare_add(v->str2) : NULL);
d->params = ((v->str3) ? evas_stringshare_add(v->str3) : NULL); d->params = ((v->str3) ? eina_stringshare_add(v->str3) : NULL);
r->bindings[count] = d; r->bindings[count] = d;
count++; count++;
@ -2976,9 +2976,9 @@ break;
eb->context = bind.context; eb->context = bind.context;
eb->modifiers = bind.modifiers; eb->modifiers = bind.modifiers;
eb->any_mod = bind.any_mod; eb->any_mod = bind.any_mod;
if (bind.key) eb->key = evas_stringshare_add(bind.key); if (bind.key) eb->key = eina_stringshare_add(bind.key);
if (bind.action) eb->action = evas_stringshare_add(bind.action); if (bind.action) eb->action = eina_stringshare_add(bind.action);
if (bind.params) eb->params = evas_stringshare_add(bind.params); if (bind.params) eb->params = eina_stringshare_add(bind.params);
e_managers_keys_ungrab(); e_managers_keys_ungrab();
e_bindings_key_add(bind.context, bind.key, bind.modifiers, e_bindings_key_add(bind.context, bind.key, bind.modifiers,
bind.any_mod, bind.action, bind.params); bind.any_mod, bind.action, bind.params);
@ -3076,9 +3076,9 @@ break;
if (eb) if (eb)
{ {
e_config->key_bindings = evas_list_remove(e_config->key_bindings, eb); e_config->key_bindings = evas_list_remove(e_config->key_bindings, eb);
if (eb->key) evas_stringshare_del(eb->key); if (eb->key) eina_stringshare_del(eb->key);
if (eb->action) evas_stringshare_del(eb->action); if (eb->action) eina_stringshare_del(eb->action);
if (eb->params) evas_stringshare_del(eb->params); if (eb->params) eina_stringshare_del(eb->params);
E_FREE(eb); E_FREE(eb);
e_managers_keys_ungrab(); e_managers_keys_ungrab();
e_bindings_key_del(bind.context, bind.key, bind.modifiers, e_bindings_key_del(bind.context, bind.key, bind.modifiers,
@ -4528,14 +4528,14 @@ break;
STRING(s, HDL); STRING(s, HDL);
if (!s) if (!s)
{ {
if (e_config->transition_start) evas_stringshare_del(e_config->transition_start); if (e_config->transition_start) eina_stringshare_del(e_config->transition_start);
e_config->transition_start = NULL; e_config->transition_start = NULL;
} }
if ((s) && (e_theme_transition_find(s))) if ((s) && (e_theme_transition_find(s)))
{ {
if (e_config->transition_start) evas_stringshare_del(e_config->transition_start); if (e_config->transition_start) eina_stringshare_del(e_config->transition_start);
e_config->transition_start = NULL; e_config->transition_start = NULL;
if (s) e_config->transition_start = evas_stringshare_add(s); if (s) e_config->transition_start = eina_stringshare_add(s);
SAVE; SAVE;
} }
END_STRING(s); END_STRING(s);
@ -4578,14 +4578,14 @@ break;
STRING(s, HDL); STRING(s, HDL);
if (!s) if (!s)
{ {
if (e_config->transition_desk) evas_stringshare_del(e_config->transition_desk); if (e_config->transition_desk) eina_stringshare_del(e_config->transition_desk);
e_config->transition_desk = NULL; e_config->transition_desk = NULL;
} }
if ((s) && (e_theme_transition_find(s))) if ((s) && (e_theme_transition_find(s)))
{ {
if (e_config->transition_desk) evas_stringshare_del(e_config->transition_desk); if (e_config->transition_desk) eina_stringshare_del(e_config->transition_desk);
e_config->transition_desk = NULL; e_config->transition_desk = NULL;
if (s) e_config->transition_desk = evas_stringshare_add(s); if (s) e_config->transition_desk = eina_stringshare_add(s);
} }
SAVE; SAVE;
END_STRING(s); END_STRING(s);
@ -4628,14 +4628,14 @@ break;
STRING(s, HDL); STRING(s, HDL);
if (!s) if (!s)
{ {
if (e_config->transition_change) evas_stringshare_del(e_config->transition_change); if (e_config->transition_change) eina_stringshare_del(e_config->transition_change);
e_config->transition_change = NULL; e_config->transition_change = NULL;
} }
if ((s) && (e_theme_transition_find(s))) if ((s) && (e_theme_transition_find(s)))
{ {
if (e_config->transition_change) evas_stringshare_del(e_config->transition_change); if (e_config->transition_change) eina_stringshare_del(e_config->transition_change);
e_config->transition_change = NULL; e_config->transition_change = NULL;
if (s) e_config->transition_change = evas_stringshare_add(s); if (s) e_config->transition_change = eina_stringshare_add(s);
SAVE; SAVE;
} }
END_STRING(s); END_STRING(s);
@ -5776,9 +5776,9 @@ break;
REQ_STRING(params[0], HDL); REQ_STRING(params[0], HDL);
#elif (TYPE == E_WM_IN) #elif (TYPE == E_WM_IN)
STRING(s, HDL); STRING(s, HDL);
if (e_config->input_method) evas_stringshare_del(e_config->input_method); if (e_config->input_method) eina_stringshare_del(e_config->input_method);
e_config->input_method = NULL; e_config->input_method = NULL;
if (s) e_config->input_method = evas_stringshare_add(s); if (s) e_config->input_method = eina_stringshare_add(s);
if ((e_config->input_method) && (e_config->input_method[0] != 0)) if ((e_config->input_method) && (e_config->input_method[0] != 0))
e_intl_input_method_set(e_config->input_method); e_intl_input_method_set(e_config->input_method);
else else
@ -5975,12 +5975,12 @@ break;
d = malloc(sizeof(E_Response_Binding_Signal_Data)); d = malloc(sizeof(E_Response_Binding_Signal_Data));
d->ctx = v->val1; d->ctx = v->val1;
d->signal = ((v->str1) ? evas_stringshare_add(v->str1) : NULL); d->signal = ((v->str1) ? eina_stringshare_add(v->str1) : NULL);
d->source = ((v->str2) ? evas_stringshare_add(v->str2) : NULL); d->source = ((v->str2) ? eina_stringshare_add(v->str2) : NULL);
d->mod = v->val2; d->mod = v->val2;
d->any_mod = v->val3; d->any_mod = v->val3;
d->action = ((v->str3) ? evas_stringshare_add(v->str3) : NULL); d->action = ((v->str3) ? eina_stringshare_add(v->str3) : NULL);
d->params = ((v->str4) ? evas_stringshare_add(v->str4) : NULL); d->params = ((v->str4) ? eina_stringshare_add(v->str4) : NULL);
r->bindings[count] = d; r->bindings[count] = d;
count++; count++;
@ -6084,12 +6084,12 @@ break;
eb = E_NEW(E_Config_Binding_Signal, 1); eb = E_NEW(E_Config_Binding_Signal, 1);
e_config->signal_bindings = evas_list_append(e_config->signal_bindings, eb); e_config->signal_bindings = evas_list_append(e_config->signal_bindings, eb);
eb->context = bind.context; eb->context = bind.context;
if (bind.signal) eb->signal = evas_stringshare_add(bind.signal); if (bind.signal) eb->signal = eina_stringshare_add(bind.signal);
if (bind.source) eb->source = evas_stringshare_add(bind.source); if (bind.source) eb->source = eina_stringshare_add(bind.source);
eb->modifiers = bind.modifiers; eb->modifiers = bind.modifiers;
eb->any_mod = bind.any_mod; eb->any_mod = bind.any_mod;
if (bind.action) eb->action = evas_stringshare_add(bind.action); if (bind.action) eb->action = eina_stringshare_add(bind.action);
if (bind.params) eb->params = evas_stringshare_add(bind.params); if (bind.params) eb->params = eina_stringshare_add(bind.params);
e_bindings_signal_add(bind.context, bind.signal, bind.source, bind.modifiers, e_bindings_signal_add(bind.context, bind.signal, bind.source, bind.modifiers,
bind.any_mod, bind.action, bind.params); bind.any_mod, bind.action, bind.params);
e_config_save_queue(); e_config_save_queue();
@ -6189,10 +6189,10 @@ break;
if (eb) if (eb)
{ {
e_config->signal_bindings = evas_list_remove(e_config->signal_bindings, eb); e_config->signal_bindings = evas_list_remove(e_config->signal_bindings, eb);
if (eb->signal) evas_stringshare_del(eb->signal); if (eb->signal) eina_stringshare_del(eb->signal);
if (eb->source) evas_stringshare_del(eb->source); if (eb->source) eina_stringshare_del(eb->source);
if (eb->action) evas_stringshare_del(eb->action); if (eb->action) eina_stringshare_del(eb->action);
if (eb->params) evas_stringshare_del(eb->params); if (eb->params) eina_stringshare_del(eb->params);
E_FREE(eb); E_FREE(eb);
e_bindings_signal_del(bind.context, bind.signal, bind.source, bind.modifiers, e_bindings_signal_del(bind.context, bind.signal, bind.source, bind.modifiers,
bind.any_mod, bind.action, bind.params); bind.any_mod, bind.action, bind.params);
@ -6309,8 +6309,8 @@ break;
d->z = v->val3; d->z = v->val3;
d->mod = v->val4; d->mod = v->val4;
d->any_mod = v->val5; d->any_mod = v->val5;
d->action = ((v->str1) ? evas_stringshare_add(v->str1) : NULL); d->action = ((v->str1) ? eina_stringshare_add(v->str1) : NULL);
d->params = ((v->str2) ? evas_stringshare_add(v->str2) : NULL); d->params = ((v->str2) ? eina_stringshare_add(v->str2) : NULL);
r->bindings[count] = d; r->bindings[count] = d;
count++; count++;
@ -6418,8 +6418,8 @@ break;
eb->z = bind.z; eb->z = bind.z;
eb->modifiers = bind.modifiers; eb->modifiers = bind.modifiers;
eb->any_mod = bind.any_mod; eb->any_mod = bind.any_mod;
if (bind.action) eb->action = evas_stringshare_add(bind.action); if (bind.action) eb->action = eina_stringshare_add(bind.action);
if (bind.params) eb->params = evas_stringshare_add(bind.params); if (bind.params) eb->params = eina_stringshare_add(bind.params);
e_bindings_wheel_add(bind.context, bind.direction, bind.z, bind.modifiers, e_bindings_wheel_add(bind.context, bind.direction, bind.z, bind.modifiers,
bind.any_mod, bind.action, bind.params); bind.any_mod, bind.action, bind.params);
e_config_save_queue(); e_config_save_queue();
@ -6519,8 +6519,8 @@ break;
if (eb) if (eb)
{ {
e_config->wheel_bindings = evas_list_remove(e_config->wheel_bindings, eb); e_config->wheel_bindings = evas_list_remove(e_config->wheel_bindings, eb);
if (eb->action) evas_stringshare_del(eb->action); if (eb->action) eina_stringshare_del(eb->action);
if (eb->params) evas_stringshare_del(eb->params); if (eb->params) eina_stringshare_del(eb->params);
E_FREE(eb); E_FREE(eb);
e_bindings_wheel_del(bind.context, bind.direction, bind.z, bind.modifiers, e_bindings_wheel_del(bind.context, bind.direction, bind.z, bind.modifiers,
bind.any_mod, bind.action, bind.params); bind.any_mod, bind.action, bind.params);
@ -7461,7 +7461,7 @@ break;
REQ_STRING(params[0], HDL); REQ_STRING(params[0], HDL);
#elif (TYPE == E_WM_IN) #elif (TYPE == E_WM_IN)
STRING(s, HDL); STRING(s, HDL);
if (e_config->init_default_theme) evas_stringshare_del(e_config->init_default_theme); if (e_config->init_default_theme) eina_stringshare_del(e_config->init_default_theme);
e_config->init_default_theme = NULL; e_config->init_default_theme = NULL;
if (s) if (s)
{ {
@ -7474,7 +7474,7 @@ break;
printf("The edje file you selected does not contain any init information.\n"); printf("The edje file you selected does not contain any init information.\n");
exit(-1); exit(-1);
} }
if (f) e_config->init_default_theme = evas_stringshare_add(f); if (f) e_config->init_default_theme = eina_stringshare_add(f);
} }
SAVE; SAVE;
END_STRING(s); END_STRING(s);
@ -7767,8 +7767,8 @@ break;
#elif (TYPE == E_WM_IN) #elif (TYPE == E_WM_IN)
STRING(s, HDL); STRING(s, HDL);
if (e_config->desklock_custom_desklock_cmd) if (e_config->desklock_custom_desklock_cmd)
evas_stringshare_del(e_config->desklock_custom_desklock_cmd); eina_stringshare_del(e_config->desklock_custom_desklock_cmd);
e_config->desklock_custom_desklock_cmd = evas_stringshare_add(s); e_config->desklock_custom_desklock_cmd = eina_stringshare_add(s);
END_STRING(s); END_STRING(s);
#elif (TYPE == E_REMOTE_IN) #elif (TYPE == E_REMOTE_IN)
#endif #endif

4
src/bin/e_main.c
View File

@ -650,9 +650,9 @@ main(int argc, char **argv)
if (list) if (list)
{ {
snprintf(buf, sizeof(buf), "%s/.e/e/icons", e_user_homedir_get()); snprintf(buf, sizeof(buf), "%s/.e/e/icons", e_user_homedir_get());
ecore_list_prepend(list, (void *)ecore_string_instance(buf)); ecore_list_prepend(list, (void *)eina_stringshare_add(buf));
snprintf(buf, sizeof(buf), "%s/data/icons", e_prefix_data_get()); snprintf(buf, sizeof(buf), "%s/data/icons", e_prefix_data_get());
ecore_list_prepend(list, (void *)ecore_string_instance(buf)); ecore_list_prepend(list, (void *)eina_stringshare_add(buf));
} }
} }
efreet_icon_extension_add(".edj"); efreet_icon_extension_add(".edj");

40
src/bin/e_menu.c
View File

@ -401,10 +401,10 @@ e_menu_title_set(E_Menu *m, char *title)
return; return;
if (m->header.title) if (m->header.title)
{ {
evas_stringshare_del(m->header.title); eina_stringshare_del(m->header.title);
m->header.title = NULL; m->header.title = NULL;
} }
if (title) m->header.title = evas_stringshare_add(title); if (title) m->header.title = eina_stringshare_add(title);
else m->header.title = NULL; else m->header.title = NULL;
m->changed = 1; m->changed = 1;
} }
@ -424,11 +424,11 @@ e_menu_category_set(E_Menu *m, char *category)
E_OBJECT_TYPE_CHECK(m, E_MENU_TYPE); E_OBJECT_TYPE_CHECK(m, E_MENU_TYPE);
if (m->category) if (m->category)
{ {
evas_stringshare_del(m->category); eina_stringshare_del(m->category);
m->category = NULL; m->category = NULL;
} }
if (category) if (category)
m->category = evas_stringshare_add(category); m->category = eina_stringshare_add(category);
else else
m->category = NULL; m->category = NULL;
m->changed = 1; m->changed = 1;
@ -470,7 +470,7 @@ e_menu_category_callback_add(char *category, void (*create) (E_Menu *m, void *ca
cb->data = data; cb->data = data;
cb->create = create; cb->create = create;
cb->free = free; cb->free = free;
cb->category = evas_stringshare_add(category); cb->category = eina_stringshare_add(category);
cat->callbacks = evas_list_append(cat->callbacks, cb); cat->callbacks = evas_list_append(cat->callbacks, cb);
} }
} }
@ -487,7 +487,7 @@ e_menu_category_callback_del(E_Menu_Category_Callback *cb)
cat = evas_hash_find(_e_menu_categories, cb->category); cat = evas_hash_find(_e_menu_categories, cb->category);
if (cat) if (cat)
cat->callbacks = evas_list_remove(cat->callbacks, cb); cat->callbacks = evas_list_remove(cat->callbacks, cb);
evas_stringshare_del(cb->category); eina_stringshare_del(cb->category);
free(cb); free(cb);
} }
} }
@ -575,11 +575,11 @@ e_menu_item_icon_file_set(E_Menu_Item *mi, const char *icon)
if (((mi->icon) && (icon) && (!strcmp(icon, mi->icon))) || if (((mi->icon) && (icon) && (!strcmp(icon, mi->icon))) ||
((!mi->icon) && (!icon))) ((!mi->icon) && (!icon)))
return; return;
if (mi->icon) evas_stringshare_del(mi->icon); if (mi->icon) eina_stringshare_del(mi->icon);
if (mi->icon_key) evas_stringshare_del(mi->icon_key); if (mi->icon_key) eina_stringshare_del(mi->icon_key);
mi->icon = NULL; mi->icon = NULL;
mi->icon_key = NULL; mi->icon_key = NULL;
if (icon) mi->icon = evas_stringshare_add(icon); if (icon) mi->icon = eina_stringshare_add(icon);
mi->changed = 1; mi->changed = 1;
mi->menu->changed = 1; mi->menu->changed = 1;
} }
@ -593,12 +593,12 @@ e_menu_item_icon_edje_set(E_Menu_Item *mi, const char *icon, const char *key)
((!mi->icon) && (!icon)) || ((!mi->icon) && (!icon)) ||
((key) && (mi->icon_key) && (!strcmp(key, mi->icon_key)))) ((key) && (mi->icon_key) && (!strcmp(key, mi->icon_key))))
return; return;
if (mi->icon) evas_stringshare_del(mi->icon); if (mi->icon) eina_stringshare_del(mi->icon);
if (mi->icon_key) evas_stringshare_del(mi->icon_key); if (mi->icon_key) eina_stringshare_del(mi->icon_key);
mi->icon = NULL; mi->icon = NULL;
mi->icon_key = NULL; mi->icon_key = NULL;
if (icon) mi->icon = evas_stringshare_add(icon); if (icon) mi->icon = eina_stringshare_add(icon);
if (key) mi->icon_key = evas_stringshare_add(key); if (key) mi->icon_key = eina_stringshare_add(key);
mi->changed = 1; mi->changed = 1;
mi->menu->changed = 1; mi->menu->changed = 1;
} }
@ -611,9 +611,9 @@ e_menu_item_label_set(E_Menu_Item *mi, const char *label)
if (((mi->label) && (label) && (!strcmp(label, mi->label))) || if (((mi->label) && (label) && (!strcmp(label, mi->label))) ||
((!mi->label) && (!label))) ((!mi->label) && (!label)))
return; return;
if (mi->label) evas_stringshare_del(mi->label); if (mi->label) eina_stringshare_del(mi->label);
mi->label = NULL; mi->label = NULL;
if (label) mi->label = evas_stringshare_add(label); if (label) mi->label = eina_stringshare_add(label);
mi->changed = 1; mi->changed = 1;
mi->menu->changed = 1; mi->menu->changed = 1;
} }
@ -1049,8 +1049,8 @@ _e_menu_free(E_Menu *m)
m->in_active_list = 0; m->in_active_list = 0;
e_object_unref(E_OBJECT(m)); e_object_unref(E_OBJECT(m));
} }
if (m->header.title) evas_stringshare_del(m->header.title); if (m->header.title) eina_stringshare_del(m->header.title);
if (m->header.icon_file) evas_stringshare_del(m->header.icon_file); if (m->header.icon_file) eina_stringshare_del(m->header.icon_file);
free(m); free(m);
} }
@ -1065,9 +1065,9 @@ _e_menu_item_free(E_Menu_Item *mi)
} }
if (mi->menu->realized) _e_menu_item_unrealize(mi); if (mi->menu->realized) _e_menu_item_unrealize(mi);
mi->menu->items = evas_list_remove(mi->menu->items, mi); mi->menu->items = evas_list_remove(mi->menu->items, mi);
if (mi->icon) evas_stringshare_del(mi->icon); if (mi->icon) eina_stringshare_del(mi->icon);
if (mi->icon_key) evas_stringshare_del(mi->icon_key); if (mi->icon_key) eina_stringshare_del(mi->icon_key);
if (mi->label) evas_stringshare_del(mi->label); if (mi->label) eina_stringshare_del(mi->label);
free(mi); free(mi);
} }

22
src/bin/e_module.c
View File

@ -88,7 +88,7 @@ e_module_all_load(void)
_e_module_idler = ecore_idler_add(_e_module_cb_idler, NULL); _e_module_idler = ecore_idler_add(_e_module_cb_idler, NULL);
_e_modules_delayed = _e_modules_delayed =
evas_list_append(_e_modules_delayed, evas_list_append(_e_modules_delayed,
evas_stringshare_add(em->name)); eina_stringshare_add(em->name));
} }
else if (em->enabled) else if (em->enabled)
{ {
@ -118,7 +118,7 @@ e_module_new(const char *name)
modpath = e_path_find(path_modules, buf); modpath = e_path_find(path_modules, buf);
} }
else else
modpath = evas_stringshare_add(name); modpath = eina_stringshare_add(name);
if (!modpath) if (!modpath)
{ {
snprintf(body, sizeof(body), _("There was an error loading module named: %s<br>" snprintf(body, sizeof(body), _("There was an error loading module named: %s<br>"
@ -193,7 +193,7 @@ e_module_new(const char *name)
init_done: init_done:
_e_modules = evas_list_append(_e_modules, m); _e_modules = evas_list_append(_e_modules, m);
m->name = evas_stringshare_add(name); m->name = eina_stringshare_add(name);
if (modpath) if (modpath)
{ {
s = ecore_file_dir_get(modpath); s = ecore_file_dir_get(modpath);
@ -205,7 +205,7 @@ init_done:
free(s); free(s);
if (s2) if (s2)
{ {
m->dir = evas_stringshare_add(s2); m->dir = eina_stringshare_add(s2);
free(s2); free(s2);
} }
} }
@ -227,12 +227,12 @@ init_done:
E_Config_Module *em; E_Config_Module *em;
em = E_NEW(E_Config_Module, 1); em = E_NEW(E_Config_Module, 1);
em->name = evas_stringshare_add(m->name); em->name = eina_stringshare_add(m->name);
em->enabled = 0; em->enabled = 0;
e_config->modules = evas_list_append(e_config->modules, em); e_config->modules = evas_list_append(e_config->modules, em);
e_config_save_queue(); e_config_save_queue();
} }
if (modpath) evas_stringshare_del(modpath); if (modpath) eina_stringshare_del(modpath);
return m; return m;
} }
@ -422,7 +422,7 @@ e_module_dialog_show(E_Module *m, const char *title, const char *body)
if (!m) return; if (!m) return;
bd = dia->win->border; bd = dia->win->border;
if (!bd) return; if (!bd) return;
bd->internal_icon = evas_stringshare_add(icon); bd->internal_icon = eina_stringshare_add(icon);
free(icon); free(icon);
} }
@ -490,7 +490,7 @@ _e_module_free(E_Module *m)
if (!e_util_strcmp(em->name, m->name)) if (!e_util_strcmp(em->name, m->name))
{ {
e_config->modules = evas_list_remove(e_config->modules, em); e_config->modules = evas_list_remove(e_config->modules, em);
if (em->name) evas_stringshare_del(em->name); if (em->name) eina_stringshare_del(em->name);
E_FREE(em); E_FREE(em);
break; break;
} }
@ -501,8 +501,8 @@ _e_module_free(E_Module *m)
m->func.save(m); m->func.save(m);
m->func.shutdown(m); m->func.shutdown(m);
} }
if (m->name) evas_stringshare_del(m->name); if (m->name) eina_stringshare_del(m->name);
if (m->dir) evas_stringshare_del(m->dir); if (m->dir) eina_stringshare_del(m->dir);
if (m->handle) dlclose(m->handle); if (m->handle) dlclose(m->handle);
_e_modules = evas_list_remove(_e_modules, m); _e_modules = evas_list_remove(_e_modules, m);
free(m); free(m);
@ -565,7 +565,7 @@ _e_module_cb_idler(void *data)
m = NULL; m = NULL;
if (name) m = e_module_new(name); if (name) m = e_module_new(name);
if (m) e_module_enable(m); if (m) e_module_enable(m);
evas_stringshare_del(name); eina_stringshare_del(name);
} }
if (_e_modules_delayed) return 1; if (_e_modules_delayed) return 1;
_e_module_idler = NULL; _e_module_idler = NULL;

4
src/bin/e_obj_dialog.c
View File

@ -65,11 +65,11 @@ e_obj_dialog_icon_set(E_Obj_Dialog *od, char *icon)
E_OBJECT_TYPE_CHECK(od, E_OBJ_DIALOG_TYPE); E_OBJECT_TYPE_CHECK(od, E_OBJ_DIALOG_TYPE);
if (od->win->border->internal_icon) if (od->win->border->internal_icon)
{ {
evas_stringshare_del(od->win->border->internal_icon); eina_stringshare_del(od->win->border->internal_icon);
od->win->border->internal_icon = NULL; od->win->border->internal_icon = NULL;
} }
if (icon) if (icon)
od->win->border->internal_icon = evas_stringshare_add(icon); od->win->border->internal_icon = eina_stringshare_add(icon);
} }
EAPI void EAPI void

4
src/bin/e_order.c
View File

@ -46,7 +46,7 @@ e_order_new(const char *path)
eo = E_OBJECT_ALLOC(E_Order, E_ORDER_TYPE, _e_order_free); eo = E_OBJECT_ALLOC(E_Order, E_ORDER_TYPE, _e_order_free);
if (!eo) return NULL; if (!eo) return NULL;
if (path) eo->path = evas_stringshare_add(path); if (path) eo->path = eina_stringshare_add(path);
_e_order_read(eo); _e_order_read(eo);
eo->monitor = ecore_file_monitor_add(path, _e_order_cb_monitor, eo); eo->monitor = ecore_file_monitor_add(path, _e_order_cb_monitor, eo);
@ -167,7 +167,7 @@ _e_order_free(E_Order *eo)
efreet_desktop_free(eo->desktops->data); efreet_desktop_free(eo->desktops->data);
eo->desktops = evas_list_remove_list(eo->desktops, eo->desktops); eo->desktops = evas_list_remove_list(eo->desktops, eo->desktops);
} }
if (eo->path) evas_stringshare_del(eo->path); if (eo->path) eina_stringshare_del(eo->path);
if (eo->monitor) ecore_file_monitor_del(eo->monitor); if (eo->monitor) ecore_file_monitor_del(eo->monitor);
orders = evas_list_remove(orders, eo); orders = evas_list_remove(orders, eo);
free(eo); free(eo);

40
src/bin/e_path.c
View File

@ -45,7 +45,7 @@ e_path_default_path_append(E_Path *ep, const char *path)
strcpy(new_path, home_dir); strcpy(new_path, home_dir);
strcat(new_path, path + 1); strcat(new_path, path + 1);
epd->dir = evas_stringshare_add(new_path); epd->dir = eina_stringshare_add(new_path);
free(new_path); free(new_path);
ep->default_dir_list = evas_list_append(ep->default_dir_list, epd); ep->default_dir_list = evas_list_append(ep->default_dir_list, epd);
} }
@ -55,7 +55,7 @@ e_path_default_path_append(E_Path *ep, const char *path)
epd = malloc(sizeof(E_Path_Dir)); epd = malloc(sizeof(E_Path_Dir));
if (!epd) if (!epd)
return; return;
epd->dir = evas_stringshare_add(path); epd->dir = eina_stringshare_add(path);
ep->default_dir_list = evas_list_append(ep->default_dir_list, epd); ep->default_dir_list = evas_list_append(ep->default_dir_list, epd);
} }
_e_path_cache_free(ep); _e_path_cache_free(ep);
@ -98,7 +98,7 @@ e_path_user_path_append(E_Path *ep, const char *path)
strcpy(new_path, home_dir); strcpy(new_path, home_dir);
strcat(new_path, path + 1); strcat(new_path, path + 1);
epd->dir = evas_stringshare_add(new_path); epd->dir = eina_stringshare_add(new_path);
free(new_path); free(new_path);
*(ep->user_dir_list) = evas_list_append(*(ep->user_dir_list), epd); *(ep->user_dir_list) = evas_list_append(*(ep->user_dir_list), epd);
} }
@ -108,7 +108,7 @@ e_path_user_path_append(E_Path *ep, const char *path)
epd = malloc(sizeof(E_Path_Dir)); epd = malloc(sizeof(E_Path_Dir));
if (!epd) if (!epd)
return; return;
epd->dir = evas_stringshare_add(path); epd->dir = eina_stringshare_add(path);
*(ep->user_dir_list) = evas_list_append(*(ep->user_dir_list), epd); *(ep->user_dir_list) = evas_list_append(*(ep->user_dir_list), epd);
} }
_e_path_cache_free(ep); _e_path_cache_free(ep);
@ -141,7 +141,7 @@ e_path_user_path_prepend(E_Path *ep, const char *path)
strcpy(new_path, home_dir); strcpy(new_path, home_dir);
strcat(new_path, path + 1); strcat(new_path, path + 1);
epd->dir = evas_stringshare_add(new_path); epd->dir = eina_stringshare_add(new_path);
free(new_path); free(new_path);
*(ep->user_dir_list) = evas_list_prepend(*(ep->user_dir_list), epd); *(ep->user_dir_list) = evas_list_prepend(*(ep->user_dir_list), epd);
} }
@ -151,7 +151,7 @@ e_path_user_path_prepend(E_Path *ep, const char *path)
epd = malloc(sizeof(E_Path_Dir)); epd = malloc(sizeof(E_Path_Dir));
if (!epd) if (!epd)
return; return;
epd->dir = evas_stringshare_add(path); epd->dir = eina_stringshare_add(path);
*(ep->user_dir_list) = evas_list_prepend(*(ep->user_dir_list), epd); *(ep->user_dir_list) = evas_list_prepend(*(ep->user_dir_list), epd);
} }
_e_path_cache_free(ep); _e_path_cache_free(ep);
@ -189,7 +189,7 @@ e_path_user_path_remove(E_Path *ep, const char *path)
{ {
*(ep->user_dir_list) = evas_list_remove_list( *(ep->user_dir_list) = evas_list_remove_list(
*(ep->user_dir_list), l); *(ep->user_dir_list), l);
evas_stringshare_del(epd->dir); eina_stringshare_del(epd->dir);
free(epd); free(epd);
free(new_path); free(new_path);
_e_path_cache_free(ep); _e_path_cache_free(ep);
@ -211,7 +211,7 @@ e_path_user_path_remove(E_Path *ep, const char *path)
{ {
*(ep->user_dir_list) = evas_list_remove_list( *(ep->user_dir_list) = evas_list_remove_list(
*(ep->user_dir_list), l); *(ep->user_dir_list), l);
evas_stringshare_del(epd->dir); eina_stringshare_del(epd->dir);
free(epd); free(epd);
_e_path_cache_free(ep); _e_path_cache_free(ep);
return; return;
@ -229,7 +229,7 @@ e_path_user_path_clear(E_Path *ep)
E_Path_Dir *epd; E_Path_Dir *epd;
epd = (*(ep->user_dir_list))->data; epd = (*(ep->user_dir_list))->data;
*(ep->user_dir_list) = evas_list_remove_list(*(ep->user_dir_list), *(ep->user_dir_list)); *(ep->user_dir_list) = evas_list_remove_list(*(ep->user_dir_list), *(ep->user_dir_list));
evas_stringshare_del(epd->dir); eina_stringshare_del(epd->dir);
free(epd); free(epd);
} }
_e_path_cache_free(ep); _e_path_cache_free(ep);
@ -247,7 +247,7 @@ e_path_find(E_Path *ep, const char *file)
if (!file) return NULL; if (!file) return NULL;
str = evas_hash_find(ep->hash, file); str = evas_hash_find(ep->hash, file);
if (str) return evas_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) for (l = ep->default_dir_list; l; l = l->next)
{ {
@ -262,8 +262,8 @@ e_path_find(E_Path *ep, const char *file)
if (evas_hash_size(ep->hash) >= 512) if (evas_hash_size(ep->hash) >= 512)
_e_path_cache_free(ep); _e_path_cache_free(ep);
ep->hash = evas_hash_add(ep->hash, file, ep->hash = evas_hash_add(ep->hash, file,
evas_stringshare_add(buf)); eina_stringshare_add(buf));
return evas_stringshare_add(buf); return eina_stringshare_add(buf);
} }
} }
} }
@ -281,8 +281,8 @@ e_path_find(E_Path *ep, const char *file)
if (evas_hash_size(ep->hash) >= 512) if (evas_hash_size(ep->hash) >= 512)
_e_path_cache_free(ep); _e_path_cache_free(ep);
ep->hash = evas_hash_add(ep->hash, file, ep->hash = evas_hash_add(ep->hash, file,
evas_stringshare_add(buf)); eina_stringshare_add(buf));
return evas_stringshare_add(buf); return eina_stringshare_add(buf);
} }
} }
} }
@ -307,7 +307,7 @@ e_path_evas_append(E_Path *ep, Evas *evas)
epd = l->data; epd = l->data;
if (epd->dir) evas_font_path_append(evas, epd->dir); if (epd->dir) evas_font_path_append(evas, epd->dir);
evas_stringshare_del(epd->dir); eina_stringshare_del(epd->dir);
free(epd); free(epd);
} }
if (dir_list) evas_list_free(dir_list); if (dir_list) evas_list_free(dir_list);
@ -330,7 +330,7 @@ e_path_dir_list_get(E_Path *ep)
{ {
epd = l->data; epd = l->data;
new_epd = malloc(sizeof(E_Path_Dir)); new_epd = malloc(sizeof(E_Path_Dir));
new_epd->dir = evas_stringshare_add(epd->dir); new_epd->dir = eina_stringshare_add(epd->dir);
dir_list = evas_list_append(dir_list, new_epd); dir_list = evas_list_append(dir_list, new_epd);
} }
} }
@ -339,7 +339,7 @@ e_path_dir_list_get(E_Path *ep)
{ {
epd = l->data; epd = l->data;
new_epd = malloc(sizeof(E_Path_Dir)); new_epd = malloc(sizeof(E_Path_Dir));
new_epd->dir = evas_stringshare_add(epd->dir); new_epd->dir = eina_stringshare_add(epd->dir);
dir_list = evas_list_append(dir_list, new_epd); dir_list = evas_list_append(dir_list, new_epd);
} }
@ -355,7 +355,7 @@ e_path_dir_list_free(Evas_List *dir_list)
{ {
epd = dir_list->data; epd = dir_list->data;
dir_list = evas_list_remove_list(dir_list, dir_list); dir_list = evas_list_remove_list(dir_list, dir_list);
evas_stringshare_del(epd->dir); eina_stringshare_del(epd->dir);
free(epd); free(epd);
} }
} }
@ -369,7 +369,7 @@ _e_path_free(E_Path *ep)
{ {
E_Path_Dir *epd; E_Path_Dir *epd;
epd = ep->default_dir_list->data; epd = ep->default_dir_list->data;
evas_stringshare_del(epd->dir); eina_stringshare_del(epd->dir);
free(epd); free(epd);
ep->default_dir_list = evas_list_remove_list(ep->default_dir_list, ep->default_dir_list = evas_list_remove_list(ep->default_dir_list,
ep->default_dir_list); ep->default_dir_list);
@ -389,6 +389,6 @@ _e_path_cache_free(E_Path *ep)
static Evas_Bool static Evas_Bool
_e_path_cache_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__) _e_path_cache_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__)
{ {
evas_stringshare_del(data); eina_stringshare_del(data);
return 1; return 1;
} }

18
src/bin/e_pointer.c
View File

@ -131,7 +131,7 @@ e_pointers_size_set(int size)
{ {
p->type = NULL; p->type = NULL;
_e_pointer_type_set(p, type); _e_pointer_type_set(p, type);
evas_stringshare_del(type); eina_stringshare_del(type);
} }
} }
} }
@ -158,7 +158,7 @@ e_pointer_type_push(E_Pointer *p, void *obj, const char *type)
stack = E_NEW(E_Pointer_Stack, 1); stack = E_NEW(E_Pointer_Stack, 1);
if (stack) if (stack)
{ {
stack->type = evas_stringshare_add(p->type); stack->type = eina_stringshare_add(p->type);
stack->obj = p->obj; stack->obj = p->obj;
p->stack = evas_list_prepend(p->stack, stack); p->stack = evas_list_prepend(p->stack, stack);
} }
@ -188,7 +188,7 @@ e_pointer_type_pop(E_Pointer *p, void *obj, const char *type)
{ {
if (p->evas) _e_pointer_canvas_del(p); if (p->evas) _e_pointer_canvas_del(p);
ecore_x_window_cursor_set(p->win, 0); ecore_x_window_cursor_set(p->win, 0);
if (p->type) evas_stringshare_del(p->type); if (p->type) eina_stringshare_del(p->type);
p->type = NULL; p->type = NULL;
return; return;
} }
@ -196,8 +196,8 @@ e_pointer_type_pop(E_Pointer *p, void *obj, const char *type)
stack = p->stack->data; stack = p->stack->data;
_e_pointer_type_set(p, stack->type); _e_pointer_type_set(p, stack->type);
if (p->type) evas_stringshare_del(p->type); if (p->type) eina_stringshare_del(p->type);
p->type = evas_stringshare_add(stack->type); p->type = eina_stringshare_add(stack->type);
p->obj = stack->obj; p->obj = stack->obj;
/* try the default cursor next time */ /* try the default cursor next time */
@ -342,7 +342,7 @@ _e_pointer_free(E_Pointer *p)
p->stack = evas_list_remove_list(p->stack, p->stack); p->stack = evas_list_remove_list(p->stack, p->stack);
} }
if (p->type) evas_stringshare_del(p->type); if (p->type) eina_stringshare_del(p->type);
if (p->idle_timer) ecore_timer_del(p->idle_timer); if (p->idle_timer) ecore_timer_del(p->idle_timer);
if (p->idle_poller) ecore_poller_del(p->idle_poller); if (p->idle_poller) ecore_poller_del(p->idle_poller);
@ -356,7 +356,7 @@ _e_pointer_free(E_Pointer *p)
static void static void
_e_pointer_stack_free(E_Pointer_Stack *elem) _e_pointer_stack_free(E_Pointer_Stack *elem)
{ {
if (elem->type) evas_stringshare_del(elem->type); if (elem->type) eina_stringshare_del(elem->type);
free(elem); free(elem);
} }
@ -366,8 +366,8 @@ _e_pointer_type_set(E_Pointer *p, const char *type)
/* Check if this pointer is already set */ /* Check if this pointer is already set */
if ((p->type) && (!strcmp(p->type, type))) return 1; if ((p->type) && (!strcmp(p->type, type))) return 1;
if (p->type) evas_stringshare_del(p->type); if (p->type) eina_stringshare_del(p->type);
p->type = evas_stringshare_add(type); p->type = eina_stringshare_add(type);
/* Do not set type if in "hidden mode" */ /* Do not set type if in "hidden mode" */
if (!e_config->show_cursor) if (!e_config->show_cursor)

38
src/bin/e_remember.c
View File

@ -211,12 +211,12 @@ e_remember_update(E_Remember *rem, E_Border *bd)
{ {
if (!rem) return; if (!rem) return;
if (bd->new_client) return; if (bd->new_client) return;
if (rem->name) evas_stringshare_del(rem->name); if (rem->name) eina_stringshare_del(rem->name);
if (rem->class) evas_stringshare_del(rem->class); if (rem->class) eina_stringshare_del(rem->class);
if (rem->title) evas_stringshare_del(rem->title); if (rem->title) eina_stringshare_del(rem->title);
if (rem->role) evas_stringshare_del(rem->role); if (rem->role) eina_stringshare_del(rem->role);
if (rem->prop.border) evas_stringshare_del(rem->prop.border); if (rem->prop.border) eina_stringshare_del(rem->prop.border);
if (rem->prop.command) evas_stringshare_del(rem->prop.command); if (rem->prop.command) eina_stringshare_del(rem->prop.command);
rem->name = NULL; rem->name = NULL;
rem->class = NULL; rem->class = NULL;
rem->title = NULL; rem->title = NULL;
@ -225,15 +225,15 @@ e_remember_update(E_Remember *rem, E_Border *bd)
rem->prop.command = NULL; rem->prop.command = NULL;
if (bd->client.icccm.name) if (bd->client.icccm.name)
rem->name = evas_stringshare_add(bd->client.icccm.name); rem->name = eina_stringshare_add(bd->client.icccm.name);
if (bd->client.icccm.class) if (bd->client.icccm.class)
rem->class = evas_stringshare_add(bd->client.icccm.class); rem->class = eina_stringshare_add(bd->client.icccm.class);
if (bd->client.netwm.name) if (bd->client.netwm.name)
rem->title = evas_stringshare_add(bd->client.netwm.name); rem->title = eina_stringshare_add(bd->client.netwm.name);
else if (bd->client.icccm.title) else if (bd->client.icccm.title)
rem->title = evas_stringshare_add(bd->client.icccm.title); rem->title = eina_stringshare_add(bd->client.icccm.title);
if (bd->client.icccm.window_role) if (bd->client.icccm.window_role)
rem->role = evas_stringshare_add(bd->client.icccm.window_role); rem->role = eina_stringshare_add(bd->client.icccm.window_role);
e_remember_match_update(rem); e_remember_match_update(rem);
@ -281,7 +281,7 @@ e_remember_update(E_Remember *rem, E_Border *bd)
rem->prop.lock_life = bd->lock_life; rem->prop.lock_life = bd->lock_life;
if (bd->bordername) if (bd->bordername)
rem->prop.border = evas_stringshare_add(bd->bordername); rem->prop.border = eina_stringshare_add(bd->bordername);
rem->prop.sticky = bd->sticky; rem->prop.sticky = bd->sticky;
@ -339,7 +339,7 @@ e_remember_update(E_Remember *rem, E_Border *bd)
} }
buf[k] = 0; buf[k] = 0;
done: done:
rem->prop.command = evas_stringshare_add(buf); rem->prop.command = eina_stringshare_add(buf);
} }
e_config_save_queue(); e_config_save_queue();
@ -456,12 +456,12 @@ static void
_e_remember_free(E_Remember *rem) _e_remember_free(E_Remember *rem)
{ {
e_config->remembers = evas_list_remove(e_config->remembers, rem); e_config->remembers = evas_list_remove(e_config->remembers, rem);
if (rem->name) evas_stringshare_del(rem->name); if (rem->name) eina_stringshare_del(rem->name);
if (rem->class) evas_stringshare_del(rem->class); if (rem->class) eina_stringshare_del(rem->class);
if (rem->title) evas_stringshare_del(rem->title); if (rem->title) eina_stringshare_del(rem->title);
if (rem->role) evas_stringshare_del(rem->role); if (rem->role) eina_stringshare_del(rem->role);
if (rem->prop.border) evas_stringshare_del(rem->prop.border); if (rem->prop.border) eina_stringshare_del(rem->prop.border);
if (rem->prop.command) evas_stringshare_del(rem->prop.command); if (rem->prop.command) eina_stringshare_del(rem->prop.command);
free(rem); free(rem);
} }

32
src/bin/e_shelf.c
View File

@ -119,7 +119,7 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
} }
es->fit_along = 1; es->fit_along = 1;
es->layer = layer; es->layer = layer;
es->style = evas_stringshare_add(style); es->style = eina_stringshare_add(style);
es->o_event = evas_object_rectangle_add(es->evas); es->o_event = evas_object_rectangle_add(es->evas);
evas_object_color_set(es->o_event, 0, 0, 0, 0); evas_object_color_set(es->o_event, 0, 0, 0, 0);
@ -137,7 +137,7 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT, _e_shelf_cb_mouse_out, es)); ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT, _e_shelf_cb_mouse_out, es));
es->o_base = edje_object_add(es->evas); es->o_base = edje_object_add(es->evas);
es->name = evas_stringshare_add(name); es->name = eina_stringshare_add(name);
snprintf(buf, sizeof(buf), "e/shelf/%s/base", es->style); snprintf(buf, sizeof(buf), "e/shelf/%s/base", es->style);
evas_object_resize(es->o_base, es->w, es->h); evas_object_resize(es->o_base, es->w, es->h);
if (!e_theme_edje_object_set(es->o_base, "base/theme/shelf", buf)) if (!e_theme_edje_object_set(es->o_base, "base/theme/shelf", buf))
@ -396,22 +396,22 @@ e_shelf_save(E_Shelf *es)
if (es->cfg) if (es->cfg)
{ {
es->cfg->orient = es->gadcon->orient; es->cfg->orient = es->gadcon->orient;
if (es->cfg->style) evas_stringshare_del(es->cfg->style); if (es->cfg->style) eina_stringshare_del(es->cfg->style);
es->cfg->style = evas_stringshare_add(es->style); es->cfg->style = eina_stringshare_add(es->style);
} }
else else
{ {
E_Config_Shelf *cf_es; E_Config_Shelf *cf_es;
cf_es = E_NEW(E_Config_Shelf, 1); cf_es = E_NEW(E_Config_Shelf, 1);
cf_es->name = evas_stringshare_add(es->name); cf_es->name = eina_stringshare_add(es->name);
cf_es->container = es->zone->container->num; cf_es->container = es->zone->container->num;
cf_es->zone = es->zone->num; cf_es->zone = es->zone->num;
if (es->popup) cf_es->popup = 1; if (es->popup) cf_es->popup = 1;
cf_es->layer = es->layer; cf_es->layer = es->layer;
e_config->shelves = evas_list_append(e_config->shelves, cf_es); e_config->shelves = evas_list_append(e_config->shelves, cf_es);
cf_es->orient = es->gadcon->orient; cf_es->orient = es->gadcon->orient;
cf_es->style = evas_stringshare_add(es->style); cf_es->style = eina_stringshare_add(es->style);
cf_es->fit_along = es->fit_along; cf_es->fit_along = es->fit_along;
cf_es->fit_size = es->fit_size; cf_es->fit_size = es->fit_size;
cf_es->overlap = 0; cf_es->overlap = 0;
@ -431,8 +431,8 @@ e_shelf_unsave(E_Shelf *es)
if (es->cfg) if (es->cfg)
{ {
e_config->shelves = evas_list_remove(e_config->shelves, es->cfg); e_config->shelves = evas_list_remove(e_config->shelves, es->cfg);
evas_stringshare_del(es->cfg->name); eina_stringshare_del(es->cfg->name);
if (es->cfg->style) evas_stringshare_del(es->cfg->style); if (es->cfg->style) eina_stringshare_del(es->cfg->style);
free(es->cfg); free(es->cfg);
} }
} }
@ -571,8 +571,8 @@ e_shelf_style_set(E_Shelf *es, const char *style)
if (!es->o_base) return; if (!es->o_base) return;
if (es->style) if (es->style)
evas_stringshare_del(es->style); eina_stringshare_del(es->style);
es->style = evas_stringshare_add(style); es->style = eina_stringshare_add(style);
if (style) if (style)
snprintf(buf, sizeof(buf), "e/shelf/%s/base", style); snprintf(buf, sizeof(buf), "e/shelf/%s/base", style);
@ -717,8 +717,8 @@ _e_shelf_free(E_Shelf *es)
if (es->config_dialog) e_object_del(E_OBJECT(es->config_dialog)); if (es->config_dialog) e_object_del(E_OBJECT(es->config_dialog));
shelves = evas_list_remove(shelves, es); shelves = evas_list_remove(shelves, es);
e_object_del(E_OBJECT(es->gadcon)); e_object_del(E_OBJECT(es->gadcon));
evas_stringshare_del(es->name); eina_stringshare_del(es->name);
evas_stringshare_del(es->style); eina_stringshare_del(es->style);
evas_object_del(es->o_event); evas_object_del(es->o_event);
evas_object_del(es->o_base); evas_object_del(es->o_base);
if (es->popup) if (es->popup)
@ -1156,8 +1156,8 @@ _e_shelf_cb_confirm_dialog_yes(void *data)
if (e_object_is_del(E_OBJECT(es))) return; if (e_object_is_del(E_OBJECT(es))) return;
e_object_del(E_OBJECT(es)); e_object_del(E_OBJECT(es));
e_config->shelves = evas_list_remove(e_config->shelves, cfg); e_config->shelves = evas_list_remove(e_config->shelves, cfg);
if (cfg->name) evas_stringshare_del(cfg->name); if (cfg->name) eina_stringshare_del(cfg->name);
if (cfg->style) evas_stringshare_del(cfg->style); if (cfg->style) eina_stringshare_del(cfg->style);
E_FREE(cfg); E_FREE(cfg);
e_config_save_queue(); e_config_save_queue();
@ -1178,8 +1178,8 @@ _e_shelf_cb_menu_delete(void *data, E_Menu *m, E_Menu_Item *mi)
if (e_object_is_del(E_OBJECT(es))) return; if (e_object_is_del(E_OBJECT(es))) return;
e_object_del(E_OBJECT(es)); e_object_del(E_OBJECT(es));
e_config->shelves = evas_list_remove(e_config->shelves, cfg); e_config->shelves = evas_list_remove(e_config->shelves, cfg);
if (cfg->name) evas_stringshare_del(cfg->name); if (cfg->name) eina_stringshare_del(cfg->name);
if (cfg->style) evas_stringshare_del(cfg->style); if (cfg->style) eina_stringshare_del(cfg->style);
E_FREE(cfg); E_FREE(cfg);
e_config_save_queue(); e_config_save_queue();

8
src/bin/e_slidecore.c
View File

@ -77,8 +77,8 @@ e_slidecore_item_add(Evas_Object *obj, const char *label, const char *icon, voi
API_ENTRY return; API_ENTRY return;
it = calloc(1, sizeof(E_Smart_Item)); it = calloc(1, sizeof(E_Smart_Item));
if (!it) return; if (!it) return;
if (label) it->label = evas_stringshare_add(label); if (label) it->label = eina_stringshare_add(label);
if (icon) it->icon = evas_stringshare_add(icon); if (icon) it->icon = eina_stringshare_add(icon);
it->func = func; it->func = func;
it->data = data; it->data = data;
sd->items = evas_list_append(sd->items, it); sd->items = evas_list_append(sd->items, it);
@ -324,8 +324,8 @@ _e_smart_del(Evas_Object *obj)
it = sd->items->data; it = sd->items->data;
sd->items = evas_list_remove_list(sd->items, sd->items); sd->items = evas_list_remove_list(sd->items, sd->items);
if (it->label) evas_stringshare_del(it->label); if (it->label) eina_stringshare_del(it->label);
if (it->icon) evas_stringshare_del(it->icon); if (it->icon) eina_stringshare_del(it->icon);
free(it); free(it);
} }
evas_object_del(sd->event_obj); evas_object_del(sd->event_obj);

6
src/bin/e_slider.c
View File

@ -164,9 +164,9 @@ e_slider_value_format_display_set(Evas_Object *obj, const char *format)
API_ENTRY return; API_ENTRY return;
if (((sd->format) && (!format)) || ((!sd->format) && (format))) changed = 1; if (((sd->format) && (!format)) || ((!sd->format) && (format))) changed = 1;
if (sd->format) evas_stringshare_del(sd->format); if (sd->format) eina_stringshare_del(sd->format);
sd->format = NULL; sd->format = NULL;
if (format) sd->format = evas_stringshare_add(format); if (format) sd->format = eina_stringshare_add(format);
if (changed) if (changed)
{ {
if (sd->format) if (sd->format)
@ -462,7 +462,7 @@ _e_smart_del(Evas_Object *obj)
{ {
INTERNAL_ENTRY; INTERNAL_ENTRY;
evas_object_del(sd->edje_obj); evas_object_del(sd->edje_obj);
if (sd->format) evas_stringshare_del(sd->format); if (sd->format) eina_stringshare_del(sd->format);
if (sd->set_timer) ecore_timer_del(sd->set_timer); if (sd->set_timer) ecore_timer_del(sd->set_timer);
free(sd); free(sd);
} }

4
src/bin/e_slidesel.c
View File

@ -89,8 +89,8 @@ e_slidesel_item_add(Evas_Object *obj, const char *label, const char *icon, void
it = calloc(1, sizeof(E_Smart_Item)); it = calloc(1, sizeof(E_Smart_Item));
if (!it) return; if (!it) return;
it->sd = sd; it->sd = sd;
if (label) it->label = evas_stringshare_add(label); if (label) it->label = eina_stringshare_add(label);
if (icon) it->icon = evas_stringshare_add(icon); if (icon) it->icon = eina_stringshare_add(icon);
it->func = func; it->func = func;
it->data = data; it->data = data;
sd->items = evas_list_append(sd->items, it); sd->items = evas_list_append(sd->items, it);

38
src/bin/e_theme.c
View File

@ -121,22 +121,22 @@ e_theme_shutdown(void)
} }
while (categories) while (categories)
{ {
evas_stringshare_del(categories->data); eina_stringshare_del(categories->data);
categories = evas_list_remove_list(categories, categories); categories = evas_list_remove_list(categories, categories);
} }
while (transitions) while (transitions)
{ {
evas_stringshare_del(transitions->data); eina_stringshare_del(transitions->data);
transitions = evas_list_remove_list(transitions, transitions); transitions = evas_list_remove_list(transitions, transitions);
} }
while (borders) while (borders)
{ {
evas_stringshare_del(borders->data); eina_stringshare_del(borders->data);
borders = evas_list_remove_list(borders, borders); borders = evas_list_remove_list(borders, borders);
} }
while (shelfs) while (shelfs)
{ {
evas_stringshare_del(shelfs->data); eina_stringshare_del(shelfs->data);
shelfs = evas_list_remove_list(shelfs, shelfs); shelfs = evas_list_remove_list(shelfs, shelfs);
} }
return 1; return 1;
@ -252,7 +252,7 @@ e_theme_edje_file_get(const char *category, const char *group)
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 = evas_stringshare_add(l->data); q = eina_stringshare_add(l->data);
res->quickfind = evas_hash_direct_add(res->quickfind, q, q); res->quickfind = evas_hash_direct_add(res->quickfind, q, q);
} }
if (coll) edje_file_collection_list_free(coll); if (coll) edje_file_collection_list_free(coll);
@ -306,13 +306,13 @@ e_theme_file_set(const char *category, const char *file)
if (res->file) if (res->file)
{ {
e_filereg_deregister(res->file); e_filereg_deregister(res->file);
evas_stringshare_del(res->file); eina_stringshare_del(res->file);
} }
if (res->cache) evas_stringshare_del(res->cache); if (res->cache) eina_stringshare_del(res->cache);
free(res); free(res);
} }
res = calloc(1, sizeof(E_Theme_Result)); res = calloc(1, sizeof(E_Theme_Result));
res->file = evas_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); mappings = evas_hash_add(mappings, category, res);
} }
@ -334,16 +334,16 @@ e_theme_config_set(const char *category, const char *file)
ect = evas_list_data(next); ect = evas_list_data(next);
if (!strcmp(ect->category, category)) if (!strcmp(ect->category, category))
{ {
if (ect->file) evas_stringshare_del(ect->file); if (ect->file) eina_stringshare_del(ect->file);
ect->file = evas_stringshare_add(file); ect->file = eina_stringshare_add(file);
return 1; return 1;
} }
} }
/* the text class doesnt exist */ /* the text class doesnt exist */
ect = E_NEW(E_Config_Theme, 1); ect = E_NEW(E_Config_Theme, 1);
ect->category = evas_stringshare_add(category); ect->category = eina_stringshare_add(category);
ect->file = evas_stringshare_add(file); ect->file = eina_stringshare_add(file);
e_config->themes = evas_list_append(e_config->themes, ect); e_config->themes = evas_list_append(e_config->themes, ect);
return 1; return 1;
@ -381,8 +381,8 @@ e_theme_config_remove(const char *category)
if (!strcmp(ect->category, category)) if (!strcmp(ect->category, category))
{ {
e_config->themes = evas_list_remove_list(e_config->themes, next); e_config->themes = evas_list_remove_list(e_config->themes, next);
if (ect->category) evas_stringshare_del(ect->category); if (ect->category) eina_stringshare_del(ect->category);
if (ect->file) evas_stringshare_del(ect->file); if (ect->file) eina_stringshare_del(ect->file);
free(ect); free(ect);
return 1; return 1;
} }
@ -500,8 +500,8 @@ _e_theme_mappings_free_cb(const Evas_Hash *hash, const char *key, void *data, vo
E_Theme_Result *res; E_Theme_Result *res;
res = data; res = data;
if (res->file) evas_stringshare_del(res->file); if (res->file) eina_stringshare_del(res->file);
if (res->cache) evas_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); evas_hash_foreach(res->quickfind, _e_theme_mappings_quickfind_free_cb, NULL);
@ -514,7 +514,7 @@ _e_theme_mappings_free_cb(const Evas_Hash *hash, const char *key, void *data, vo
static Evas_Bool static Evas_Bool
_e_theme_mappings_quickfind_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata) _e_theme_mappings_quickfind_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata)
{ {
evas_stringshare_del(key); eina_stringshare_del(key);
return 1; return 1;
} }
@ -528,7 +528,7 @@ _e_theme_category_register(const char *category)
if (!strcmp(category, l->data)) return; if (!strcmp(category, l->data)) return;
} }
categories = evas_list_append(categories, evas_stringshare_add(category)); categories = evas_list_append(categories, eina_stringshare_add(category));
} }
static Evas_List * static Evas_List *
@ -540,7 +540,7 @@ _e_theme_collection_item_register(Evas_List *list, const char *name)
{ {
if (!strcmp(name, l->data)) return list; if (!strcmp(name, l->data)) return list;
} }
list = evas_list_append(list, evas_stringshare_add(name)); list = evas_list_append(list, eina_stringshare_add(name));
return list; return list;
} }

12
src/bin/e_thumb.c
View File

@ -96,12 +96,12 @@ e_thumb_icon_file_set(Evas_Object *obj, const char *file, const char *key)
eth = evas_object_data_get(obj, "e_thumbdata"); eth = evas_object_data_get(obj, "e_thumbdata");
if (!eth) return; if (!eth) return;
if (eth->file) evas_stringshare_del(eth->file); if (eth->file) eina_stringshare_del(eth->file);
eth->file = NULL; eth->file = NULL;
if (eth->key) evas_stringshare_del(eth->key); if (eth->key) eina_stringshare_del(eth->key);
eth->key = NULL; eth->key = NULL;
if (file) eth->file = evas_stringshare_add(file); if (file) eth->file = eina_stringshare_add(file);
if (key) eth->key = evas_stringshare_add(key); if (key) eth->key = eina_stringshare_add(key);
} }
EAPI void EAPI void
@ -305,8 +305,8 @@ _e_thumb_del_hook(void *data, Evas *e, Evas_Object *obj, void *event_info)
} }
if (eth->queued) if (eth->queued)
_thumb_queue = evas_list_remove(_thumb_queue, eth); _thumb_queue = evas_list_remove(_thumb_queue, eth);
if (eth->file) evas_stringshare_del(eth->file); if (eth->file) eina_stringshare_del(eth->file);
if (eth->key) evas_stringshare_del(eth->key); if (eth->key) eina_stringshare_del(eth->key);
free(eth); free(eth);
} }

4
src/bin/e_toolbar.c
View File

@ -58,7 +58,7 @@ e_toolbar_new(Evas *evas, const char *name, E_Win *fwin, Evas_Object *fm2)
tbar->h = 32; tbar->h = 32;
tbar->w = fwin->w; tbar->w = fwin->w;
tbar->evas = evas; tbar->evas = evas;
tbar->name = evas_stringshare_add(name); tbar->name = eina_stringshare_add(name);
tbar->fwin = fwin; tbar->fwin = fwin;
tbar->fm2 = fm2; tbar->fm2 = fm2;
@ -264,7 +264,7 @@ _e_toolbar_free(E_Toolbar *tbar)
} }
if (tbar->cfg_dlg) e_object_del(E_OBJECT(tbar->cfg_dlg)); if (tbar->cfg_dlg) e_object_del(E_OBJECT(tbar->cfg_dlg));
e_object_del(E_OBJECT(tbar->gadcon)); e_object_del(E_OBJECT(tbar->gadcon));
if (tbar->name) evas_stringshare_del(tbar->name); if (tbar->name) eina_stringshare_del(tbar->name);
evas_object_del(tbar->o_event); evas_object_del(tbar->o_event);
evas_object_del(tbar->o_base); evas_object_del(tbar->o_base);
E_FREE(tbar); E_FREE(tbar);

8
src/bin/e_win.c
View File

@ -383,11 +383,11 @@ e_win_border_icon_set(E_Win *win, const char *icon)
if (!border) return; if (!border) return;
if (border->internal_icon) if (border->internal_icon)
{ {
evas_stringshare_del(border->internal_icon); eina_stringshare_del(border->internal_icon);
border->internal_icon = NULL; border->internal_icon = NULL;
} }
if (icon) if (icon)
border->internal_icon = evas_stringshare_add(icon); border->internal_icon = eina_stringshare_add(icon);
} }
EAPI void EAPI void
@ -399,11 +399,11 @@ e_win_border_icon_key_set(E_Win *win, const char *key)
if (!border) return; if (!border) return;
if (border->internal_icon_key) if (border->internal_icon_key)
{ {
evas_stringshare_del(border->internal_icon_key); eina_stringshare_del(border->internal_icon_key);
border->internal_icon_key = NULL; border->internal_icon_key = NULL;
} }
if (key) if (key)
border->internal_icon_key = evas_stringshare_add(key); border->internal_icon_key = eina_stringshare_add(key);
} }
/* local subsystem functions */ /* local subsystem functions */

8
src/bin/e_zone.c
View File

@ -105,7 +105,7 @@ e_zone_new(E_Container *con, int num, int id, int x, int y, int w, int h)
_e_zone_cb_desk_show, zone)); _e_zone_cb_desk_show, zone));
snprintf(name, sizeof(name), "Zone %d", zone->num); snprintf(name, sizeof(name), "Zone %d", zone->num);
zone->name = evas_stringshare_add(name); zone->name = eina_stringshare_add(name);
con->zones = evas_list_append(con->zones, zone); con->zones = evas_list_append(con->zones, zone);
@ -172,8 +172,8 @@ e_zone_name_set(E_Zone *zone, const char *name)
E_OBJECT_CHECK(zone); E_OBJECT_CHECK(zone);
E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE); E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
if (zone->name) evas_stringshare_del(zone->name); if (zone->name) eina_stringshare_del(zone->name);
zone->name = evas_stringshare_add(name); zone->name = eina_stringshare_add(name);
} }
EAPI void EAPI void
@ -740,7 +740,7 @@ _e_zone_free(E_Zone *zone)
zone->handlers = NULL; zone->handlers = NULL;
con = zone->container; con = zone->container;
if (zone->name) evas_stringshare_del(zone->name); if (zone->name) eina_stringshare_del(zone->name);
con->zones = evas_list_remove(con->zones, zone); con->zones = evas_list_remove(con->zones, zone);
evas_object_del(zone->bg_event_object); evas_object_del(zone->bg_event_object);
evas_object_del(zone->bg_clip_object); evas_object_del(zone->bg_clip_object);

16
src/modules/conf/e_conf.c
View File

@ -224,7 +224,7 @@ _e_configure_free(E_Configure *eco)
cat = eco->cats->data; cat = eco->cats->data;
if (!cat) continue; if (!cat) continue;
if (cat->label) if (cat->label)
evas_stringshare_del(cat->label); eina_stringshare_del(cat->label);
while (cat->items) while (cat->items)
{ {
@ -233,13 +233,13 @@ _e_configure_free(E_Configure *eco)
ci = cat->items->data; ci = cat->items->data;
if (!ci) continue; if (!ci) continue;
if (ci->label) if (ci->label)
evas_stringshare_del(ci->label); eina_stringshare_del(ci->label);
if (ci->icon) if (ci->icon)
evas_stringshare_del(ci->icon); eina_stringshare_del(ci->icon);
if (ci->cb) if (ci->cb)
{ {
if (ci->cb->path) if (ci->cb->path)
evas_stringshare_del(ci->cb->path); eina_stringshare_del(ci->cb->path);
free(ci->cb); free(ci->cb);
} }
cat->items = evas_list_remove_list(cat->items, cat->items); cat->items = evas_list_remove_list(cat->items, cat->items);
@ -300,7 +300,7 @@ _e_configure_category_add(E_Configure *eco, const char *label, const char *icon)
cat = E_NEW(E_Configure_Category, 1); cat = E_NEW(E_Configure_Category, 1);
cat->eco = eco; cat->eco = eco;
cat->label = evas_stringshare_add(label); cat->label = eina_stringshare_add(label);
if (icon) if (icon)
{ {
if (e_util_edje_icon_check(icon)) if (e_util_edje_icon_check(icon))
@ -372,10 +372,10 @@ _e_configure_item_add(E_Configure_Category *cat, const char *label, const char *
ci = E_NEW(E_Configure_Item, 1); ci = E_NEW(E_Configure_Item, 1);
cb = E_NEW(E_Configure_CB, 1); cb = E_NEW(E_Configure_CB, 1);
cb->eco = cat->eco; cb->eco = cat->eco;
cb->path = evas_stringshare_add(path); cb->path = eina_stringshare_add(path);
ci->cb = cb; ci->cb = cb;
ci->label = evas_stringshare_add(label); ci->label = eina_stringshare_add(label);
if (icon) ci->icon = evas_stringshare_add(icon); if (icon) ci->icon = eina_stringshare_add(icon);
cat->items = evas_list_append(cat->items, ci); cat->items = evas_list_append(cat->items, ci);
} }

56
src/modules/conf_applications/e_int_config_apps.c
View File

@ -48,10 +48,10 @@ e_int_config_apps_favs(E_Container *con, const char *params __UNUSED__)
snprintf(buf, sizeof(buf), "%s/.e/e/applications/menu/favorite.menu", snprintf(buf, sizeof(buf), "%s/.e/e/applications/menu/favorite.menu",
e_user_homedir_get()); e_user_homedir_get());
data = E_NEW(E_Config_Data, 1); data = E_NEW(E_Config_Data, 1);
data->title = evas_stringshare_add(_("Favorites Menu")); data->title = eina_stringshare_add(_("Favorites Menu"));
data->dialog = evas_stringshare_add("_config_apps_favs_dialog"); data->dialog = eina_stringshare_add("_config_apps_favs_dialog");
data->icon = evas_stringshare_add("enlightenment/favorites"); data->icon = eina_stringshare_add("enlightenment/favorites");
data->filename = evas_stringshare_add(buf); data->filename = eina_stringshare_add(buf);
return _create_dialog(con, data); return _create_dialog(con, data);
} }
@ -103,10 +103,10 @@ e_int_config_apps_ibar(E_Container *con, const char *params __UNUSED__)
snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/default/.order", snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/default/.order",
e_user_homedir_get()); e_user_homedir_get());
data = E_NEW(E_Config_Data, 1); data = E_NEW(E_Config_Data, 1);
data->title = evas_stringshare_add(_("IBar Applications")); data->title = eina_stringshare_add(_("IBar Applications"));
data->dialog = evas_stringshare_add("_config_apps_ibar_dialog"); data->dialog = eina_stringshare_add("_config_apps_ibar_dialog");
data->icon = evas_stringshare_add("enlightenment/ibar_applications"); data->icon = eina_stringshare_add("enlightenment/ibar_applications");
data->filename = evas_stringshare_add(buf); data->filename = eina_stringshare_add(buf);
return _create_dialog(con, data); return _create_dialog(con, data);
} }
@ -118,10 +118,10 @@ e_int_config_apps_ibar_other(E_Container *con, const char *path)
if (!path) return NULL; if (!path) return NULL;
data = E_NEW(E_Config_Data, 1); data = E_NEW(E_Config_Data, 1);
data->title = evas_stringshare_add(_("IBar Applications")); data->title = eina_stringshare_add(_("IBar Applications"));
data->dialog = evas_stringshare_add("_config_apps_ibar_dialog"); data->dialog = eina_stringshare_add("_config_apps_ibar_dialog");
data->icon = evas_stringshare_add("enlightenment/ibar_applications"); data->icon = eina_stringshare_add("enlightenment/ibar_applications");
data->filename = evas_stringshare_add(path); data->filename = eina_stringshare_add(path);
return _create_dialog(con, data); return _create_dialog(con, data);
} }
@ -135,10 +135,10 @@ e_int_config_apps_startup(E_Container *con, const char *params __UNUSED__)
snprintf(buf, sizeof(buf), "%s/.e/e/applications/startup/.order", snprintf(buf, sizeof(buf), "%s/.e/e/applications/startup/.order",
e_user_homedir_get()); e_user_homedir_get());
data = E_NEW(E_Config_Data, 1); data = E_NEW(E_Config_Data, 1);
data->title = evas_stringshare_add(_("Startup Applications")); data->title = eina_stringshare_add(_("Startup Applications"));
data->dialog = evas_stringshare_add("_config_apps_startup_dialog"); data->dialog = eina_stringshare_add("_config_apps_startup_dialog");
data->icon = evas_stringshare_add("enlightenment/startup_applications"); data->icon = eina_stringshare_add("enlightenment/startup_applications");
data->filename = evas_stringshare_add(buf); data->filename = eina_stringshare_add(buf);
return _create_dialog(con, data); return _create_dialog(con, data);
} }
@ -152,10 +152,10 @@ e_int_config_apps_restart(E_Container *con, const char *params __UNUSED__)
snprintf(buf, sizeof(buf), "%s/.e/e/applications/restart/.order", snprintf(buf, sizeof(buf), "%s/.e/e/applications/restart/.order",
e_user_homedir_get()); e_user_homedir_get());
data = E_NEW(E_Config_Data, 1); data = E_NEW(E_Config_Data, 1);
data->title = evas_stringshare_add(_("Restart Applications")); data->title = eina_stringshare_add(_("Restart Applications"));
data->dialog = evas_stringshare_add("_config_apps_restart_dialog"); data->dialog = eina_stringshare_add("_config_apps_restart_dialog");
data->icon = evas_stringshare_add("enlightenment/restart_applications"); data->icon = eina_stringshare_add("enlightenment/restart_applications");
data->filename = evas_stringshare_add(buf); data->filename = eina_stringshare_add(buf);
return _create_dialog(con, data); return _create_dialog(con, data);
} }
@ -169,10 +169,10 @@ _create_dialog(E_Container *con, E_Config_Data *data)
if (e_config_dialog_find("E", data->dialog)) if (e_config_dialog_find("E", data->dialog))
{ {
if (data->title) evas_stringshare_del(data->title); if (data->title) eina_stringshare_del(data->title);
if (data->dialog) evas_stringshare_del(data->dialog); if (data->dialog) eina_stringshare_del(data->dialog);
if (data->icon) evas_stringshare_del(data->icon); if (data->icon) eina_stringshare_del(data->icon);
if (data->filename) evas_stringshare_del(data->filename); if (data->filename) eina_stringshare_del(data->filename);
E_FREE(data); E_FREE(data);
return NULL; return NULL;
} }
@ -219,10 +219,10 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
data = cfdata->data; data = cfdata->data;
if (data) if (data)
{ {
if (data->title) evas_stringshare_del(data->title); if (data->title) eina_stringshare_del(data->title);
if (data->dialog) evas_stringshare_del(data->dialog); if (data->dialog) eina_stringshare_del(data->dialog);
if (data->icon) evas_stringshare_del(data->icon); if (data->icon) eina_stringshare_del(data->icon);
if (data->filename) evas_stringshare_del(data->filename); if (data->filename) eina_stringshare_del(data->filename);
E_FREE(data); E_FREE(data);
} }
if (cfdata->apps) ecore_list_destroy(cfdata->apps); if (cfdata->apps) ecore_list_destroy(cfdata->apps);

8
src/modules/conf_borders/e_int_config_borders.c
View File

@ -119,8 +119,8 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
else if (cfdata->container) else if (cfdata->container)
{ {
if (e_config->theme_default_border_style) if (e_config->theme_default_border_style)
evas_stringshare_del(e_config->theme_default_border_style); eina_stringshare_del(e_config->theme_default_border_style);
e_config->theme_default_border_style = evas_stringshare_add(cfdata->bordername); e_config->theme_default_border_style = eina_stringshare_add(cfdata->bordername);
/* FIXME: Should this trigger an E Restart to reset all borders ? */ /* FIXME: Should this trigger an E Restart to reset all borders ? */
} }
e_config_save_queue(); e_config_save_queue();
@ -132,8 +132,8 @@ _basic_apply_border(E_Config_Dialog_Data *cfdata)
{ {
if ((!cfdata->border->lock_border) && (!cfdata->border->shaded)) if ((!cfdata->border->lock_border) && (!cfdata->border->shaded))
{ {
if (cfdata->border->bordername) evas_stringshare_del(cfdata->border->bordername); if (cfdata->border->bordername) eina_stringshare_del(cfdata->border->bordername);
cfdata->border->bordername = evas_stringshare_add(cfdata->bordername); cfdata->border->bordername = eina_stringshare_add(cfdata->bordername);
cfdata->border->client.border.changed = 1; cfdata->border->client.border.changed = 1;
cfdata->border->changed = 1; cfdata->border->changed = 1;
} }

10
src/modules/conf_colors/e_int_config_color_classes.c
View File

@ -171,8 +171,8 @@ _fill_data_hash(E_Config_Dialog_Data *cfdata, const CFColor_Hash *cfhash)
if (cfhash[i].key) if (cfhash[i].key)
{ {
cfc->key = evas_stringshare_add(cfhash[i].key); cfc->key = eina_stringshare_add(cfhash[i].key);
cfc->name = evas_stringshare_add(_(cfhash[i].name)); cfc->name = eina_stringshare_add(_(cfhash[i].name));
cc = e_color_class_find(cfc->key); cc = e_color_class_find(cfc->key);
if (cc) if (cc)
{ {
@ -207,7 +207,7 @@ _fill_data_hash(E_Config_Dialog_Data *cfdata, const CFColor_Hash *cfhash)
} }
} }
else else
cfc->name = evas_stringshare_add(cfhash[i].name); cfc->name = eina_stringshare_add(cfhash[i].name);
cfdata->classes = evas_list_append(cfdata->classes, cfc); cfdata->classes = evas_list_append(cfdata->classes, cfc);
} }
@ -283,9 +283,9 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
cfc = cfdata->classes->data; cfc = cfdata->classes->data;
if (!cfc) continue; if (!cfc) continue;
if (cfc->name) if (cfc->name)
evas_stringshare_del(cfc->name); eina_stringshare_del(cfc->name);
if (cfc->key) if (cfc->key)
evas_stringshare_del(cfc->key); eina_stringshare_del(cfc->key);
E_FREE(cfc); E_FREE(cfc);
cfdata->classes = evas_list_remove_list(cfdata->classes, cfdata->classes); cfdata->classes = evas_list_remove_list(cfdata->classes, cfdata->classes);

8
src/modules/conf_desklock/e_int_config_desklock.c
View File

@ -342,9 +342,9 @@ _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
if (e_config->desklock_background) if (e_config->desklock_background)
{ {
e_filereg_deregister(e_config->desklock_background); e_filereg_deregister(e_config->desklock_background);
evas_stringshare_del(e_config->desklock_background); eina_stringshare_del(e_config->desklock_background);
} }
e_config->desklock_background = evas_stringshare_add(cfdata->bg); e_config->desklock_background = eina_stringshare_add(cfdata->bg);
e_filereg_register(e_config->desklock_background); e_filereg_register(e_config->desklock_background);
} }
@ -361,9 +361,9 @@ _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
if (cfdata->custom_lock_cmd) if (cfdata->custom_lock_cmd)
{ {
if (e_config->desklock_custom_desklock_cmd) if (e_config->desklock_custom_desklock_cmd)
evas_stringshare_del(e_config->desklock_custom_desklock_cmd); eina_stringshare_del(e_config->desklock_custom_desklock_cmd);
e_config->desklock_custom_desklock_cmd = e_config->desklock_custom_desklock_cmd =
evas_stringshare_add(cfdata->custom_lock_cmd); eina_stringshare_add(cfdata->custom_lock_cmd);
} }
e_config_save_queue(); e_config_save_queue();

4
src/modules/conf_exebuf/e_int_config_exebuf.c
View File

@ -143,10 +143,10 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
e_config->exebuf_pos_max_w = cfdata->pos_max_w; e_config->exebuf_pos_max_w = cfdata->pos_max_w;
e_config->exebuf_pos_max_h = cfdata->pos_max_h; e_config->exebuf_pos_max_h = cfdata->pos_max_h;
if (e_config->exebuf_term_cmd) if (e_config->exebuf_term_cmd)
evas_stringshare_del(e_config->exebuf_term_cmd); eina_stringshare_del(e_config->exebuf_term_cmd);
e_config->exebuf_term_cmd = NULL; e_config->exebuf_term_cmd = NULL;
if (cfdata->term_cmd) if (cfdata->term_cmd)
e_config->exebuf_term_cmd = evas_stringshare_add(cfdata->term_cmd); e_config->exebuf_term_cmd = eina_stringshare_add(cfdata->term_cmd);
e_config_save_queue(); e_config_save_queue();
return 1; return 1;
} }

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

@ -209,9 +209,9 @@ _fill_data(E_Config_Dialog_Data *cfdata)
efp = e_font_fontconfig_name_parse(efd->font); efp = e_font_fontconfig_name_parse(efd->font);
if (efp->name) if (efp->name)
tc->font = evas_stringshare_add(efp->name); tc->font = eina_stringshare_add(efp->name);
if (efp->styles) if (efp->styles)
tc->style = evas_stringshare_add(efp->styles->data); tc->style = eina_stringshare_add(efp->styles->data);
e_font_properties_free(efp); e_font_properties_free(efp);
} }
tc->size = efd->size; tc->size = efd->size;
@ -231,9 +231,9 @@ _fill_data(E_Config_Dialog_Data *cfdata)
efp = e_font_fontconfig_name_parse(efd->font); efp = e_font_fontconfig_name_parse(efd->font);
if (efp->name) if (efp->name)
tc->font = evas_stringshare_add(efp->name); tc->font = eina_stringshare_add(efp->name);
if (efp->styles) if (efp->styles)
tc->style = evas_stringshare_add(efp->styles->data); tc->style = eina_stringshare_add(efp->styles->data);
e_font_properties_free(efp); e_font_properties_free(efp);
} }
tc->size = efd->size; tc->size = efd->size;
@ -250,37 +250,37 @@ _fill_data(E_Config_Dialog_Data *cfdata)
size_data = E_NEW(E_Font_Size_Data, 1); size_data = E_NEW(E_Font_Size_Data, 1);
size_data->cfdata = cfdata; size_data->cfdata = cfdata;
size_data->size_str = evas_stringshare_add(_("Tiny")); size_data->size_str = eina_stringshare_add(_("Tiny"));
size_data->size = -50; size_data->size = -50;
cfdata->font_scale_list = evas_list_append(cfdata->font_scale_list, size_data); cfdata->font_scale_list = evas_list_append(cfdata->font_scale_list, size_data);
size_data = E_NEW(E_Font_Size_Data, 1); size_data = E_NEW(E_Font_Size_Data, 1);
size_data->cfdata = cfdata; size_data->cfdata = cfdata;
size_data->size_str = evas_stringshare_add(_("Small")); size_data->size_str = eina_stringshare_add(_("Small"));
size_data->size = -80; size_data->size = -80;
cfdata->font_scale_list = evas_list_append(cfdata->font_scale_list, size_data); cfdata->font_scale_list = evas_list_append(cfdata->font_scale_list, size_data);
size_data = E_NEW(E_Font_Size_Data, 1); size_data = E_NEW(E_Font_Size_Data, 1);
size_data->cfdata = cfdata; size_data->cfdata = cfdata;
size_data->size_str = evas_stringshare_add(_("Normal")); size_data->size_str = eina_stringshare_add(_("Normal"));
size_data->size = -100; size_data->size = -100;
cfdata->font_scale_list = evas_list_append(cfdata->font_scale_list, size_data); cfdata->font_scale_list = evas_list_append(cfdata->font_scale_list, size_data);
size_data = E_NEW(E_Font_Size_Data, 1); size_data = E_NEW(E_Font_Size_Data, 1);
size_data->cfdata = cfdata; size_data->cfdata = cfdata;
size_data->size_str = evas_stringshare_add(_("Big")); size_data->size_str = eina_stringshare_add(_("Big"));
size_data->size = -150; size_data->size = -150;
cfdata->font_scale_list = evas_list_append(cfdata->font_scale_list, size_data); cfdata->font_scale_list = evas_list_append(cfdata->font_scale_list, size_data);
size_data = E_NEW(E_Font_Size_Data, 1); size_data = E_NEW(E_Font_Size_Data, 1);
size_data->cfdata = cfdata; size_data->cfdata = cfdata;
size_data->size_str = evas_stringshare_add(_("Really Big")); size_data->size_str = eina_stringshare_add(_("Really Big"));
size_data->size = -190; size_data->size = -190;
cfdata->font_scale_list = evas_list_append(cfdata->font_scale_list, size_data); cfdata->font_scale_list = evas_list_append(cfdata->font_scale_list, size_data);
size_data = E_NEW(E_Font_Size_Data, 1); size_data = E_NEW(E_Font_Size_Data, 1);
size_data->cfdata = cfdata; size_data->cfdata = cfdata;
size_data->size_str = evas_stringshare_add(_("Huge")); size_data->size_str = eina_stringshare_add(_("Huge"));
size_data->size = -250; size_data->size = -250;
cfdata->font_scale_list = evas_list_append(cfdata->font_scale_list, size_data); cfdata->font_scale_list = evas_list_append(cfdata->font_scale_list, size_data);
@ -293,7 +293,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
size_data = E_NEW(E_Font_Size_Data, 1); size_data = E_NEW(E_Font_Size_Data, 1);
size_data->cfdata = cfdata; size_data->cfdata = cfdata;
size_data->size_str = evas_stringshare_add(str); size_data->size_str = eina_stringshare_add(str);
size_data->size = i; size_data->size = i;
cfdata->font_px_list = evas_list_append(cfdata->font_px_list, size_data); cfdata->font_px_list = evas_list_append(cfdata->font_px_list, size_data);
} }
@ -325,8 +325,8 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
tc = l->data; tc = l->data;
cfdata->text_classes = evas_list_remove_list(cfdata->text_classes, l); cfdata->text_classes = evas_list_remove_list(cfdata->text_classes, l);
if (tc->font) evas_stringshare_del(tc->font); if (tc->font) eina_stringshare_del(tc->font);
if (tc->style) evas_stringshare_del(tc->style); if (tc->style) eina_stringshare_del(tc->style);
E_FREE(tc); E_FREE(tc);
} }
@ -336,7 +336,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
size_data = l->data; size_data = l->data;
cfdata->font_scale_list = evas_list_remove_list(cfdata->font_scale_list, l); cfdata->font_scale_list = evas_list_remove_list(cfdata->font_scale_list, l);
if (size_data->size_str) evas_stringshare_del(size_data->size_str); if (size_data->size_str) eina_stringshare_del(size_data->size_str);
E_FREE(size_data); E_FREE(size_data);
} }
@ -346,7 +346,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
size_data = l->data; size_data = l->data;
cfdata->font_px_list = evas_list_remove_list(cfdata->font_scale_list, l); cfdata->font_px_list = evas_list_remove_list(cfdata->font_scale_list, l);
if (size_data->size_str) evas_stringshare_del(size_data->size_str); if (size_data->size_str) eina_stringshare_del(size_data->size_str);
E_FREE(size_data); E_FREE(size_data);
} }
@ -381,7 +381,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
if (i == 1) if (i == 1)
e_font_default_set("e_basic_font", font_name, cfdata->cur_size); e_font_default_set("e_basic_font", font_name, cfdata->cur_size);
evas_stringshare_del(font_name); eina_stringshare_del(font_name);
} }
else else
{ {
@ -402,15 +402,15 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
tc = next->data; tc = next->data;
tc->size = cfdata->cur_size; tc->size = cfdata->cur_size;
if (tc->font) evas_stringshare_del(tc->font); if (tc->font) eina_stringshare_del(tc->font);
if (cfdata->cur_font) if (cfdata->cur_font)
tc->font = evas_stringshare_add(cfdata->cur_font); tc->font = eina_stringshare_add(cfdata->cur_font);
else else
tc->font = NULL; tc->font = NULL;
if (tc->style) evas_stringshare_del(tc->style); if (tc->style) eina_stringshare_del(tc->style);
if (cfdata->cur_style) if (cfdata->cur_style)
tc->style = evas_stringshare_add(cfdata->cur_style); tc->style = eina_stringshare_add(cfdata->cur_style);
else else
tc->style = NULL; tc->style = NULL;
tc->enabled = cfdata->cur_enabled; tc->enabled = cfdata->cur_enabled;
@ -527,7 +527,7 @@ _basic_init_data_fill(E_Config_Dialog_Data *cfdata)
E_Font_Properties *efp; E_Font_Properties *efp;
efp = e_font_fontconfig_name_parse(efd->font); efp = e_font_fontconfig_name_parse(efd->font);
init_font = evas_stringshare_add(efp->name); init_font = eina_stringshare_add(efp->name);
e_font_properties_free(efp); e_font_properties_free(efp);
} }
init_size = efd->size; init_size = efd->size;
@ -563,9 +563,9 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
tc->enabled = cfdata->cur_enabled; tc->enabled = cfdata->cur_enabled;
tc->size = cfdata->cur_size; tc->size = cfdata->cur_size;
if (cfdata->cur_font) if (cfdata->cur_font)
tc->font = evas_stringshare_add(cfdata->cur_font); tc->font = eina_stringshare_add(cfdata->cur_font);
if (cfdata->cur_style) if (cfdata->cur_style)
tc->style = evas_stringshare_add(cfdata->cur_style); tc->style = eina_stringshare_add(cfdata->cur_style);
} }
for (next = cfdata->text_classes; next; next = next->next) for (next = cfdata->text_classes; next; next = next->next)
@ -578,7 +578,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
name = e_font_fontconfig_name_get(tc->font, tc->style); name = e_font_fontconfig_name_get(tc->font, tc->style);
e_font_default_set(tc->class_name, name, tc->size); e_font_default_set(tc->class_name, name, tc->size);
evas_stringshare_del(name); eina_stringshare_del(name);
} }
else else
e_font_default_remove(tc->class_name); e_font_default_remove(tc->class_name);
@ -768,14 +768,14 @@ _adv_class_cb_change(void *data, Evas_Object *obj)
tc = evas_list_nth(cfdata->text_classes, cfdata->cur_index); tc = evas_list_nth(cfdata->text_classes, cfdata->cur_index);
tc->enabled = cfdata->cur_enabled; tc->enabled = cfdata->cur_enabled;
tc->size = cfdata->cur_size; tc->size = cfdata->cur_size;
if (tc->font) evas_stringshare_del(tc->font); if (tc->font) eina_stringshare_del(tc->font);
if (cfdata->cur_font) if (cfdata->cur_font)
tc->font = evas_stringshare_add(cfdata->cur_font); tc->font = eina_stringshare_add(cfdata->cur_font);
else else
tc->font = NULL; tc->font = NULL;
if (tc->style) evas_stringshare_del(tc->style); if (tc->style) eina_stringshare_del(tc->style);
if (cfdata->cur_style) if (cfdata->cur_style)
tc->style = evas_stringshare_add(cfdata->cur_style); tc->style = eina_stringshare_add(cfdata->cur_style);
else else
tc->style = NULL; tc->style = NULL;
if (cfdata->gui.style_list) if (cfdata->gui.style_list)
@ -847,9 +847,9 @@ _adv_enabled_font_cb_change(void *data, Evas_Object *obj)
tc = evas_list_nth(cfdata->text_classes, n); tc = evas_list_nth(cfdata->text_classes, n);
tc->enabled = cfdata->cur_enabled; tc->enabled = cfdata->cur_enabled;
tc->size = cfdata->cur_size; tc->size = cfdata->cur_size;
if (tc->font) evas_stringshare_del(tc->font); if (tc->font) eina_stringshare_del(tc->font);
if (cfdata->cur_font) if (cfdata->cur_font)
tc->font = evas_stringshare_add(cfdata->cur_font); tc->font = eina_stringshare_add(cfdata->cur_font);
if (cfdata->cur_enabled) if (cfdata->cur_enabled)
{ {
icon = edje_object_add(cfdata->evas); icon = edje_object_add(cfdata->evas);
@ -909,9 +909,9 @@ _adv_font_cb_change(void *data, Evas_Object *obj)
if (!i->selected) continue; if (!i->selected) continue;
tc = evas_list_nth(cfdata->text_classes, n); tc = evas_list_nth(cfdata->text_classes, n);
if (tc->font) evas_stringshare_del(tc->font); if (tc->font) eina_stringshare_del(tc->font);
if (cfdata->cur_font) if (cfdata->cur_font)
tc->font = evas_stringshare_add(cfdata->cur_font); tc->font = eina_stringshare_add(cfdata->cur_font);
} }
/* Load the style list */ /* Load the style list */
@ -1103,9 +1103,9 @@ _adv_style_cb_change(void *data, Evas_Object *obj)
if (!i->selected) continue; if (!i->selected) continue;
tc = evas_list_nth(cfdata->text_classes, n); tc = evas_list_nth(cfdata->text_classes, n);
if (tc->style) evas_stringshare_del(tc->style); if (tc->style) eina_stringshare_del(tc->style);
if (cfdata->cur_style) if (cfdata->cur_style)
tc->style = evas_stringshare_add(cfdata->cur_style); tc->style = eina_stringshare_add(cfdata->cur_style);
else else
tc->style = NULL; tc->style = NULL;
} }
@ -1143,6 +1143,6 @@ _font_preview_update(E_Config_Dialog_Data *cfdata)
name = e_font_fontconfig_name_get(cfdata->cur_font, cfdata->cur_style); name = e_font_fontconfig_name_get(cfdata->cur_font, cfdata->cur_style);
e_widget_font_preview_font_set(cfdata->gui.preview, name, e_widget_font_preview_font_set(cfdata->gui.preview, name,
cfdata->cur_size); cfdata->cur_size);
evas_stringshare_del(name); eina_stringshare_del(name);
} }
} }

2
src/modules/conf_icon_theme/e_int_config_icon_themes.c
View File

@ -105,7 +105,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
E_Event_Config_Icon_Theme *ev; E_Event_Config_Icon_Theme *ev;
/* Actually take our cfdata settings and apply them in real life */ /* Actually take our cfdata settings and apply them in real life */
e_config->icon_theme = evas_stringshare_add(cfdata->themename); e_config->icon_theme = eina_stringshare_add(cfdata->themename);
e_config_save_queue(); e_config_save_queue();
ev = E_NEW(E_Event_Config_Icon_Theme, 1); ev = E_NEW(E_Event_Config_Icon_Theme, 1);

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

@ -189,12 +189,12 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
if (e_config->input_method) if (e_config->input_method)
{ {
evas_stringshare_del(e_config->input_method); eina_stringshare_del(e_config->input_method);
e_config->input_method = NULL; e_config->input_method = NULL;
} }
if (!cfdata->imc_disable) if (!cfdata->imc_disable)
e_config->input_method = evas_stringshare_add(cfdata->imc_current); e_config->input_method = eina_stringshare_add(cfdata->imc_current);
e_intl_input_method_set(e_config->input_method); e_intl_input_method_set(e_config->input_method);
} }
@ -723,12 +723,12 @@ _e_imc_change_enqueue(E_Config_Dialog_Data *cfdata)
imc_update->version = E_INTL_INPUT_METHOD_CONFIG_VERSION; imc_update->version = E_INTL_INPUT_METHOD_CONFIG_VERSION;
/* TODO: need to only add if the string is not empty */ /* TODO: need to only add if the string is not empty */
imc_update->e_im_name = evas_stringshare_add(cfdata->imc.e_im_name); imc_update->e_im_name = eina_stringshare_add(cfdata->imc.e_im_name);
imc_update->e_im_exec = evas_stringshare_add(cfdata->imc.e_im_exec); imc_update->e_im_exec = eina_stringshare_add(cfdata->imc.e_im_exec);
imc_update->e_im_setup_exec = evas_stringshare_add(cfdata->imc.e_im_setup_exec); imc_update->e_im_setup_exec = eina_stringshare_add(cfdata->imc.e_im_setup_exec);
imc_update->gtk_im_module = evas_stringshare_add(cfdata->imc.gtk_im_module); imc_update->gtk_im_module = eina_stringshare_add(cfdata->imc.gtk_im_module);
imc_update->qt_im_module = evas_stringshare_add(cfdata->imc.qt_im_module); imc_update->qt_im_module = eina_stringshare_add(cfdata->imc.qt_im_module);
imc_update->xmodifiers = evas_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 = evas_hash_find(cfdata->imc_change_map, cfdata->imc_current);
@ -754,7 +754,7 @@ _e_imc_file_name_new_get(void)
snprintf(path, sizeof(path), "%s/new_input_method-%02d.imc", snprintf(path, sizeof(path), "%s/new_input_method-%02d.imc",
e_intl_imc_personal_path_get(), i); e_intl_imc_personal_path_get(), i);
if (!ecore_file_exists(path)) if (!ecore_file_exists(path))
return evas_stringshare_add(path); return eina_stringshare_add(path);
} }
return NULL; return NULL;

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

@ -656,7 +656,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
/* create new node */ /* create new node */
lang_node = E_NEW(E_Intl_Language_Node, 1); lang_node = E_NEW(E_Intl_Language_Node, 1);
lang_node->lang_code = evas_stringshare_add(locale_parts->lang); lang_node->lang_code = eina_stringshare_add(locale_parts->lang);
/* Check if the language list exists */ /* Check if the language list exists */
/* Linear Search */ /* Linear Search */
@ -702,7 +702,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
/* create new node */ /* create new node */
region_node = E_NEW(E_Intl_Region_Node, 1); region_node = E_NEW(E_Intl_Region_Node, 1);
region_node->region_code = evas_stringshare_add(locale_parts->region); region_node->region_code = eina_stringshare_add(locale_parts->region);
/* Get the region translation */ /* Get the region translation */
/* Linear Search */ /* Linear Search */
@ -728,9 +728,9 @@ _fill_data(E_Config_Dialog_Data *cfdata)
cs_trans = _intl_charset_upper_get(locale_parts->codeset); cs_trans = _intl_charset_upper_get(locale_parts->codeset);
if (cs_trans == NULL) if (cs_trans == NULL)
cs = evas_stringshare_add(locale_parts->codeset); cs = eina_stringshare_add(locale_parts->codeset);
else else
cs = evas_stringshare_add(cs_trans); cs = eina_stringshare_add(cs_trans);
/* Exclusive */ /* Exclusive */
/* Linear Search */ /* Linear Search */
@ -743,7 +743,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
{ {
const char *mod; const char *mod;
mod = evas_stringshare_add(locale_parts->modifier); mod = eina_stringshare_add(locale_parts->modifier);
/* Find only works here because we are using stringshare*/ /* Find only works here because we are using stringshare*/
/* Exclusive */ /* Exclusive */
@ -814,7 +814,7 @@ _language_hash_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSE
E_Intl_Language_Node *node; E_Intl_Language_Node *node;
node = data; node = data;
if (node->lang_code) evas_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); evas_hash_foreach(node->region_hash, _region_hash_free_cb, NULL);
evas_hash_free(node->region_hash); evas_hash_free(node->region_hash);
free(node); free(node);
@ -828,13 +828,13 @@ _region_hash_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED_
E_Intl_Region_Node *node; E_Intl_Region_Node *node;
node = data; node = data;
if (node->region_code) evas_stringshare_del(node->region_code); if (node->region_code) eina_stringshare_del(node->region_code);
while (node->available_codesets) while (node->available_codesets)
{ {
const char *str; const char *str;
str = node->available_codesets->data; str = node->available_codesets->data;
if (str) evas_stringshare_del(str); if (str) eina_stringshare_del(str);
node->available_codesets = node->available_codesets =
evas_list_remove_list(node->available_codesets, node->available_codesets); evas_list_remove_list(node->available_codesets, node->available_codesets);
} }
@ -844,7 +844,7 @@ _region_hash_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED_
const char *str; const char *str;
str = node->available_modifiers->data; str = node->available_modifiers->data;
if (str) evas_stringshare_del(str); if (str) eina_stringshare_del(str);
node->available_modifiers = node->available_modifiers =
evas_list_remove_list(node->available_modifiers, node->available_modifiers); evas_list_remove_list(node->available_modifiers, node->available_modifiers);
} }
@ -858,8 +858,8 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
if (cfdata->cur_language) if (cfdata->cur_language)
{ {
if (e_config->language) evas_stringshare_del(e_config->language); if (e_config->language) eina_stringshare_del(e_config->language);
e_config->language = evas_stringshare_add(cfdata->cur_language); e_config->language = eina_stringshare_add(cfdata->cur_language);
e_intl_language_set(e_config->language); e_intl_language_set(e_config->language);
} }
@ -872,8 +872,8 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
if (cfdata->cur_language) if (cfdata->cur_language)
{ {
if (e_config->language) evas_stringshare_del(e_config->language); if (e_config->language) eina_stringshare_del(e_config->language);
e_config->language = evas_stringshare_add(cfdata->cur_language); e_config->language = eina_stringshare_add(cfdata->cur_language);
e_intl_language_set(e_config->language); e_intl_language_set(e_config->language);
} }
@ -1038,17 +1038,17 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
cs = NULL; cs = NULL;
mod = NULL; mod = NULL;
if (cfdata->cur_lang) lang = evas_stringshare_add(cfdata->cur_lang); if (cfdata->cur_lang) lang = eina_stringshare_add(cfdata->cur_lang);
if (cfdata->cur_reg) reg = evas_stringshare_add(cfdata->cur_reg); if (cfdata->cur_reg) reg = eina_stringshare_add(cfdata->cur_reg);
if (cfdata->cur_cs) cs = evas_stringshare_add(cfdata->cur_cs); if (cfdata->cur_cs) cs = eina_stringshare_add(cfdata->cur_cs);
if (cfdata->cur_mod) mod = evas_stringshare_add(cfdata->cur_mod); if (cfdata->cur_mod) mod = eina_stringshare_add(cfdata->cur_mod);
_cfdata_language_go(lang, reg, cs, mod, cfdata); _cfdata_language_go(lang, reg, cs, mod, cfdata);
if (lang) evas_stringshare_del(lang); if (lang) eina_stringshare_del(lang);
if (reg) evas_stringshare_del(reg); if (reg) eina_stringshare_del(reg);
if (cs) evas_stringshare_del(cs); if (cs) eina_stringshare_del(cs);
if (mod) evas_stringshare_del(mod); if (mod) eina_stringshare_del(mod);
e_widget_on_change_hook_set(cfdata->gui.lang_list, _ilist_language_cb_change, cfdata); e_widget_on_change_hook_set(cfdata->gui.lang_list, _ilist_language_cb_change, cfdata);
e_widget_on_change_hook_set(cfdata->gui.reg_list, _ilist_region_cb_change, cfdata); e_widget_on_change_hook_set(cfdata->gui.reg_list, _ilist_region_cb_change, cfdata);

64
src/modules/conf_keybindings/e_int_config_keybindings.c
View File

@ -122,11 +122,11 @@ _fill_data(E_Config_Dialog_Data *cfdata)
bi2 = E_NEW(E_Config_Binding_Key, 1); bi2 = E_NEW(E_Config_Binding_Key, 1);
bi2->context = bi->context; bi2->context = bi->context;
bi2->key = bi->key == NULL ? NULL : evas_stringshare_add(bi->key); bi2->key = bi->key == NULL ? NULL : eina_stringshare_add(bi->key);
bi2->modifiers = bi->modifiers; bi2->modifiers = bi->modifiers;
bi2->any_mod = bi->any_mod; bi2->any_mod = bi->any_mod;
bi2->action = bi->action == NULL ? NULL : evas_stringshare_add(bi->action); bi2->action = bi->action == NULL ? NULL : eina_stringshare_add(bi->action);
bi2->params = bi->params == NULL ? NULL : evas_stringshare_add(bi->params); bi2->params = bi->params == NULL ? NULL : eina_stringshare_add(bi->params);
cfdata->binding.key = evas_list_append(cfdata->binding.key, bi2); cfdata->binding.key = evas_list_append(cfdata->binding.key, bi2);
} }
@ -152,9 +152,9 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
while (cfdata->binding.key) while (cfdata->binding.key)
{ {
bi = cfdata->binding.key->data; bi = cfdata->binding.key->data;
if (bi->key) evas_stringshare_del(bi->key); if (bi->key) eina_stringshare_del(bi->key);
if (bi->action) evas_stringshare_del(bi->action); if (bi->action) eina_stringshare_del(bi->action);
if (bi->params) evas_stringshare_del(bi->params); if (bi->params) eina_stringshare_del(bi->params);
E_FREE(bi); E_FREE(bi);
cfdata->binding.key = evas_list_remove_list(cfdata->binding.key, cfdata->binding.key); cfdata->binding.key = evas_list_remove_list(cfdata->binding.key, cfdata->binding.key);
} }
@ -184,9 +184,9 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
e_config->key_bindings = e_config->key_bindings =
evas_list_remove_list(e_config->key_bindings, e_config->key_bindings); evas_list_remove_list(e_config->key_bindings, e_config->key_bindings);
if (bi->key) evas_stringshare_del(bi->key); if (bi->key) eina_stringshare_del(bi->key);
if (bi->action) evas_stringshare_del(bi->action); if (bi->action) eina_stringshare_del(bi->action);
if (bi->params) evas_stringshare_del(bi->params); if (bi->params) eina_stringshare_del(bi->params);
E_FREE(bi); E_FREE(bi);
} }
@ -198,13 +198,13 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
bi = E_NEW(E_Config_Binding_Key, 1); bi = E_NEW(E_Config_Binding_Key, 1);
bi->context = bi2->context; bi->context = bi2->context;
bi->key = evas_stringshare_add(bi2->key); bi->key = eina_stringshare_add(bi2->key);
bi->modifiers = bi2->modifiers; bi->modifiers = bi2->modifiers;
bi->any_mod = bi2->any_mod; bi->any_mod = bi2->any_mod;
bi->action = bi->action =
((!bi2->action) || (!bi2->action[0])) ? NULL : evas_stringshare_add(bi2->action); ((!bi2->action) || (!bi2->action[0])) ? NULL : eina_stringshare_add(bi2->action);
bi->params = bi->params =
((!bi2->params) || (!bi2->params[0])) ? NULL : evas_stringshare_add(bi2->params); ((!bi2->params) || (!bi2->params[0])) ? NULL : eina_stringshare_add(bi2->params);
e_config->key_bindings = evas_list_append(e_config->key_bindings, bi); e_config->key_bindings = evas_list_append(e_config->key_bindings, bi);
e_bindings_key_add(bi->context, bi->key, bi->modifiers, bi->any_mod, e_bindings_key_add(bi->context, bi->key, bi->modifiers, bi->any_mod,
@ -377,9 +377,9 @@ _delete_all_key_binding_cb(void *data, void *data2)
while (cfdata->binding.key) while (cfdata->binding.key)
{ {
bi = cfdata->binding.key->data; bi = cfdata->binding.key->data;
if (bi->key) evas_stringshare_del(bi->key); if (bi->key) eina_stringshare_del(bi->key);
if (bi->action) evas_stringshare_del(bi->action); if (bi->action) eina_stringshare_del(bi->action);
if (bi->params) evas_stringshare_del(bi->params); if (bi->params) eina_stringshare_del(bi->params);
E_FREE(bi); E_FREE(bi);
cfdata->binding.key = evas_list_remove_list(cfdata->binding.key, cfdata->binding.key); cfdata->binding.key = evas_list_remove_list(cfdata->binding.key, cfdata->binding.key);
@ -418,9 +418,9 @@ _delete_key_binding_cb(void *data, void *data2)
if (l) if (l)
{ {
bi = l->data; bi = l->data;
if (bi->key) evas_stringshare_del(bi->key); if (bi->key) eina_stringshare_del(bi->key);
if (bi->action) evas_stringshare_del(bi->action); if (bi->action) eina_stringshare_del(bi->action);
if (bi->params) evas_stringshare_del(bi->params); if (bi->params) eina_stringshare_del(bi->params);
E_FREE(bi); E_FREE(bi);
cfdata->binding.key = evas_list_remove_list(cfdata->binding.key, l); cfdata->binding.key = evas_list_remove_list(cfdata->binding.key, l);
} }
@ -454,9 +454,9 @@ _restore_key_binding_defaults_cb(void *data, void *data2)
while (cfdata->binding.key) while (cfdata->binding.key)
{ {
bi = cfdata->binding.key->data; bi = cfdata->binding.key->data;
if (bi->key) evas_stringshare_del(bi->key); if (bi->key) eina_stringshare_del(bi->key);
if (bi->action) evas_stringshare_del(bi->action); if (bi->action) eina_stringshare_del(bi->action);
if (bi->params) evas_stringshare_del(bi->params); if (bi->params) eina_stringshare_del(bi->params);
E_FREE(bi); E_FREE(bi);
cfdata->binding.key = evas_list_remove_list(cfdata->binding.key, cfdata->binding.key); cfdata->binding.key = evas_list_remove_list(cfdata->binding.key, cfdata->binding.key);
} }
@ -464,11 +464,11 @@ _restore_key_binding_defaults_cb(void *data, void *data2)
#define CFG_KEYBIND_DFLT(_context, _key, _modifiers, _anymod, _action, _params) \ #define CFG_KEYBIND_DFLT(_context, _key, _modifiers, _anymod, _action, _params) \
bi = E_NEW(E_Config_Binding_Key, 1); \ bi = E_NEW(E_Config_Binding_Key, 1); \
bi->context = _context; \ bi->context = _context; \
bi->key = evas_stringshare_add(_key); \ bi->key = eina_stringshare_add(_key); \
bi->modifiers = _modifiers; \ bi->modifiers = _modifiers; \
bi->any_mod = _anymod; \ bi->any_mod = _anymod; \
bi->action = _action == NULL ? NULL : evas_stringshare_add(_action); \ bi->action = _action == NULL ? NULL : eina_stringshare_add(_action); \
bi->params = _params == NULL ? NULL : evas_stringshare_add(_params); \ bi->params = _params == NULL ? NULL : eina_stringshare_add(_params); \
cfdata->binding.key = evas_list_append(cfdata->binding.key, bi) cfdata->binding.key = evas_list_append(cfdata->binding.key, bi)
CFG_KEYBIND_DFLT(E_BINDING_CONTEXT_ANY, "Left", CFG_KEYBIND_DFLT(E_BINDING_CONTEXT_ANY, "Left",
@ -1061,7 +1061,7 @@ _grab_key_down_cb(void *data, int type, void *event)
bi->context = E_BINDING_CONTEXT_ANY; bi->context = E_BINDING_CONTEXT_ANY;
bi->modifiers = mod; bi->modifiers = mod;
bi->key = evas_stringshare_add(ev->keyname); bi->key = eina_stringshare_add(ev->keyname);
bi->action = NULL; bi->action = NULL;
bi->params = NULL; bi->params = NULL;
bi->any_mod = 0; bi->any_mod = 0;
@ -1076,8 +1076,8 @@ _grab_key_down_cb(void *data, int type, void *event)
bi = evas_list_nth(cfdata->binding.key, n); bi = evas_list_nth(cfdata->binding.key, n);
bi->modifiers = mod; bi->modifiers = mod;
if (bi->key) evas_stringshare_del(bi->key); if (bi->key) eina_stringshare_del(bi->key);
bi->key = evas_stringshare_add(ev->keyname); bi->key = eina_stringshare_add(ev->keyname);
} }
} }
@ -1181,16 +1181,16 @@ _auto_apply_changes(E_Config_Dialog_Data *cfdata)
actd = evas_list_nth(actg->acts, a); actd = evas_list_nth(actg->acts, a);
if (!actd) return; if (!actd) return;
if (bi->action) evas_stringshare_del(bi->action); if (bi->action) eina_stringshare_del(bi->action);
bi->action = NULL; bi->action = NULL;
if (actd->act_cmd) bi->action = evas_stringshare_add(actd->act_cmd); if (actd->act_cmd) bi->action = eina_stringshare_add(actd->act_cmd);
if (bi->params) evas_stringshare_del(bi->params); if (bi->params) eina_stringshare_del(bi->params);
bi->params = NULL; bi->params = NULL;
if (actd->act_params) if (actd->act_params)
bi->params = evas_stringshare_add(actd->act_params); bi->params = eina_stringshare_add(actd->act_params);
else else
{ {
ok = 1; ok = 1;
@ -1206,7 +1206,7 @@ _auto_apply_changes(E_Config_Dialog_Data *cfdata)
ok = 0; ok = 0;
if (ok) if (ok)
bi->params = evas_stringshare_add(cfdata->locals.params); bi->params = eina_stringshare_add(cfdata->locals.params);
} }
} }

24
src/modules/conf_mime/e_int_config_mime.c
View File

@ -145,9 +145,9 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
t = types->data; t = types->data;
if (!t) continue; if (!t) continue;
if (t->name) if (t->name)
evas_stringshare_del(t->name); eina_stringshare_del(t->name);
if (t->type) if (t->type)
evas_stringshare_del(t->type); eina_stringshare_del(t->type);
types = evas_list_remove_list(types, types); types = evas_list_remove_list(types, types);
E_FREE(t); E_FREE(t);
} }
@ -165,12 +165,12 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
g = m->globs->data; g = m->globs->data;
if (!g) continue; if (!g) continue;
if (g->name) if (g->name)
evas_stringshare_del(g->name); eina_stringshare_del(g->name);
m->globs = evas_list_remove_list(m->globs, m->globs); m->globs = evas_list_remove_list(m->globs, m->globs);
E_FREE(g); E_FREE(g);
} }
if (m->mime) if (m->mime)
evas_stringshare_del(m->mime); eina_stringshare_del(m->mime);
cfdata->mimes = evas_list_remove_list(cfdata->mimes, cfdata->mimes); cfdata->mimes = evas_list_remove_list(cfdata->mimes, cfdata->mimes);
E_FREE(m); E_FREE(m);
@ -347,13 +347,13 @@ _load_mimes(E_Config_Dialog_Data *cfdata, char *file)
mime = E_NEW(Config_Mime, 1); mime = E_NEW(Config_Mime, 1);
if (mime) if (mime)
{ {
mime->mime = evas_stringshare_add(mimetype); mime->mime = eina_stringshare_add(mimetype);
if (!mime->mime) if (!mime->mime)
free(mime); free(mime);
else else
{ {
glob = E_NEW(Config_Glob, 1); glob = E_NEW(Config_Glob, 1);
glob->name = evas_stringshare_add(ext); glob->name = eina_stringshare_add(ext);
mime->globs = evas_list_append(mime->globs, glob); mime->globs = evas_list_append(mime->globs, glob);
cfdata->mimes = evas_list_append(cfdata->mimes, mime); cfdata->mimes = evas_list_append(cfdata->mimes, mime);
} }
@ -404,13 +404,13 @@ _load_globs(E_Config_Dialog_Data *cfdata, char *file)
mime = E_NEW(Config_Mime, 1); mime = E_NEW(Config_Mime, 1);
if (mime) if (mime)
{ {
mime->mime = evas_stringshare_add(mimetype); mime->mime = eina_stringshare_add(mimetype);
if (!mime->mime) if (!mime->mime)
free(mime); free(mime);
else else
{ {
glob = E_NEW(Config_Glob, 1); glob = E_NEW(Config_Glob, 1);
glob->name = evas_stringshare_add(ext); glob->name = eina_stringshare_add(ext);
mime->globs = evas_list_append(mime->globs, glob); mime->globs = evas_list_append(mime->globs, glob);
cfdata->mimes = evas_list_append(cfdata->mimes, mime); cfdata->mimes = evas_list_append(cfdata->mimes, mime);
} }
@ -422,7 +422,7 @@ _load_globs(E_Config_Dialog_Data *cfdata, char *file)
if (!glob) if (!glob)
{ {
glob = E_NEW(Config_Glob, 1); glob = E_NEW(Config_Glob, 1);
glob->name = evas_stringshare_add(ext); glob->name = eina_stringshare_add(ext);
mime->globs = evas_list_append(mime->globs, glob); mime->globs = evas_list_append(mime->globs, glob);
} }
} }
@ -460,9 +460,9 @@ _fill_types(E_Config_Dialog_Data *cfdata)
if (!found) if (!found)
{ {
tmp = E_NEW(Config_Type, 1); tmp = E_NEW(Config_Type, 1);
tmp->type = evas_stringshare_add(tok); tmp->type = eina_stringshare_add(tok);
tok[0] = toupper(tok[0]); tok[0] = toupper(tok[0]);
tmp->name = evas_stringshare_add(tok); tmp->name = eina_stringshare_add(tok);
types = evas_list_append(types, tmp); types = evas_list_append(types, tmp);
} }
@ -565,7 +565,7 @@ _cb_config(void *data, void *data2)
if (!found) if (!found)
{ {
mi = E_NEW(E_Config_Mime_Icon, 1); mi = E_NEW(E_Config_Mime_Icon, 1);
mi->mime = evas_stringshare_add(m); mi->mime = eina_stringshare_add(m);
} }
cfdata->edit_dlg = e_int_config_mime_edit(mi, cfdata); cfdata->edit_dlg = e_int_config_mime_edit(mi, cfdata);

14
src/modules/conf_mime/e_int_config_mime_edit.c
View File

@ -206,34 +206,34 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
if (found) if (found)
{ {
if (mi->icon) if (mi->icon)
evas_stringshare_del(mi->icon); eina_stringshare_del(mi->icon);
} }
else else
{ {
if (cfdata->type == DEFAULT) return 1; if (cfdata->type == DEFAULT) return 1;
mi = E_NEW(E_Config_Mime_Icon, 1); mi = E_NEW(E_Config_Mime_Icon, 1);
mi->mime = evas_stringshare_add(cfdata->mime); mi->mime = eina_stringshare_add(cfdata->mime);
} }
switch (cfdata->type) switch (cfdata->type)
{ {
case THUMB: case THUMB:
mi->icon = evas_stringshare_add("THUMB"); mi->icon = eina_stringshare_add("THUMB");
break; break;
case THEME: case THEME:
snprintf(buf, sizeof(buf), "e/icons/fileman/mime/%s", cfdata->mime); snprintf(buf, sizeof(buf), "e/icons/fileman/mime/%s", cfdata->mime);
mi->icon = evas_stringshare_add(buf); mi->icon = eina_stringshare_add(buf);
break; break;
case EDJ: case EDJ:
case IMG: case IMG:
mi->icon = evas_stringshare_add(cfdata->file); mi->icon = eina_stringshare_add(cfdata->file);
break; break;
case DEFAULT: case DEFAULT:
if (found) if (found)
{ {
e_config->mime_icons = evas_list_remove(e_config->mime_icons, mi); e_config->mime_icons = evas_list_remove(e_config->mime_icons, mi);
if (mi->mime) evas_stringshare_del(mi->mime); if (mi->mime) eina_stringshare_del(mi->mime);
if (mi->icon) evas_stringshare_del(mi->icon); if (mi->icon) eina_stringshare_del(mi->icon);
free(mi); free(mi);
} }
break; break;

74
src/modules/conf_mousebindings/e_int_config_mousebindings.c
View File

@ -141,8 +141,8 @@ _fill_data(E_Config_Dialog_Data *cfdata)
eb2->button = eb->button; eb2->button = eb->button;
eb2->modifiers = eb->modifiers; eb2->modifiers = eb->modifiers;
eb2->any_mod = eb->any_mod; eb2->any_mod = eb->any_mod;
eb2->action = eb->action == NULL ? NULL : evas_stringshare_add(eb->action); eb2->action = eb->action == NULL ? NULL : eina_stringshare_add(eb->action);
eb2->params = eb->params == NULL ? NULL : evas_stringshare_add(eb->params); eb2->params = eb->params == NULL ? NULL : eina_stringshare_add(eb->params);
cfdata->binding.mouse = evas_list_append(cfdata->binding.mouse, eb2); cfdata->binding.mouse = evas_list_append(cfdata->binding.mouse, eb2);
} }
@ -157,8 +157,8 @@ _fill_data(E_Config_Dialog_Data *cfdata)
bw2->z = bw->z; bw2->z = bw->z;
bw2->modifiers = bw->modifiers; bw2->modifiers = bw->modifiers;
bw2->any_mod = bw->any_mod; bw2->any_mod = bw->any_mod;
bw2->action = bw->action == NULL ? NULL : evas_stringshare_add(bw->action); bw2->action = bw->action == NULL ? NULL : eina_stringshare_add(bw->action);
bw2->params = bw->params == NULL ? NULL : evas_stringshare_add(bw->params); bw2->params = bw->params == NULL ? NULL : eina_stringshare_add(bw->params);
cfdata->binding.wheel = evas_list_append(cfdata->binding.wheel, bw2); cfdata->binding.wheel = evas_list_append(cfdata->binding.wheel, bw2);
} }
@ -185,8 +185,8 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
while (cfdata->binding.mouse) while (cfdata->binding.mouse)
{ {
eb = cfdata->binding.mouse->data; eb = cfdata->binding.mouse->data;
if (eb->action) evas_stringshare_del(eb->action); if (eb->action) eina_stringshare_del(eb->action);
if (eb->params) evas_stringshare_del(eb->params); if (eb->params) eina_stringshare_del(eb->params);
E_FREE(eb); E_FREE(eb);
cfdata->binding.mouse = cfdata->binding.mouse =
evas_list_remove_list(cfdata->binding.mouse, cfdata->binding.mouse); evas_list_remove_list(cfdata->binding.mouse, cfdata->binding.mouse);
@ -195,8 +195,8 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
while (cfdata->binding.wheel) while (cfdata->binding.wheel)
{ {
bw = cfdata->binding.wheel->data; bw = cfdata->binding.wheel->data;
if (bw->action) evas_stringshare_del(bw->action); if (bw->action) eina_stringshare_del(bw->action);
if (bw->params) evas_stringshare_del(bw->params); if (bw->params) eina_stringshare_del(bw->params);
E_FREE(bw); E_FREE(bw);
cfdata->binding.wheel = cfdata->binding.wheel =
evas_list_remove_list(cfdata->binding.wheel, cfdata->binding.wheel); evas_list_remove_list(cfdata->binding.wheel, cfdata->binding.wheel);
@ -224,8 +224,8 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
eb = e_config->mouse_bindings->data; eb = e_config->mouse_bindings->data;
e_bindings_mouse_del(eb->context, eb->button, eb->modifiers, eb->any_mod, e_bindings_mouse_del(eb->context, eb->button, eb->modifiers, eb->any_mod,
eb->action, eb->params); eb->action, eb->params);
if (eb->action) evas_stringshare_del(eb->action); if (eb->action) eina_stringshare_del(eb->action);
if (eb->params) evas_stringshare_del(eb->params); if (eb->params) eina_stringshare_del(eb->params);
E_FREE(eb); E_FREE(eb);
e_config->mouse_bindings = e_config->mouse_bindings =
evas_list_remove_list(e_config->mouse_bindings, e_config->mouse_bindings); evas_list_remove_list(e_config->mouse_bindings, e_config->mouse_bindings);
@ -240,8 +240,8 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
eb2->button = eb->button; eb2->button = eb->button;
eb2->modifiers = eb->modifiers; eb2->modifiers = eb->modifiers;
eb2->any_mod = eb->any_mod; eb2->any_mod = eb->any_mod;
eb2->action = eb->action == NULL ? NULL : evas_stringshare_add(eb->action); eb2->action = eb->action == NULL ? NULL : eina_stringshare_add(eb->action);
eb2->params = eb->params == NULL ? NULL : evas_stringshare_add(eb->params); eb2->params = eb->params == NULL ? NULL : eina_stringshare_add(eb->params);
e_config->mouse_bindings = evas_list_append(e_config->mouse_bindings, eb2); e_config->mouse_bindings = evas_list_append(e_config->mouse_bindings, eb2);
e_bindings_mouse_add(eb2->context, eb2->button, eb2->modifiers, eb2->any_mod, e_bindings_mouse_add(eb2->context, eb2->button, eb2->modifiers, eb2->any_mod,
@ -253,8 +253,8 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
bw = e_config->wheel_bindings->data; bw = e_config->wheel_bindings->data;
e_bindings_wheel_del(bw->context, bw->direction, bw->z, bw->modifiers, bw->any_mod, e_bindings_wheel_del(bw->context, bw->direction, bw->z, bw->modifiers, bw->any_mod,
bw->action, bw->params); bw->action, bw->params);
if (bw->action) evas_stringshare_del(bw->action); if (bw->action) eina_stringshare_del(bw->action);
if (bw->params) evas_stringshare_del(bw->params); if (bw->params) eina_stringshare_del(bw->params);
E_FREE(bw); E_FREE(bw);
e_config->wheel_bindings = e_config->wheel_bindings =
@ -271,8 +271,8 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
bw2->z = bw->z; bw2->z = bw->z;
bw2->modifiers = bw->modifiers; bw2->modifiers = bw->modifiers;
bw2->any_mod = bw->any_mod; bw2->any_mod = bw->any_mod;
bw2->action = bw->action == NULL ? NULL : evas_stringshare_add(bw->action); bw2->action = bw->action == NULL ? NULL : eina_stringshare_add(bw->action);
bw2->params = bw->params == NULL ? NULL : evas_stringshare_add(bw->params); bw2->params = bw->params == NULL ? NULL : eina_stringshare_add(bw->params);
e_config->wheel_bindings = evas_list_append(e_config->wheel_bindings, bw2); e_config->wheel_bindings = evas_list_append(e_config->wheel_bindings, bw2);
e_bindings_wheel_add(bw2->context, bw2->direction, bw2->z, bw2->modifiers, e_bindings_wheel_add(bw2->context, bw2->direction, bw2->z, bw2->modifiers,
@ -485,8 +485,8 @@ _delete_all_mouse_binding_cb(void *data, void *data2)
while (cfdata->binding.mouse) while (cfdata->binding.mouse)
{ {
eb = cfdata->binding.mouse->data; eb = cfdata->binding.mouse->data;
if (eb->action) evas_stringshare_del(eb->action); if (eb->action) eina_stringshare_del(eb->action);
if (eb->params) evas_stringshare_del(eb->params); if (eb->params) eina_stringshare_del(eb->params);
E_FREE(eb); E_FREE(eb);
cfdata->binding.mouse = cfdata->binding.mouse =
evas_list_remove_list(cfdata->binding.mouse, cfdata->binding.mouse); evas_list_remove_list(cfdata->binding.mouse, cfdata->binding.mouse);
@ -495,8 +495,8 @@ _delete_all_mouse_binding_cb(void *data, void *data2)
while (cfdata->binding.wheel) while (cfdata->binding.wheel)
{ {
bw = cfdata->binding.wheel->data; bw = cfdata->binding.wheel->data;
if (bw->action) evas_stringshare_del(bw->action); if (bw->action) eina_stringshare_del(bw->action);
if (bw->params) evas_stringshare_del(bw->params); if (bw->params) eina_stringshare_del(bw->params);
E_FREE(bw); E_FREE(bw);
cfdata->binding.wheel = cfdata->binding.wheel =
evas_list_remove_list(cfdata->binding.wheel, cfdata->binding.wheel); evas_list_remove_list(cfdata->binding.wheel, cfdata->binding.wheel);
@ -534,8 +534,8 @@ _delete_mouse_binding_cb(void *data, void *data2)
if (l) if (l)
{ {
eb = l->data; eb = l->data;
if (eb->action) evas_stringshare_del(eb->action); if (eb->action) eina_stringshare_del(eb->action);
if (eb->params) evas_stringshare_del(eb->params); if (eb->params) eina_stringshare_del(eb->params);
E_FREE(eb); E_FREE(eb);
cfdata->binding.mouse = evas_list_remove_list(cfdata->binding.mouse, l); cfdata->binding.mouse = evas_list_remove_list(cfdata->binding.mouse, l);
} }
@ -547,8 +547,8 @@ _delete_mouse_binding_cb(void *data, void *data2)
if (l) if (l)
{ {
bw = l->data; bw = l->data;
if (bw->action) evas_stringshare_del(bw->action); if (bw->action) eina_stringshare_del(bw->action);
if (bw->params) evas_stringshare_del(bw->params); if (bw->params) eina_stringshare_del(bw->params);
E_FREE(bw); E_FREE(bw);
cfdata->binding.wheel = evas_list_remove_list(cfdata->binding.wheel, l); cfdata->binding.wheel = evas_list_remove_list(cfdata->binding.wheel, l);
} }
@ -592,8 +592,8 @@ _restore_mouse_binding_defaults_cb(void *data, void *data2)
while (cfdata->binding.mouse) while (cfdata->binding.mouse)
{ {
eb = cfdata->binding.mouse->data; eb = cfdata->binding.mouse->data;
if (eb->action) evas_stringshare_del(eb->action); if (eb->action) eina_stringshare_del(eb->action);
if (eb->params) evas_stringshare_del(eb->params); if (eb->params) eina_stringshare_del(eb->params);
E_FREE(eb); E_FREE(eb);
cfdata->binding.mouse = cfdata->binding.mouse =
evas_list_remove_list(cfdata->binding.mouse, cfdata->binding.mouse); evas_list_remove_list(cfdata->binding.mouse, cfdata->binding.mouse);
@ -602,8 +602,8 @@ _restore_mouse_binding_defaults_cb(void *data, void *data2)
while (cfdata->binding.wheel) while (cfdata->binding.wheel)
{ {
bw = cfdata->binding.wheel->data; bw = cfdata->binding.wheel->data;
if (bw->action) evas_stringshare_del(bw->action); if (bw->action) eina_stringshare_del(bw->action);
if (bw->params) evas_stringshare_del(bw->params); if (bw->params) eina_stringshare_del(bw->params);
E_FREE(bw); E_FREE(bw);
cfdata->binding.wheel = cfdata->binding.wheel =
evas_list_remove_list(cfdata->binding.wheel, cfdata->binding.wheel); evas_list_remove_list(cfdata->binding.wheel, cfdata->binding.wheel);
@ -614,8 +614,8 @@ _restore_mouse_binding_defaults_cb(void *data, void *data2)
eb->button = _button; \ eb->button = _button; \
eb->modifiers = _modifiers; \ eb->modifiers = _modifiers; \
eb->any_mod = _anymod; \ eb->any_mod = _anymod; \
eb->action = _action == NULL ? NULL : evas_stringshare_add(_action); \ eb->action = _action == NULL ? NULL : eina_stringshare_add(_action); \
eb->params = _params == NULL ? NULL : evas_stringshare_add(_params); \ eb->params = _params == NULL ? NULL : eina_stringshare_add(_params); \
cfdata->binding.mouse = evas_list_append(cfdata->binding.mouse, eb) cfdata->binding.mouse = evas_list_append(cfdata->binding.mouse, eb)
CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_BORDER, 1, E_BINDING_MODIFIER_ALT, 0, "window_move", NULL); CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_BORDER, 1, E_BINDING_MODIFIER_ALT, 0, "window_move", NULL);
@ -632,8 +632,8 @@ _restore_mouse_binding_defaults_cb(void *data, void *data2)
bw->z = _z; \ bw->z = _z; \
bw->modifiers = _modifiers; \ bw->modifiers = _modifiers; \
bw->any_mod = _anymod; \ bw->any_mod = _anymod; \
bw->action = _action == NULL ? NULL : evas_stringshare_add(_action); \ bw->action = _action == NULL ? NULL : eina_stringshare_add(_action); \
bw->params = _params == NULL ? NULL : evas_stringshare_add(_params); \ bw->params = _params == NULL ? NULL : eina_stringshare_add(_params); \
cfdata->binding.wheel = evas_list_append(cfdata->binding.wheel, bw) cfdata->binding.wheel = evas_list_append(cfdata->binding.wheel, bw)
CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_CONTAINER, 0, -1, E_BINDING_MODIFIER_ALT, 0, CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_CONTAINER, 0, -1, E_BINDING_MODIFIER_ALT, 0,
@ -1052,8 +1052,8 @@ _auto_apply_changes(E_Config_Dialog_Data *cfdata)
params = &(bw->params); params = &(bw->params);
} }
if (*action) evas_stringshare_del(*action); if (*action) eina_stringshare_del(*action);
if (*params) evas_stringshare_del(*params); if (*params) eina_stringshare_del(*params);
*action = NULL; *action = NULL;
*params = NULL; *params = NULL;
@ -1066,9 +1066,9 @@ _auto_apply_changes(E_Config_Dialog_Data *cfdata)
actd = evas_list_nth(actg->acts, a); actd = evas_list_nth(actg->acts, a);
if (!actd) return; if (!actd) return;
if (actd->act_cmd) *action = evas_stringshare_add(actd->act_cmd); if (actd->act_cmd) *action = eina_stringshare_add(actd->act_cmd);
if (actd->act_params) if (actd->act_params)
*params = evas_stringshare_add(actd->act_params); *params = eina_stringshare_add(actd->act_params);
else else
{ {
int ok = 1; int ok = 1;
@ -1083,7 +1083,7 @@ _auto_apply_changes(E_Config_Dialog_Data *cfdata)
ok = 0; ok = 0;
if (ok) if (ok)
*params = evas_stringshare_add(cfdata->locals.params); *params = eina_stringshare_add(cfdata->locals.params);
} }
} }

6
src/modules/conf_paths/e_int_config_paths.c
View File

@ -117,7 +117,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
const char *dir; const char *dir;
dir = pcd->new_user_path->data; dir = pcd->new_user_path->data;
evas_stringshare_del(dir); eina_stringshare_del(dir);
pcd->new_user_path = pcd->new_user_path =
evas_list_remove_list(pcd->new_user_path, pcd->new_user_path); evas_list_remove_list(pcd->new_user_path, pcd->new_user_path);
} }
@ -269,7 +269,7 @@ _ilist_update(Evas_Object *obj, CFPath_Change_Data *old, CFPath_Change_Data *new
const char *dir; const char *dir;
dir = old->new_user_path->data; dir = old->new_user_path->data;
evas_stringshare_del(dir); eina_stringshare_del(dir);
old->new_user_path = old->new_user_path =
evas_list_remove_list(old->new_user_path, old->new_user_path); evas_list_remove_list(old->new_user_path, old->new_user_path);
} }
@ -280,7 +280,7 @@ _ilist_update(Evas_Object *obj, CFPath_Change_Data *old, CFPath_Change_Data *new
dir = e_widget_config_list_nth_get(obj, i); dir = e_widget_config_list_nth_get(obj, i);
old->new_user_path = old->new_user_path =
evas_list_append(old->new_user_path, evas_stringshare_add(dir)); evas_list_append(old->new_user_path, eina_stringshare_add(dir));
} }
} }

4
src/modules/conf_shelves/e_int_config_shelf.c
View File

@ -225,7 +225,7 @@ _cb_add(void *data, void *data2)
zone = e_zone_current_get(con); zone = e_zone_current_get(con);
cfg = E_NEW(E_Config_Shelf, 1); cfg = E_NEW(E_Config_Shelf, 1);
cfg->name = evas_stringshare_add("shelf"); cfg->name = eina_stringshare_add("shelf");
cfg->container = con->num; cfg->container = con->num;
cfg->zone = zone->id; cfg->zone = zone->id;
cfg->popup = 1; cfg->popup = 1;
@ -233,7 +233,7 @@ _cb_add(void *data, void *data2)
cfg->orient = E_GADCON_ORIENT_CORNER_BR; cfg->orient = E_GADCON_ORIENT_CORNER_BR;
cfg->fit_along = 1; cfg->fit_along = 1;
cfg->fit_size = 0; cfg->fit_size = 0;
cfg->style = evas_stringshare_add("default"); cfg->style = eina_stringshare_add("default");
cfg->size = 40; cfg->size = 40;
cfg->overlap = 0; cfg->overlap = 0;
cfg->autohide = 0; cfg->autohide = 0;

4
src/modules/conf_startup/e_int_config_startup.c
View File

@ -228,7 +228,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
e_config->show_splash = cfdata->show_splash; e_config->show_splash = cfdata->show_splash;
if (e_config->init_default_theme) if (e_config->init_default_theme)
evas_stringshare_del(e_config->init_default_theme); eina_stringshare_del(e_config->init_default_theme);
e_config->init_default_theme = NULL; e_config->init_default_theme = NULL;
if (cfdata->splash) if (cfdata->splash)
@ -238,7 +238,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
const char *f; const char *f;
f = ecore_file_file_get(cfdata->splash); f = ecore_file_file_get(cfdata->splash);
e_config->init_default_theme = evas_stringshare_add(f); e_config->init_default_theme = eina_stringshare_add(f);
} }
} }

8
src/modules/conf_theme/e_int_config_theme.c
View File

@ -884,7 +884,7 @@ _cb_adv_btn_assign(void *data1, void *data2)
{ {
if ((t->file) && (strcmp(t->file, newtheme->file))) if ((t->file) && (strcmp(t->file, newtheme->file)))
{ {
filename = evas_stringshare_add(t->file); filename = eina_stringshare_add(t->file);
free((void *)(t->file)); free((void *)(t->file));
t->file = NULL; t->file = NULL;
if (!_theme_file_used(cfdata->theme_list, filename)) if (!_theme_file_used(cfdata->theme_list, filename))
@ -895,7 +895,7 @@ _cb_adv_btn_assign(void *data1, void *data2)
} }
} }
t->file = strdup(newtheme->file); t->file = strdup(newtheme->file);
if (filename) evas_stringshare_del(filename); if (filename) eina_stringshare_del(filename);
break; break;
} }
} }
@ -937,7 +937,7 @@ _cb_adv_btn_clear(void *data1, void *data2)
{ {
if (t->file) if (t->file)
{ {
filename = evas_stringshare_add(t->file); filename = eina_stringshare_add(t->file);
free((void *)(t->file)); free((void *)(t->file));
t->file = NULL; t->file = NULL;
} }
@ -950,7 +950,7 @@ _cb_adv_btn_clear(void *data1, void *data2)
for (n = 0; n < e_widget_ilist_count(of); n++) for (n = 0; n < e_widget_ilist_count(of); n++)
if (!strcmp(filename, _files_ilist_nth_label_to_file(cfdata, n))) if (!strcmp(filename, _files_ilist_nth_label_to_file(cfdata, n)))
e_widget_ilist_nth_icon_set(of, n, NULL); e_widget_ilist_nth_icon_set(of, n, NULL);
evas_stringshare_del(filename); eina_stringshare_del(filename);
} }
return; return;

12
src/modules/conf_transitions/e_int_config_transitions.c
View File

@ -81,30 +81,30 @@ static int
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
if (e_config->transition_start) if (e_config->transition_start)
evas_stringshare_del(e_config->transition_start); eina_stringshare_del(e_config->transition_start);
e_config->transition_start = NULL; e_config->transition_start = NULL;
if (cfdata->transition_start) if (cfdata->transition_start)
{ {
if (e_theme_transition_find(cfdata->transition_start)) if (e_theme_transition_find(cfdata->transition_start))
e_config->transition_start = evas_stringshare_add(cfdata->transition_start); e_config->transition_start = eina_stringshare_add(cfdata->transition_start);
} }
if (e_config->transition_desk) if (e_config->transition_desk)
evas_stringshare_del(e_config->transition_desk); eina_stringshare_del(e_config->transition_desk);
e_config->transition_desk = NULL; e_config->transition_desk = NULL;
if (cfdata->transition_desk) if (cfdata->transition_desk)
{ {
if (e_theme_transition_find(cfdata->transition_desk)) if (e_theme_transition_find(cfdata->transition_desk))
e_config->transition_desk = evas_stringshare_add(cfdata->transition_desk); e_config->transition_desk = eina_stringshare_add(cfdata->transition_desk);
} }
if (e_config->transition_change) if (e_config->transition_change)
evas_stringshare_del(e_config->transition_change); eina_stringshare_del(e_config->transition_change);
e_config->transition_change = NULL; e_config->transition_change = NULL;
if (cfdata->transition_change) if (cfdata->transition_change)
{ {
if (e_theme_transition_find(cfdata->transition_change)) if (e_theme_transition_find(cfdata->transition_change))
e_config->transition_change = evas_stringshare_add(cfdata->transition_change); e_config->transition_change = eina_stringshare_add(cfdata->transition_change);
} }
e_config_save_queue(); e_config_save_queue();

8
src/modules/conf_wallpaper/e_int_config_wallpaper.c
View File

@ -170,14 +170,14 @@ e_int_config_wallpaper_handler_set(Evas_Object *obj, const char *path, void *dat
if (dev) if (dev)
{ {
if (e_config->wallpaper_import_last_dev) if (e_config->wallpaper_import_last_dev)
evas_stringshare_del(e_config->wallpaper_import_last_dev); eina_stringshare_del(e_config->wallpaper_import_last_dev);
e_config->wallpaper_import_last_dev = evas_stringshare_add(dev); e_config->wallpaper_import_last_dev = eina_stringshare_add(dev);
} }
if (fpath) if (fpath)
{ {
if (e_config->wallpaper_import_last_path) if (e_config->wallpaper_import_last_path)
evas_stringshare_del(e_config->wallpaper_import_last_path); eina_stringshare_del(e_config->wallpaper_import_last_path);
e_config->wallpaper_import_last_path = evas_stringshare_add(fpath); e_config->wallpaper_import_last_path = eina_stringshare_add(fpath);
} }
e_config_save_queue(); e_config_save_queue();

8
src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
View File

@ -303,14 +303,14 @@ _import_path_save(Import *import)
if ((fdev) || (fpath)) if ((fdev) || (fpath))
{ {
if (e_config->wallpaper_import_last_dev) if (e_config->wallpaper_import_last_dev)
evas_stringshare_del(e_config->wallpaper_import_last_dev); eina_stringshare_del(e_config->wallpaper_import_last_dev);
if (fdev) if (fdev)
e_config->wallpaper_import_last_dev = evas_stringshare_add(fdev); e_config->wallpaper_import_last_dev = eina_stringshare_add(fdev);
else e_config->wallpaper_import_last_dev = NULL; else e_config->wallpaper_import_last_dev = NULL;
if (e_config->wallpaper_import_last_path) if (e_config->wallpaper_import_last_path)
evas_stringshare_del(e_config->wallpaper_import_last_path); eina_stringshare_del(e_config->wallpaper_import_last_path);
if (fpath) if (fpath)
e_config->wallpaper_import_last_path = evas_stringshare_add(fpath); e_config->wallpaper_import_last_path = eina_stringshare_add(fpath);
else e_config->wallpaper_import_last_path = NULL; else e_config->wallpaper_import_last_path = NULL;
e_config_save_queue(); e_config_save_queue();
} }

130
src/modules/connman/e_iface.c
View File

@ -66,22 +66,22 @@ iface_ipv4_decode(DBusMessage *msg)
if ((!strcmp(key, "Method")) && (type == DBUS_TYPE_STRING)) if ((!strcmp(key, "Method")) && (type == DBUS_TYPE_STRING))
{ {
dbus_message_iter_get_basic(&val, &v); dbus_message_iter_get_basic(&val, &v);
if (v) d->method = evas_stringshare_add(v); if (v) d->method = eina_stringshare_add(v);
} }
else if ((!strcmp(key, "Address")) && (type == DBUS_TYPE_STRING)) else if ((!strcmp(key, "Address")) && (type == DBUS_TYPE_STRING))
{ {
dbus_message_iter_get_basic(&val, &v); dbus_message_iter_get_basic(&val, &v);
if (v) d->address = evas_stringshare_add(v); if (v) d->address = eina_stringshare_add(v);
} }
else if ((!strcmp(key, "Gateway")) && (type == DBUS_TYPE_STRING)) else if ((!strcmp(key, "Gateway")) && (type == DBUS_TYPE_STRING))
{ {
dbus_message_iter_get_basic(&val, &v); dbus_message_iter_get_basic(&val, &v);
if (v) d->gateway = evas_stringshare_add(v); if (v) d->gateway = eina_stringshare_add(v);
} }
else if ((!strcmp(key, "Netmask")) && (type == DBUS_TYPE_STRING)) else if ((!strcmp(key, "Netmask")) && (type == DBUS_TYPE_STRING))
{ {
dbus_message_iter_get_basic(&val, &v); dbus_message_iter_get_basic(&val, &v);
if (v) d->netmask = evas_stringshare_add(v); if (v) d->netmask = eina_stringshare_add(v);
} }
dbus_message_iter_next(&iter); dbus_message_iter_next(&iter);
} }
@ -107,10 +107,10 @@ iface_getipv4_callback(void *data, void *ret, DBusError *err)
iface_unref(iface); iface_unref(iface);
return; return;
} }
if (iface->ipv4.method) evas_stringshare_del(iface->ipv4.method); if (iface->ipv4.method) eina_stringshare_del(iface->ipv4.method);
if (iface->ipv4.address) evas_stringshare_del(iface->ipv4.address); if (iface->ipv4.address) eina_stringshare_del(iface->ipv4.address);
if (iface->ipv4.gateway) evas_stringshare_del(iface->ipv4.gateway); if (iface->ipv4.gateway) eina_stringshare_del(iface->ipv4.gateway);
if (iface->ipv4.netmask) evas_stringshare_del(iface->ipv4.netmask); if (iface->ipv4.netmask) eina_stringshare_del(iface->ipv4.netmask);
memcpy(&(iface->ipv4), d, sizeof(Interface_IPv4)); memcpy(&(iface->ipv4), d, sizeof(Interface_IPv4));
iface->callbacks = iface_callback(iface->callbacks, iface->callbacks = iface_callback(iface->callbacks,
IFACE_EVENT_IPV4_CHANGE, IFACE_EVENT_IPV4_CHANGE,
@ -155,12 +155,12 @@ iface_network_selection_decode(DBusMessage *msg)
if ((!strcmp(key, "ESSID")) && (type == DBUS_TYPE_STRING)) if ((!strcmp(key, "ESSID")) && (type == DBUS_TYPE_STRING))
{ {
dbus_message_iter_get_basic(&val, &v); dbus_message_iter_get_basic(&val, &v);
if (v) d->id = evas_stringshare_add(v); if (v) d->id = eina_stringshare_add(v);
} }
else if ((!strcmp(key, "PSK")) && (type == DBUS_TYPE_STRING)) else if ((!strcmp(key, "PSK")) && (type == DBUS_TYPE_STRING))
{ {
dbus_message_iter_get_basic(&val, &v); dbus_message_iter_get_basic(&val, &v);
if (v) d->pass = evas_stringshare_add(v); if (v) d->pass = eina_stringshare_add(v);
} }
dbus_message_iter_next(&iter); dbus_message_iter_next(&iter);
} }
@ -186,8 +186,8 @@ iface_getnetwork_callback(void *data, void *ret, DBusError *err)
iface_unref(iface); iface_unref(iface);
return; return;
} }
if (iface->network_selection.id) evas_stringshare_del(iface->network_selection.id); if (iface->network_selection.id) eina_stringshare_del(iface->network_selection.id);
if (iface->network_selection.pass) evas_stringshare_del(iface->network_selection.pass); if (iface->network_selection.pass) eina_stringshare_del(iface->network_selection.pass);
memcpy(&(iface->network_selection), d, sizeof(Interface_Network_Selection)); memcpy(&(iface->network_selection), d, sizeof(Interface_Network_Selection));
iface->callbacks = iface_callback(iface->callbacks, iface->callbacks = iface_callback(iface->callbacks,
IFACE_EVENT_NETWORK_SELECTION_CHANGE, IFACE_EVENT_NETWORK_SELECTION_CHANGE,
@ -232,32 +232,32 @@ iface_getproperties_unmarhsall(DBusMessage *msg, DBusError *err)
if ((!strcmp(key, "Type")) && (type == DBUS_TYPE_STRING)) if ((!strcmp(key, "Type")) && (type == DBUS_TYPE_STRING))
{ {
dbus_message_iter_get_basic(&val, &v); dbus_message_iter_get_basic(&val, &v);
if (v) d->type = evas_stringshare_add(v); if (v) d->type = eina_stringshare_add(v);
} }
else if ((!strcmp(key, "State")) && (type == DBUS_TYPE_STRING)) else if ((!strcmp(key, "State")) && (type == DBUS_TYPE_STRING))
{ {
dbus_message_iter_get_basic(&val, &v); dbus_message_iter_get_basic(&val, &v);
if (v) d->state = evas_stringshare_add(v); if (v) d->state = eina_stringshare_add(v);
} }
else if ((!strcmp(key, "Policy")) && (type == DBUS_TYPE_STRING)) else if ((!strcmp(key, "Policy")) && (type == DBUS_TYPE_STRING))
{ {
dbus_message_iter_get_basic(&val, &v); dbus_message_iter_get_basic(&val, &v);
if (v) d->policy = evas_stringshare_add(v); if (v) d->policy = eina_stringshare_add(v);
} }
else if ((!strcmp(key, "Driver")) && (type == DBUS_TYPE_STRING)) else if ((!strcmp(key, "Driver")) && (type == DBUS_TYPE_STRING))
{ {
dbus_message_iter_get_basic(&val, &v); dbus_message_iter_get_basic(&val, &v);
if (v) d->driver = evas_stringshare_add(v); if (v) d->driver = eina_stringshare_add(v);
} }
else if ((!strcmp(key, "Vendor")) && (type == DBUS_TYPE_STRING)) else if ((!strcmp(key, "Vendor")) && (type == DBUS_TYPE_STRING))
{ {
dbus_message_iter_get_basic(&val, &v); dbus_message_iter_get_basic(&val, &v);
if (v) d->vendor = evas_stringshare_add(v); if (v) d->vendor = eina_stringshare_add(v);
} }
else if ((!strcmp(key, "Product")) && (type == DBUS_TYPE_STRING)) else if ((!strcmp(key, "Product")) && (type == DBUS_TYPE_STRING))
{ {
dbus_message_iter_get_basic(&val, &v); dbus_message_iter_get_basic(&val, &v);
if (v) d->product = evas_stringshare_add(v); if (v) d->product = eina_stringshare_add(v);
} }
else if ((!strcmp(key, "Signal")) && (type == DBUS_TYPE_UINT16)) else if ((!strcmp(key, "Signal")) && (type == DBUS_TYPE_UINT16))
{ {
@ -283,12 +283,12 @@ iface_getproperties_callback(void *data, void *ret, DBusError *err)
iface_unref(iface); iface_unref(iface);
return; return;
} }
if (iface->prop.product) evas_stringshare_del(iface->prop.product); if (iface->prop.product) eina_stringshare_del(iface->prop.product);
if (iface->prop.vendor) evas_stringshare_del(iface->prop.vendor); if (iface->prop.vendor) eina_stringshare_del(iface->prop.vendor);
if (iface->prop.driver) evas_stringshare_del(iface->prop.driver); if (iface->prop.driver) eina_stringshare_del(iface->prop.driver);
if (iface->prop.state) evas_stringshare_del(iface->prop.state); if (iface->prop.state) eina_stringshare_del(iface->prop.state);
if (iface->prop.policy) evas_stringshare_del(iface->prop.policy); if (iface->prop.policy) eina_stringshare_del(iface->prop.policy);
if (iface->prop.type) evas_stringshare_del(iface->prop.type); if (iface->prop.type) eina_stringshare_del(iface->prop.type);
memcpy(&(iface->prop), d, sizeof(Interface_Properties)); memcpy(&(iface->prop), d, sizeof(Interface_Properties));
if (!iface->newif) if (!iface->newif)
{ {
@ -325,8 +325,8 @@ iface_net_add(Interface *iface, const char *essid, const char *bssid, int signal
(!strcmp(essid, net->essid))) || (!strcmp(essid, net->essid))) ||
(!!essid != !!net->essid)) (!!essid != !!net->essid))
{ {
if (net->essid) evas_stringshare_del(net->essid); if (net->essid) eina_stringshare_del(net->essid);
if (essid) net->essid = evas_stringshare_add(essid); if (essid) net->essid = eina_stringshare_add(essid);
else net->essid = NULL; else net->essid = NULL;
changes++; changes++;
} }
@ -339,8 +339,8 @@ iface_net_add(Interface *iface, const char *essid, const char *bssid, int signal
(!strcmp(security, net->security))) || (!strcmp(security, net->security))) ||
(!!security != !!net->security)) (!!security != !!net->security))
{ {
if (net->security) evas_stringshare_del(net->security); if (net->security) eina_stringshare_del(net->security);
if (security) net->security = evas_stringshare_add(security); if (security) net->security = eina_stringshare_add(security);
else net->security = NULL; else net->security = NULL;
changes++; changes++;
} }
@ -355,10 +355,10 @@ iface_net_add(Interface *iface, const char *essid, const char *bssid, int signal
if (net) if (net)
{ {
net->last_seen_time = ecore_time_get(); net->last_seen_time = ecore_time_get();
if (essid) net->essid = evas_stringshare_add(essid); if (essid) net->essid = eina_stringshare_add(essid);
net->bssid = evas_stringshare_add(bssid); net->bssid = eina_stringshare_add(bssid);
net->signal_strength = signal_strength; net->signal_strength = signal_strength;
if (security) net->security = evas_stringshare_add(security); if (security) net->security = eina_stringshare_add(security);
iface->networks = evas_list_append(iface->networks, net); iface->networks = evas_list_append(iface->networks, net);
iface->callbacks = iface_callback(iface->callbacks, iface->callbacks = iface_callback(iface->callbacks,
IFACE_EVENT_SCAN_NETWORK_ADD, IFACE_EVENT_SCAN_NETWORK_ADD,
@ -399,12 +399,12 @@ iface_sigh_network_found(void *data, DBusMessage *msg)
if ((!strcmp(key, "ESSID")) && (type == DBUS_TYPE_STRING)) if ((!strcmp(key, "ESSID")) && (type == DBUS_TYPE_STRING))
{ {
dbus_message_iter_get_basic(&val, &v); dbus_message_iter_get_basic(&val, &v);
if (v) net->essid = evas_stringshare_add(v); if (v) net->essid = eina_stringshare_add(v);
} }
else if ((!strcmp(key, "BSSID")) && (type == DBUS_TYPE_STRING)) else if ((!strcmp(key, "BSSID")) && (type == DBUS_TYPE_STRING))
{ {
dbus_message_iter_get_basic(&val, &v); dbus_message_iter_get_basic(&val, &v);
if (v) net->bssid = evas_stringshare_add(v); if (v) net->bssid = eina_stringshare_add(v);
} }
else if ((!strcmp(key, "Signal")) && (type == DBUS_TYPE_UINT16)) else if ((!strcmp(key, "Signal")) && (type == DBUS_TYPE_UINT16))
{ {
@ -415,16 +415,16 @@ iface_sigh_network_found(void *data, DBusMessage *msg)
if ((!strcmp(key, "Security")) && (type == DBUS_TYPE_STRING)) if ((!strcmp(key, "Security")) && (type == DBUS_TYPE_STRING))
{ {
dbus_message_iter_get_basic(&val, &v); dbus_message_iter_get_basic(&val, &v);
if (v) net->security = evas_stringshare_add(v); if (v) net->security = eina_stringshare_add(v);
} }
dbus_message_iter_next(&iter); dbus_message_iter_next(&iter);
} }
if (net->bssid) if (net->bssid)
iface_net_add(iface, net->essid, net->bssid, iface_net_add(iface, net->essid, net->bssid,
net->signal_strength, net->security); net->signal_strength, net->security);
if (net->essid) evas_stringshare_del(net->essid); if (net->essid) eina_stringshare_del(net->essid);
if (net->bssid) evas_stringshare_del(net->bssid); if (net->bssid) eina_stringshare_del(net->bssid);
if (net->security) evas_stringshare_del(net->security); if (net->security) eina_stringshare_del(net->security);
free(net); free(net);
} }
} }
@ -456,8 +456,8 @@ iface_sigh_state_changed(void *data, DBusMessage *msg)
dbus_message_iter_init(msg, &iter); dbus_message_iter_init(msg, &iter);
dbus_message_iter_get_basic(&iter, &(s)); dbus_message_iter_get_basic(&iter, &(s));
if (!s) return; if (!s) return;
if (iface->prop.state) evas_stringshare_del(iface->prop.state); if (iface->prop.state) eina_stringshare_del(iface->prop.state);
iface->prop.state = evas_stringshare_add(s); iface->prop.state = eina_stringshare_add(s);
msg = dbus_message_new_method_call("org.freedesktop.connman", msg = dbus_message_new_method_call("org.freedesktop.connman",
iface->ifpath, iface->ifpath,
@ -488,8 +488,8 @@ iface_sigh_policy_changed(void *data, DBusMessage *msg)
dbus_message_iter_init(msg, &iter); dbus_message_iter_init(msg, &iter);
dbus_message_iter_get_basic(&iter, &(s)); dbus_message_iter_get_basic(&iter, &(s));
if (!s) return; if (!s) return;
if (iface->prop.policy) evas_stringshare_del(iface->prop.policy); if (iface->prop.policy) eina_stringshare_del(iface->prop.policy);
iface->prop.policy = evas_stringshare_add(s); iface->prop.policy = eina_stringshare_add(s);
iface->callbacks = iface_callback(iface->callbacks, iface->callbacks = iface_callback(iface->callbacks,
IFACE_EVENT_POLICY_CHANGE, IFACE_EVENT_POLICY_CHANGE,
iface, NULL); iface, NULL);
@ -505,8 +505,8 @@ iface_sigh_network_changed(void *data, DBusMessage *msg)
d = iface_network_selection_decode(msg); d = iface_network_selection_decode(msg);
if (!d) return; if (!d) return;
if (iface->network_selection.id) evas_stringshare_del(iface->network_selection.id); if (iface->network_selection.id) eina_stringshare_del(iface->network_selection.id);
if (iface->network_selection.pass) evas_stringshare_del(iface->network_selection.pass); if (iface->network_selection.pass) eina_stringshare_del(iface->network_selection.pass);
memcpy(&(iface->network_selection), d, sizeof(Interface_Network_Selection)); memcpy(&(iface->network_selection), d, sizeof(Interface_Network_Selection));
free(d); free(d);
iface->callbacks = iface_callback(iface->callbacks, iface->callbacks = iface_callback(iface->callbacks,
@ -524,10 +524,10 @@ iface_sigh_ipv4_changed(void *data, DBusMessage *msg)
d = iface_ipv4_decode(msg); d = iface_ipv4_decode(msg);
if (!d) return; if (!d) return;
if (iface->ipv4.method) evas_stringshare_del(iface->ipv4.method); if (iface->ipv4.method) eina_stringshare_del(iface->ipv4.method);
if (iface->ipv4.address) evas_stringshare_del(iface->ipv4.address); if (iface->ipv4.address) eina_stringshare_del(iface->ipv4.address);
if (iface->ipv4.gateway) evas_stringshare_del(iface->ipv4.gateway); if (iface->ipv4.gateway) eina_stringshare_del(iface->ipv4.gateway);
if (iface->ipv4.netmask) evas_stringshare_del(iface->ipv4.netmask); if (iface->ipv4.netmask) eina_stringshare_del(iface->ipv4.netmask);
memcpy(&(iface->ipv4), d, sizeof(Interface_IPv4)); memcpy(&(iface->ipv4), d, sizeof(Interface_IPv4));
free(d); free(d);
iface->callbacks = iface_callback(iface->callbacks, iface->callbacks = iface_callback(iface->callbacks,
@ -556,9 +556,9 @@ iface_timer_network_timeout(void *data)
IFACE_EVENT_SCAN_NETWORK_DEL, IFACE_EVENT_SCAN_NETWORK_DEL,
iface, net); iface, net);
iface->networks = evas_list_remove_list(iface->networks, l_del); iface->networks = evas_list_remove_list(iface->networks, l_del);
if (net->essid) evas_stringshare_del(net->essid); if (net->essid) eina_stringshare_del(net->essid);
if (net->bssid) evas_stringshare_del(net->bssid); if (net->bssid) eina_stringshare_del(net->bssid);
if (net->security) evas_stringshare_del(net->security); if (net->security) eina_stringshare_del(net->security);
free(net); free(net);
} }
else else
@ -696,7 +696,7 @@ iface_add(const char *ifpath)
iface = calloc(1, sizeof(Interface)); iface = calloc(1, sizeof(Interface));
iface->ref = 1; iface->ref = 1;
iface->ifpath = evas_stringshare_add(ifpath); iface->ifpath = eina_stringshare_add(ifpath);
msg = dbus_message_new_method_call("org.freedesktop.connman", msg = dbus_message_new_method_call("org.freedesktop.connman",
iface->ifpath, iface->ifpath,
@ -704,7 +704,7 @@ iface_add(const char *ifpath)
"GetProperties"); "GetProperties");
if (!msg) if (!msg)
{ {
evas_stringshare_del(iface->ifpath); eina_stringshare_del(iface->ifpath);
free(iface); free(iface);
return NULL; return NULL;
} }
@ -798,26 +798,26 @@ iface_unref(Interface *iface)
if (iface->network_timeout) if (iface->network_timeout)
ecore_timer_del(iface->network_timeout); ecore_timer_del(iface->network_timeout);
if (iface->network_selection.id) evas_stringshare_del(iface->network_selection.id); if (iface->network_selection.id) eina_stringshare_del(iface->network_selection.id);
if (iface->network_selection.pass) evas_stringshare_del(iface->network_selection.pass); if (iface->network_selection.pass) eina_stringshare_del(iface->network_selection.pass);
while (iface->networks) while (iface->networks)
{ {
Interface_Network *net; Interface_Network *net;
net = iface->networks->data; net = iface->networks->data;
if (net->essid) evas_stringshare_del(net->essid); if (net->essid) eina_stringshare_del(net->essid);
if (net->bssid) evas_stringshare_del(net->bssid); if (net->bssid) eina_stringshare_del(net->bssid);
if (net->security) evas_stringshare_del(net->security); if (net->security) eina_stringshare_del(net->security);
free(net); free(net);
iface->networks = evas_list_remove_list(iface->networks, iface->networks); iface->networks = evas_list_remove_list(iface->networks, iface->networks);
} }
if (iface->network_timeout) ecore_timer_del(iface->network_timeout); if (iface->network_timeout) ecore_timer_del(iface->network_timeout);
if (iface->prop.product) evas_stringshare_del(iface->prop.product); if (iface->prop.product) eina_stringshare_del(iface->prop.product);
if (iface->prop.vendor) evas_stringshare_del(iface->prop.vendor); if (iface->prop.vendor) eina_stringshare_del(iface->prop.vendor);
if (iface->prop.driver) evas_stringshare_del(iface->prop.driver); if (iface->prop.driver) eina_stringshare_del(iface->prop.driver);
if (iface->prop.state) evas_stringshare_del(iface->prop.state); if (iface->prop.state) eina_stringshare_del(iface->prop.state);
if (iface->prop.policy) evas_stringshare_del(iface->prop.policy); if (iface->prop.policy) eina_stringshare_del(iface->prop.policy);
if (iface->prop.type) evas_stringshare_del(iface->prop.type); if (iface->prop.type) eina_stringshare_del(iface->prop.type);
e_dbus_signal_handler_del(conn, iface->sigh.network_found); e_dbus_signal_handler_del(conn, iface->sigh.network_found);
e_dbus_signal_handler_del(conn, iface->sigh.signal_changed); e_dbus_signal_handler_del(conn, iface->sigh.signal_changed);
e_dbus_signal_handler_del(conn, iface->sigh.state_changed); e_dbus_signal_handler_del(conn, iface->sigh.state_changed);
@ -1316,7 +1316,7 @@ main(int argc, char **argv)
} }
ecore_init(); ecore_init();
ecore_string_init(); eina_stringshare_init();
ecore_app_args_set(argc, (const char **)argv); ecore_app_args_set(argc, (const char **)argv);
e_dbus_init(); e_dbus_init();
evas_init(); evas_init();
@ -1340,7 +1340,7 @@ main(int argc, char **argv)
e_dbus_connection_close(c); e_dbus_connection_close(c);
evas_shutdown(); evas_shutdown();
e_dbus_shutdown(); e_dbus_shutdown();
ecore_string_shutdown(); eina_stringshare_shutdown();
ecore_shutdown(); ecore_shutdown();
return 0; return 0;

1
src/modules/connman/e_iface.h
View File

@ -4,6 +4,7 @@
#include <Ecore.h> #include <Ecore.h>
#include <E_DBus.h> #include <E_DBus.h>
#include <Evas.h> #include <Evas.h>
#include <eina_stringshare.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

16
src/modules/connman/e_mod_main.c
View File

@ -168,8 +168,8 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
Conf_Interface *cfif; Conf_Interface *cfif;
cfif = E_NEW(Conf_Interface, 1); cfif = E_NEW(Conf_Interface, 1);
cfif->name = evas_stringshare_add(name); cfif->name = eina_stringshare_add(name);
cfif->id = evas_stringshare_add(id); cfif->id = eina_stringshare_add(id);
conf->interfaces = evas_list_append(conf->interfaces, cfif); conf->interfaces = evas_list_append(conf->interfaces, cfif);
inst->config.cfif = cfif; inst->config.cfif = cfif;
e_config_save_queue(); e_config_save_queue();
@ -295,7 +295,7 @@ net_join(Instance *inst, Interface *iface, Conf_Network *cfnet)
cfnet->netmask); cfnet->netmask);
if ((!cfnet->remember_password) && (cfnet->password)) if ((!cfnet->remember_password) && (cfnet->password))
{ {
evas_stringshare_del(cfnet->password); eina_stringshare_del(cfnet->password);
cfnet->password = NULL; cfnet->password = NULL;
} }
} }
@ -319,7 +319,7 @@ net_join(Instance *inst, Interface *iface, Conf_Network *cfnet)
cfnet->netmask); cfnet->netmask);
if ((!cfnet->remember_password) && (cfnet->password)) if ((!cfnet->remember_password) && (cfnet->password))
{ {
evas_stringshare_del(cfnet->password); eina_stringshare_del(cfnet->password);
cfnet->password = NULL; cfnet->password = NULL;
} }
} }
@ -329,12 +329,12 @@ net_join(Instance *inst, Interface *iface, Conf_Network *cfnet)
#define STR_SHARE(x) \ #define STR_SHARE(x) \
do { char *___s; ___s = (x); \ do { char *___s; ___s = (x); \
if (___s) { (x) = evas_stringshare_add(___s); free(___s); } \ if (___s) { (x) = eina_stringshare_add(___s); free(___s); } \
} while (0); } while (0);
#define STR_UNSHARE(x) \ #define STR_UNSHARE(x) \
do { char *___s; ___s = (x); \ do { char *___s; ___s = (x); \
if (___s) { (x) = strdup(___s); evas_stringshare_del(___s); } \ if (___s) { (x) = strdup(___s); eina_stringshare_del(___s); } \
} while (0); } while (0);
static void static void
@ -598,11 +598,11 @@ if_dialog_cb_ok(void *data, E_Dialog *dialog)
{ {
if (inst->config.cfif->ifpath) if (inst->config.cfif->ifpath)
{ {
evas_stringshare_del(inst->config.cfif->ifpath); eina_stringshare_del(inst->config.cfif->ifpath);
inst->config.cfif->ifpath = NULL; inst->config.cfif->ifpath = NULL;
} }
if (inst->config.ifpath) if (inst->config.ifpath)
inst->config.cfif->ifpath = evas_stringshare_add(inst->config.ifpath); inst->config.cfif->ifpath = eina_stringshare_add(inst->config.ifpath);
inst->config.cfif->ifmode = inst->config.ifmode; inst->config.cfif->ifmode = inst->config.ifmode;
} }
popup_ifnet_nets_refresh(inst); popup_ifnet_nets_refresh(inst);

10
src/modules/cpufreq/e_mod_main.c
View File

@ -813,8 +813,8 @@ _cpufreq_menu_restore_governor(void *data, E_Menu *m, E_Menu_Item *mi)
if ((!cpufreq_config->governor) || if ((!cpufreq_config->governor) ||
(strcmp(cpufreq_config->status->cur_governor, cpufreq_config->governor))) (strcmp(cpufreq_config->status->cur_governor, cpufreq_config->governor)))
{ {
if (cpufreq_config->governor) evas_stringshare_del(cpufreq_config->governor); if (cpufreq_config->governor) eina_stringshare_del(cpufreq_config->governor);
cpufreq_config->governor = evas_stringshare_add(cpufreq_config->status->cur_governor); cpufreq_config->governor = eina_stringshare_add(cpufreq_config->status->cur_governor);
} }
e_config_save_queue(); e_config_save_queue();
} }
@ -828,8 +828,8 @@ _cpufreq_menu_governor(void *data, E_Menu *m, E_Menu_Item *mi)
if (governor) if (governor)
{ {
_cpufreq_set_governor(governor); _cpufreq_set_governor(governor);
if (cpufreq_config->governor) evas_stringshare_del(cpufreq_config->governor); if (cpufreq_config->governor) eina_stringshare_del(cpufreq_config->governor);
cpufreq_config->governor = evas_stringshare_add(governor); cpufreq_config->governor = eina_stringshare_add(governor);
} }
e_config_save_queue(); e_config_save_queue();
} }
@ -938,7 +938,7 @@ e_modapi_shutdown(E_Module *m)
cpufreq_config->menu_frequency = NULL; cpufreq_config->menu_frequency = NULL;
} }
if (cpufreq_config->governor) if (cpufreq_config->governor)
evas_stringshare_del(cpufreq_config->governor); eina_stringshare_del(cpufreq_config->governor);
if (cpufreq_config->status) _cpufreq_status_free(cpufreq_config->status); if (cpufreq_config->status) _cpufreq_status_free(cpufreq_config->status);
E_FREE(cpufreq_config->set_exe_path); E_FREE(cpufreq_config->set_exe_path);
free(cpufreq_config); free(cpufreq_config);

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

@ -253,7 +253,7 @@ e_exebuf_show(E_Zone *zone)
ee = el->list->data; ee = el->list->data;
exe_list = evas_list_append(exe_list, strdup(ee->path)); exe_list = evas_list_append(exe_list, strdup(ee->path));
evas_stringshare_del(ee->path); eina_stringshare_del(ee->path);
free(ee); free(ee);
el->list = evas_list_remove_list(el->list, el->list); el->list = evas_list_remove_list(el->list, el->list);
} }
@ -1500,7 +1500,7 @@ _e_exebuf_idler(void *data)
ee = malloc(sizeof(E_Exe)); ee = malloc(sizeof(E_Exe));
if (ee) if (ee)
{ {
ee->path = evas_stringshare_add(l->data); ee->path = eina_stringshare_add(l->data);
el->list = evas_list_append(el->list, ee); el->list = evas_list_append(el->list, ee);
} }
} }
@ -1508,7 +1508,7 @@ _e_exebuf_idler(void *data)
while (el->list) while (el->list)
{ {
ee = el->list->data; ee = el->list->data;
evas_stringshare_del(ee->path); eina_stringshare_del(ee->path);
free(ee); free(ee);
el->list = evas_list_remove_list(el->list, el->list); el->list = evas_list_remove_list(el->list, el->list);
} }

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

@ -117,6 +117,8 @@ static Evas_List *fwins = NULL;
EAPI int EAPI int
e_fwin_init(void) e_fwin_init(void)
{ {
eina_stringshare_init();
return 1; return 1;
} }
@ -132,6 +134,9 @@ e_fwin_shutdown(void)
e_object_del(E_OBJECT(l->data)); e_object_del(E_OBJECT(l->data));
l = evas_list_remove_list(l, l); l = evas_list_remove_list(l, l);
} }
eina_stringshare_shutdown();
return 1; return 1;
} }
@ -435,9 +440,9 @@ _e_fwin_new(E_Container *con, const char *dev, const char *path)
if (fwin->win->border) if (fwin->win->border)
{ {
if (fwin->win->border->internal_icon) if (fwin->win->border->internal_icon)
evas_stringshare_del(fwin->win->border->internal_icon); eina_stringshare_del(fwin->win->border->internal_icon);
fwin->win->border->internal_icon = fwin->win->border->internal_icon =
evas_stringshare_add("enlightenment/fileman"); eina_stringshare_add("enlightenment/fileman");
} }
return fwin; return fwin;
@ -464,10 +469,10 @@ _e_fwin_free(E_Fwin *fwin)
ecore_event_handler_del(fwin->zone_del_handler); ecore_event_handler_del(fwin->zone_del_handler);
fwins = evas_list_remove(fwins, fwin); fwins = evas_list_remove(fwins, fwin);
if (fwin->wallpaper_file) evas_stringshare_del(fwin->wallpaper_file); if (fwin->wallpaper_file) eina_stringshare_del(fwin->wallpaper_file);
if (fwin->overlay_file) evas_stringshare_del(fwin->overlay_file); if (fwin->overlay_file) eina_stringshare_del(fwin->overlay_file);
if (fwin->scrollframe_file) evas_stringshare_del(fwin->scrollframe_file); if (fwin->scrollframe_file) eina_stringshare_del(fwin->scrollframe_file);
if (fwin->theme_file) evas_stringshare_del(fwin->theme_file); if (fwin->theme_file) eina_stringshare_del(fwin->theme_file);
if (fwin->fad) if (fwin->fad)
{ {
e_object_del(E_OBJECT(fwin->fad->dia)); e_object_del(E_OBJECT(fwin->fad->dia));
@ -563,18 +568,18 @@ _e_fwin_custom_file_path_eval(E_Fwin *fwin, Efreet_Desktop *ef, const char *prev
/* 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 = ecore_hash_get(ef->x, key);
/* free the old path */ /* free the old path */
if (prev_path) evas_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 */
if (!res) return NULL; if (!res) return NULL;
/* it's a full path */ /* it's a full path */
if (res[0] == '/') if (res[0] == '/')
ret = evas_stringshare_add(res); ret = eina_stringshare_add(res);
/* relative path to the dir */ /* relative path to the dir */
else else
{ {
snprintf(buf, sizeof(buf), "%s/%s", e_fm2_real_path_get(fwin->fm_obj), res); snprintf(buf, sizeof(buf), "%s/%s", e_fm2_real_path_get(fwin->fm_obj), res);
ret = evas_stringshare_add(buf); ret = eina_stringshare_add(buf);
} }
return ret; return ret;
} }
@ -1177,10 +1182,10 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Evas_List *files, int always)
E_Fm2_Custom_File *cf; E_Fm2_Custom_File *cf;
if (fwin2->win->border->internal_icon) if (fwin2->win->border->internal_icon)
evas_stringshare_del(fwin2->win->border->internal_icon); eina_stringshare_del(fwin2->win->border->internal_icon);
fwin2->win->border->internal_icon = NULL; fwin2->win->border->internal_icon = NULL;
if (fwin2->win->border->internal_icon_key) if (fwin2->win->border->internal_icon_key)
evas_stringshare_del(fwin2->win->border->internal_icon_key); eina_stringshare_del(fwin2->win->border->internal_icon_key);
fwin2->win->border->internal_icon_key = NULL; fwin2->win->border->internal_icon_key = NULL;
if (!strcmp(evas_object_type_get(oic), "edje")) if (!strcmp(evas_object_type_get(oic), "edje"))
@ -1189,17 +1194,17 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Evas_List *files, int always)
if (file) if (file)
{ {
fwin2->win->border->internal_icon = fwin2->win->border->internal_icon =
evas_stringshare_add(file); eina_stringshare_add(file);
if (group) if (group)
fwin2->win->border->internal_icon_key = fwin2->win->border->internal_icon_key =
evas_stringshare_add(group); eina_stringshare_add(group);
} }
} }
else else
{ {
file = e_icon_file_get(oic); file = e_icon_file_get(oic);
fwin2->win->border->internal_icon = fwin2->win->border->internal_icon =
evas_stringshare_add(file); eina_stringshare_add(file);
} }
evas_object_del(oic); evas_object_del(oic);

11
src/modules/fileman/e_mod_main.c
View File

@ -39,6 +39,8 @@ e_modapi_init(E_Module *m)
conf_module = m; conf_module = m;
eina_stringshare_init();
/* Setup Entry in Config Panel */ /* Setup Entry in Config Panel */
e_configure_registry_category_add("fileman", 100, _("File Manager"), e_configure_registry_category_add("fileman", 100, _("File Manager"),
NULL, "enlightenment/fileman"); NULL, "enlightenment/fileman");
@ -143,6 +145,9 @@ e_modapi_shutdown(E_Module *m)
_e_mod_fileman_config_free(); _e_mod_fileman_config_free();
E_CONFIG_DD_FREE(conf_edd); E_CONFIG_DD_FREE(conf_edd);
eina_stringshare_shutdown();
conf_module = NULL; conf_module = NULL;
return 1; return 1;
} }
@ -333,11 +338,11 @@ static void
_e_mod_fileman_config_free(void) _e_mod_fileman_config_free(void)
{ {
if (fileman_config->theme.background) if (fileman_config->theme.background)
evas_stringshare_del(fileman_config->theme.background); eina_stringshare_del(fileman_config->theme.background);
if (fileman_config->theme.frame) if (fileman_config->theme.frame)
evas_stringshare_del(fileman_config->theme.frame); eina_stringshare_del(fileman_config->theme.frame);
if (fileman_config->theme.icons) if (fileman_config->theme.icons)
evas_stringshare_del(fileman_config->theme.icons); eina_stringshare_del(fileman_config->theme.icons);
E_FREE(fileman_config); E_FREE(fileman_config);
} }

4
src/modules/gadman/e_mod_config.c
View File

@ -266,8 +266,8 @@ _adv_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
snprintf(path, sizeof(path), "%s/%s", p, ic->file); snprintf(path, sizeof(path), "%s/%s", p, ic->file);
if (Man->conf->custom_bg) if (Man->conf->custom_bg)
evas_stringshare_del(Man->conf->custom_bg); eina_stringshare_del(Man->conf->custom_bg);
Man->conf->custom_bg = evas_stringshare_add(path); Man->conf->custom_bg = eina_stringshare_add(path);
} }
evas_list_free(sel); evas_list_free(sel);
} }

30
src/modules/gadman/e_mod_gadman.c
View File

@ -101,10 +101,10 @@ gadman_shutdown(void)
/* free gadcons */ /* free gadcons */
e_config->gadcons = evas_list_remove(e_config->gadcons, Man->gc); e_config->gadcons = evas_list_remove(e_config->gadcons, Man->gc);
e_config->gadcons = evas_list_remove(e_config->gadcons, Man->gc_top); e_config->gadcons = evas_list_remove(e_config->gadcons, Man->gc_top);
evas_stringshare_del(Man->gc->name); eina_stringshare_del(Man->gc->name);
evas_stringshare_del(Man->gc_top->name); eina_stringshare_del(Man->gc_top->name);
if (Man->gc->config_dialog) e_object_del(E_OBJECT(Man->gc->config_dialog)); if (Man->gc->config_dialog) e_object_del(E_OBJECT(Man->gc->config_dialog));
if (Man->icon_name) evas_stringshare_del(Man->icon_name); if (Man->icon_name) eina_stringshare_del(Man->icon_name);
free(Man->gc); free(Man->gc);
free(Man->gc_top); free(Man->gc_top);
@ -194,7 +194,7 @@ gadman_gadget_add(E_Gadcon_Client_Class *cc, int ontop)
/* Create Config_Gadcon_Client */ /* Create Config_Gadcon_Client */
cf = e_gadcon_client_config_new(gc, cc->name); cf = e_gadcon_client_config_new(gc, cc->name);
cf->style = evas_stringshare_add(cc->default_style); cf->style = eina_stringshare_add(cc->default_style);
cf->geom.pos_x = DEFAULT_POS_X; cf->geom.pos_x = DEFAULT_POS_X;
cf->geom.pos_y = DEFAULT_POS_Y; cf->geom.pos_y = DEFAULT_POS_Y;
cf->geom.size_w = DEFAULT_SIZE_W; cf->geom.size_w = DEFAULT_SIZE_W;
@ -415,7 +415,7 @@ _gadman_gadcon_new(const char* name, int ontop)
gc = E_OBJECT_ALLOC(E_Gadcon, E_GADCON_TYPE, NULL); gc = E_OBJECT_ALLOC(E_Gadcon, E_GADCON_TYPE, NULL);
if (!gc) return NULL; if (!gc) return NULL;
gc->name = evas_stringshare_add(name); gc->name = eina_stringshare_add(name);
gc->layout_policy = E_GADCON_LAYOUT_POLICY_PANEL; gc->layout_policy = E_GADCON_LAYOUT_POLICY_PANEL;
gc->orient = E_GADCON_ORIENT_FLOAT; gc->orient = E_GADCON_ORIENT_FLOAT;
@ -497,7 +497,7 @@ _gadman_gadcon_new(const char* name, int ontop)
if (!gc->cf) if (!gc->cf)
{ {
gc->cf = E_NEW(E_Config_Gadcon, 1); gc->cf = E_NEW(E_Config_Gadcon, 1);
gc->cf->name = evas_stringshare_add(name); gc->cf->name = eina_stringshare_add(name);
gc->cf->id = gc->id; gc->cf->id = gc->id;
gc->cf->clients = NULL; gc->cf->clients = NULL;
e_config->gadcons = evas_list_append(e_config->gadcons, gc->cf); e_config->gadcons = evas_list_append(e_config->gadcons, gc->cf);
@ -611,7 +611,7 @@ _attach_menu(void *data, E_Gadcon_Client *gcc, E_Menu *menu)
if (!gcc) return; if (!gcc) return;
if (!gcc->cf->style) if (!gcc->cf->style)
gcc->cf->style = evas_stringshare_add(E_GADCON_CLIENT_STYLE_INSET); gcc->cf->style = eina_stringshare_add(E_GADCON_CLIENT_STYLE_INSET);
/* plain / inset */ /* plain / inset */
mn = e_menu_new(); mn = e_menu_new();
@ -775,11 +775,11 @@ on_menu_style_plain(void *data, E_Menu *m, E_Menu_Item *mi)
E_Gadcon_Client *gcc; E_Gadcon_Client *gcc;
gcc = current; gcc = current;
if (gcc->style) evas_stringshare_del(gcc->style); if (gcc->style) eina_stringshare_del(gcc->style);
gcc->style = evas_stringshare_add(E_GADCON_CLIENT_STYLE_PLAIN); gcc->style = eina_stringshare_add(E_GADCON_CLIENT_STYLE_PLAIN);
if (gcc->cf->style) evas_stringshare_del(gcc->cf->style); if (gcc->cf->style) eina_stringshare_del(gcc->cf->style);
gcc->cf->style = evas_stringshare_add(E_GADCON_CLIENT_STYLE_PLAIN); gcc->cf->style = eina_stringshare_add(E_GADCON_CLIENT_STYLE_PLAIN);
edje_object_signal_emit(gcc->o_frame, "e,state,visibility,plain", "e"); edje_object_signal_emit(gcc->o_frame, "e,state,visibility,plain", "e");
@ -793,11 +793,11 @@ on_menu_style_inset(void *data, E_Menu *m, E_Menu_Item *mi)
gcc = current; gcc = current;
if (gcc->style) evas_stringshare_del(gcc->style); if (gcc->style) eina_stringshare_del(gcc->style);
gcc->style = evas_stringshare_add(E_GADCON_CLIENT_STYLE_INSET); gcc->style = eina_stringshare_add(E_GADCON_CLIENT_STYLE_INSET);
if (gcc->cf->style) evas_stringshare_del(gcc->cf->style); if (gcc->cf->style) eina_stringshare_del(gcc->cf->style);
gcc->cf->style = evas_stringshare_add(E_GADCON_CLIENT_STYLE_INSET); gcc->cf->style = eina_stringshare_add(E_GADCON_CLIENT_STYLE_INSET);
edje_object_signal_emit(gcc->o_frame, "e,state,visibility,inset", "e"); edje_object_signal_emit(gcc->o_frame, "e,state,visibility,inset", "e");

2
src/modules/gadman/e_mod_main.c
View File

@ -70,7 +70,7 @@ e_modapi_init(E_Module *m)
E_CONFIG_LIMIT(Man->conf->anim_gad, 0, 1); E_CONFIG_LIMIT(Man->conf->anim_gad, 0, 1);
/* Menu augmentation */ /* Menu augmentation */
Man->icon_name = evas_stringshare_add(buf); Man->icon_name = eina_stringshare_add(buf);
Man->maug = NULL; Man->maug = NULL;
Man->maug = Man->maug =
e_int_menus_menu_augmentation_add("config/1", _gadman_maug_add, e_int_menus_menu_augmentation_add("config/1", _gadman_maug_add,

4
src/modules/ibar/e_mod_config.c
View File

@ -148,9 +148,9 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
Config_Item *ci; Config_Item *ci;
ci = cfd->data; ci = cfd->data;
if (ci->dir) evas_stringshare_del(ci->dir); if (ci->dir) eina_stringshare_del(ci->dir);
ci->dir = NULL; ci->dir = NULL;
if (cfdata->dir) ci->dir = evas_stringshare_add(cfdata->dir); if (cfdata->dir) ci->dir = eina_stringshare_add(cfdata->dir);
ci->show_label = cfdata->show_label; ci->show_label = cfdata->show_label;
ci->eap_label = cfdata->eap_label; ci->eap_label = cfdata->eap_label;
_ibar_config_update(ci); _ibar_config_update(ci);

14
src/modules/ibar/e_mod_main.c
View File

@ -135,7 +135,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
ci = _ibar_config_item_get(id); ci = _ibar_config_item_get(id);
inst->ci = ci; inst->ci = ci;
if (!ci->dir) ci->dir = evas_stringshare_add("default"); if (!ci->dir) ci->dir = eina_stringshare_add("default");
b = _ibar_new(gc->evas, inst); b = _ibar_new(gc->evas, inst);
o = b->o_box; o = b->o_box;
gcc = e_gadcon_client_new(gc, name, id, style, o); gcc = e_gadcon_client_new(gc, name, id, style, o);
@ -241,7 +241,7 @@ _gc_id_del(const char *id)
ci = _ibar_config_item_get(id); ci = _ibar_config_item_get(id);
if (ci) if (ci)
{ {
if (ci->id) evas_stringshare_del(ci->id); if (ci->id) eina_stringshare_del(ci->id);
ibar_config->items = evas_list_remove(ibar_config->items, ci); ibar_config->items = evas_list_remove(ibar_config->items, ci);
} }
} }
@ -464,7 +464,7 @@ _ibar_config_item_get(const char *id)
} }
} }
ci = E_NEW(Config_Item, 1); ci = E_NEW(Config_Item, 1);
ci->id = evas_stringshare_add(id); ci->id = eina_stringshare_add(id);
ci->show_label = 1; ci->show_label = 1;
ci->eap_label = 0; ci->eap_label = 0;
ibar_config->items = evas_list_append(ibar_config->items, ci); ibar_config->items = evas_list_append(ibar_config->items, ci);
@ -1229,8 +1229,8 @@ e_modapi_init(E_Module *m)
ibar_config = E_NEW(Config, 1); ibar_config = E_NEW(Config, 1);
ci = E_NEW(Config_Item, 1); ci = E_NEW(Config_Item, 1);
ci->id = evas_stringshare_add("0"); ci->id = eina_stringshare_add("0");
ci->dir = evas_stringshare_add("default"); ci->dir = eina_stringshare_add("default");
ci->show_label = 1; ci->show_label = 1;
ci->eap_label = 0; ci->eap_label = 0;
ibar_config->items = evas_list_append(ibar_config->items, ci); ibar_config->items = evas_list_append(ibar_config->items, ci);
@ -1279,8 +1279,8 @@ e_modapi_shutdown(E_Module *m)
ci = ibar_config->items->data; ci = ibar_config->items->data;
ibar_config->items = evas_list_remove_list(ibar_config->items, ibar_config->items); ibar_config->items = evas_list_remove_list(ibar_config->items, ibar_config->items);
if (ci->id) evas_stringshare_del(ci->id); if (ci->id) eina_stringshare_del(ci->id);
if (ci->dir) evas_stringshare_del(ci->dir); if (ci->dir) eina_stringshare_del(ci->dir);
free(ci); free(ci);
} }
free(ibar_config); free(ibar_config);

8
src/modules/ibox/e_mod_main.c
View File

@ -251,7 +251,7 @@ _gc_id_del(const char *id)
ci = _ibox_config_item_get(id); ci = _ibox_config_item_get(id);
if (ci) if (ci)
{ {
if (ci->id) evas_stringshare_del(ci->id); if (ci->id) eina_stringshare_del(ci->id);
ibox_config->items = evas_list_remove(ibox_config->items, ci); ibox_config->items = evas_list_remove(ibox_config->items, ci);
} }
} }
@ -1266,7 +1266,7 @@ _ibox_config_item_get(const char *id)
} }
} }
ci = E_NEW(Config_Item, 1); ci = E_NEW(Config_Item, 1);
ci->id = evas_stringshare_add(id); ci->id = eina_stringshare_add(id);
ci->show_label = 0; ci->show_label = 0;
ci->show_zone = 1; ci->show_zone = 1;
ci->show_desk = 0; ci->show_desk = 0;
@ -1353,7 +1353,7 @@ e_modapi_init(E_Module *m)
ibox_config = E_NEW(Config, 1); ibox_config = E_NEW(Config, 1);
ci = E_NEW(Config_Item, 1); ci = E_NEW(Config_Item, 1);
ci->id = evas_stringshare_add("0"); ci->id = eina_stringshare_add("0");
ci->show_label = 0; ci->show_label = 0;
ci->show_zone = 1; ci->show_zone = 1;
ci->show_desk = 0; ci->show_desk = 0;
@ -1450,7 +1450,7 @@ e_modapi_shutdown(E_Module *m)
ci = ibox_config->items->data; ci = ibox_config->items->data;
ibox_config->items = evas_list_remove_list(ibox_config->items, ibox_config->items); ibox_config->items = evas_list_remove_list(ibox_config->items, ibox_config->items);
if (ci->id) if (ci->id)
evas_stringshare_del(ci->id); eina_stringshare_del(ci->id);
free(ci); free(ci);
} }

4
src/modules/layout/e_mod_main.c
View File

@ -37,8 +37,8 @@ _e_module_layout_cb_hook(void *data, E_Border *bd)
bd->zone->x + (bd->zone->w / 2), bd->zone->x + (bd->zone->w / 2),
bd->zone->y + (bd->zone->h / 2)); bd->zone->y + (bd->zone->h / 2));
e_border_resize(bd, 1, 1); e_border_resize(bd, 1, 1);
if (bd->bordername) evas_stringshare_del(bd->bordername); if (bd->bordername) eina_stringshare_del(bd->bordername);
bd->bordername = evas_stringshare_add("borderless"); bd->bordername = eina_stringshare_add("borderless");
bd->client.icccm.base_w = 1; bd->client.icccm.base_w = 1;
bd->client.icccm.base_h = 1; bd->client.icccm.base_h = 1;
bd->client.icccm.min_w = 1; bd->client.icccm.min_w = 1;

22
src/modules/mixer/conf_gadget.c
View File

@ -77,7 +77,7 @@ _mixer_fill_channels_info(E_Config_Dialog_Data *cfdata)
return; return;
cfdata->channel = 0; cfdata->channel = 0;
cfdata->channel_name = evas_stringshare_add(cfdata->conf->channel_name); cfdata->channel_name = eina_stringshare_add(cfdata->conf->channel_name);
cfdata->channels_names = e_mixer_system_get_channels_names(sys); cfdata->channels_names = e_mixer_system_get_channels_names(sys);
for (l = cfdata->channels_names, i = 0; l != NULL; l = l->next, i++) for (l = cfdata->channels_names, i = 0; l != NULL; l = l->next, i++)
{ {
@ -108,7 +108,7 @@ _create_data(E_Config_Dialog *dialog)
cfdata->conf = conf; cfdata->conf = conf;
cfdata->lock_sliders = conf->lock_sliders; cfdata->lock_sliders = conf->lock_sliders;
cfdata->show_locked = conf->show_locked; cfdata->show_locked = conf->show_locked;
cfdata->card = evas_stringshare_add(conf->card); cfdata->card = eina_stringshare_add(conf->card);
_mixer_fill_cards_info(cfdata); _mixer_fill_cards_info(cfdata);
_mixer_fill_channels_info(cfdata); _mixer_fill_channels_info(cfdata);
@ -139,9 +139,9 @@ _free_data(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata)
e_mixer_system_free_cards(cfdata->cards); e_mixer_system_free_cards(cfdata->cards);
if (cfdata->card) if (cfdata->card)
evas_stringshare_del(cfdata->card); eina_stringshare_del(cfdata->card);
if (cfdata->channel_name) if (cfdata->channel_name)
evas_stringshare_del(cfdata->channel_name); eina_stringshare_del(cfdata->channel_name);
evas_list_free(cfdata->ui.channels.radios); evas_list_free(cfdata->ui.channels.radios);
@ -162,16 +162,16 @@ _basic_apply(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata)
if (card) if (card)
{ {
if (conf->card && (strcmp(card, conf->card) != 0)) if (conf->card && (strcmp(card, conf->card) != 0))
evas_stringshare_del(conf->card); eina_stringshare_del(conf->card);
conf->card = evas_stringshare_add(card); conf->card = eina_stringshare_add(card);
} }
channel = evas_list_nth(cfdata->channels_names, cfdata->channel); channel = evas_list_nth(cfdata->channels_names, cfdata->channel);
if (channel) if (channel)
{ {
if (conf->channel_name && (strcmp(channel, conf->channel_name) != 0)) if (conf->channel_name && (strcmp(channel, conf->channel_name) != 0))
evas_stringshare_del(conf->channel_name); eina_stringshare_del(conf->channel_name);
conf->channel_name = evas_stringshare_add(channel); conf->channel_name = eina_stringshare_add(channel);
} }
e_mixer_update(conf->instance); e_mixer_update(conf->instance);
@ -300,14 +300,14 @@ _card_change(void *data, Evas_Object *obj, void *event)
cfdata = data; cfdata = data;
if (cfdata->card) if (cfdata->card)
evas_stringshare_del(cfdata->card); eina_stringshare_del(cfdata->card);
e_mixer_system_free_channels_names(cfdata->channels_names); e_mixer_system_free_channels_names(cfdata->channels_names);
if (cfdata->channel_name) if (cfdata->channel_name)
evas_stringshare_del(cfdata->channel_name); eina_stringshare_del(cfdata->channel_name);
card = evas_list_nth(cfdata->cards, cfdata->card_num); card = evas_list_nth(cfdata->cards, cfdata->card_num);
cfdata->card = evas_stringshare_add(card); cfdata->card = eina_stringshare_add(card);
_mixer_fill_channels_info(cfdata); _mixer_fill_channels_info(cfdata);
evas = evas_object_evas_get(obj); evas = evas_object_evas_get(obj);

4
src/modules/mixer/conf_module.c
View File

@ -72,10 +72,10 @@ _basic_apply(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata)
conf = ctxt->conf; conf = ctxt->conf;
if (conf->default_gc_id) if (conf->default_gc_id)
evas_stringshare_del(conf->default_gc_id); eina_stringshare_del(conf->default_gc_id);
id = ctxt->default_instance->gcc->cf->id; id = ctxt->default_instance->gcc->cf->id;
conf->default_gc_id = evas_stringshare_add(id); conf->default_gc_id = eina_stringshare_add(id);
} }
return 1; return 1;

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

@ -51,8 +51,8 @@ _mixer_gadget_configuration_defaults(E_Mixer_Gadget_Config *conf)
return 0; return 0;
} }
conf->card = evas_stringshare_add(card); conf->card = eina_stringshare_add(card);
conf->channel_name = evas_stringshare_add(channel); conf->channel_name = eina_stringshare_add(channel);
conf->lock_sliders = 1; conf->lock_sliders = 1;
conf->show_locked = 0; conf->show_locked = 0;
@ -77,7 +77,7 @@ _mixer_gadget_configuration_new(E_Mixer_Module_Config *mod_conf, const char *id)
return NULL; return NULL;
} }
conf->id = evas_stringshare_add(id); conf->id = eina_stringshare_add(id);
mod_conf->gadgets = evas_hash_direct_add(mod_conf->gadgets, conf->id, conf); mod_conf->gadgets = evas_hash_direct_add(mod_conf->gadgets, conf->id, conf);
return conf; return conf;
@ -90,11 +90,11 @@ _mixer_gadget_configuration_free_int(E_Mixer_Gadget_Config *conf)
e_object_del(E_OBJECT(conf->dialog)); e_object_del(E_OBJECT(conf->dialog));
if (conf->card) if (conf->card)
evas_stringshare_del(conf->card); eina_stringshare_del(conf->card);
if (conf->channel_name) if (conf->channel_name)
evas_stringshare_del(conf->channel_name); eina_stringshare_del(conf->channel_name);
evas_stringshare_del(conf->id); eina_stringshare_del(conf->id);
free(conf); free(conf);
} }
@ -785,7 +785,7 @@ _mixer_sys_setup_default_card(E_Mixer_Instance *inst)
conf = inst->conf; conf = inst->conf;
if (conf->card) if (conf->card)
evas_stringshare_del(conf->card); eina_stringshare_del(conf->card);
card = e_mixer_system_get_default_card(); card = e_mixer_system_get_default_card();
if (!card) if (!card)
@ -795,7 +795,7 @@ _mixer_sys_setup_default_card(E_Mixer_Instance *inst)
if (!inst->sys) if (!inst->sys)
goto system_error; goto system_error;
conf->card = evas_stringshare_add(card); conf->card = eina_stringshare_add(card);
free(card); free(card);
return 1; return 1;
@ -815,7 +815,7 @@ _mixer_sys_setup_default_channel(E_Mixer_Instance *inst)
conf = inst->conf; conf = inst->conf;
if (conf->channel_name) if (conf->channel_name)
evas_stringshare_del(conf->channel_name); eina_stringshare_del(conf->channel_name);
channel_name = e_mixer_system_get_default_channel_name(inst->sys); channel_name = e_mixer_system_get_default_channel_name(inst->sys);
if (!channel_name) if (!channel_name)
@ -825,7 +825,7 @@ _mixer_sys_setup_default_channel(E_Mixer_Instance *inst)
if (!inst->channel) if (!inst->channel)
goto system_error; goto system_error;
conf->channel_name = evas_stringshare_add(channel_name); conf->channel_name = eina_stringshare_add(channel_name);
free(channel_name); free(channel_name);
return 1; return 1;
@ -904,7 +904,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
if (!ctxt->conf->default_gc_id) if (!ctxt->conf->default_gc_id)
{ {
ctxt->conf->default_gc_id = evas_stringshare_add(id); ctxt->conf->default_gc_id = eina_stringshare_add(id);
ctxt->default_instance = inst; ctxt->default_instance = inst;
} }
else if ((!ctxt->default_instance) || else if ((!ctxt->default_instance) ||

4
src/modules/temperature/e_mod_config.c
View File

@ -444,9 +444,9 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
cfdata->inst->low = cfdata->low_temp; cfdata->inst->low = cfdata->low_temp;
cfdata->inst->high = cfdata->high_temp; cfdata->inst->high = cfdata->high_temp;
if (cfdata->inst->sensor_name) if (cfdata->inst->sensor_name)
evas_stringshare_del(cfdata->inst->sensor_name); eina_stringshare_del(cfdata->inst->sensor_name);
cfdata->inst->sensor_name = cfdata->inst->sensor_name =
evas_stringshare_add(ecore_list_index_goto(cfdata->sensors, cfdata->sensor)); eina_stringshare_add(ecore_list_index_goto(cfdata->sensors, cfdata->sensor));
temperature_face_update_config(cfdata->inst); temperature_face_update_config(cfdata->inst);
e_config_save_queue(); e_config_save_queue();

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

@ -66,7 +66,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
if (!inst) if (!inst)
{ {
inst = E_NEW(Config_Face, 1); inst = E_NEW(Config_Face, 1);
inst->id = evas_stringshare_add(id); inst->id = eina_stringshare_add(id);
inst->poll_interval = 128; inst->poll_interval = 128;
inst->low = 30; inst->low = 30;
inst->high = 80; inst->high = 80;
@ -75,7 +75,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
inst->units = CELCIUS; inst->units = CELCIUS;
temperature_config->faces = evas_hash_direct_add(temperature_config->faces, inst->id, inst); temperature_config->faces = evas_hash_direct_add(temperature_config->faces, inst->id, inst);
} }
if (!inst->id) evas_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);
E_CONFIG_LIMIT(inst->low, 0, 100); E_CONFIG_LIMIT(inst->low, 0, 100);
E_CONFIG_LIMIT(inst->high, 0, 220); E_CONFIG_LIMIT(inst->high, 0, 220);
@ -177,7 +177,7 @@ _gc_id_new(void)
snprintf(id, sizeof(id), "%s.%d", _gadcon_class.name, ++uuid); snprintf(id, sizeof(id), "%s.%d", _gadcon_class.name, ++uuid);
inst = E_NEW(Config_Face, 1); inst = E_NEW(Config_Face, 1);
inst->id = evas_stringshare_add(id); inst->id = eina_stringshare_add(id);
inst->poll_interval = 128; inst->poll_interval = 128;
inst->low = 30; inst->low = 30;
inst->high = 80; inst->high = 80;
@ -197,7 +197,7 @@ _gc_id_del(const char *id)
if (inst) if (inst)
{ {
temperature_config->faces = evas_hash_del(temperature_config->faces, id, inst); temperature_config->faces = evas_hash_del(temperature_config->faces, id, inst);
if (inst->sensor_name) evas_stringshare_del(inst->sensor_name); if (inst->sensor_name) eina_stringshare_del(inst->sensor_name);
free(inst); free(inst);
} }
} }
@ -358,8 +358,8 @@ _temperature_face_shutdown(const Evas_Hash *hash __UNUSED__, const char *key __U
inst = hdata; inst = hdata;
if (inst->sensor_name) evas_stringshare_del(inst->sensor_name); if (inst->sensor_name) eina_stringshare_del(inst->sensor_name);
if (inst->id) evas_stringshare_del(inst->id); if (inst->id) eina_stringshare_del(inst->id);
free(inst); free(inst);
return 1; return 1;
} }