Switch to eina_stringshare.

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



SVN revision: 36679
devs/princeamd/enlightenment-0.17-elive
Cedric BAIL 14 years ago
parent 9e02df4fef
commit 3d6749983b
  1. 1
      src/bin/e.h
  2. 46
      src/bin/e_actions.c
  3. 8
      src/bin/e_bg.c
  4. 44
      src/bin/e_bindings.c
  5. 20
      src/bin/e_border.c
  6. 4
      src/bin/e_color_class.c
  7. 166
      src/bin/e_config.c
  8. 4
      src/bin/e_config_data.c
  9. 16
      src/bin/e_config_dialog.c
  10. 32
      src/bin/e_configure.c
  11. 4
      src/bin/e_container.c
  12. 14
      src/bin/e_desk.c
  13. 4
      src/bin/e_dialog.c
  14. 4
      src/bin/e_eap_editor.c
  15. 4
      src/bin/e_exec.c
  16. 28
      src/bin/e_exehist.c
  17. 6
      src/bin/e_filereg.c
  18. 210
      src/bin/e_fm.c
  19. 24
      src/bin/e_fm_custom.c
  20. 8
      src/bin/e_fm_hal.c
  21. 49
      src/bin/e_fm_main.c
  22. 12
      src/bin/e_fm_mime.c
  23. 44
      src/bin/e_fm_op.c
  24. 16
      src/bin/e_fm_prop.c
  25. 40
      src/bin/e_font.c
  26. 44
      src/bin/e_gadcon.c
  27. 26
      src/bin/e_init.c
  28. 34
      src/bin/e_int_config_modules.c
  29. 4
      src/bin/e_int_menus.c
  30. 26
      src/bin/e_int_shelf_config.c
  31. 24
      src/bin/e_intl.c
  32. 12
      src/bin/e_intl_data.c
  33. 110
      src/bin/e_ipc_handlers.h
  34. 4
      src/bin/e_main.c
  35. 40
      src/bin/e_menu.c
  36. 22
      src/bin/e_module.c
  37. 4
      src/bin/e_obj_dialog.c
  38. 4
      src/bin/e_order.c
  39. 40
      src/bin/e_path.c
  40. 18
      src/bin/e_pointer.c
  41. 38
      src/bin/e_remember.c
  42. 32
      src/bin/e_shelf.c
  43. 8
      src/bin/e_slidecore.c
  44. 6
      src/bin/e_slider.c
  45. 4
      src/bin/e_slidesel.c
  46. 38
      src/bin/e_theme.c
  47. 12
      src/bin/e_thumb.c
  48. 4
      src/bin/e_toolbar.c
  49. 8
      src/bin/e_win.c
  50. 8
      src/bin/e_zone.c
  51. 16
      src/modules/conf/e_conf.c
  52. 56
      src/modules/conf_applications/e_int_config_apps.c
  53. 8
      src/modules/conf_borders/e_int_config_borders.c
  54. 10
      src/modules/conf_colors/e_int_config_color_classes.c
  55. 8
      src/modules/conf_desklock/e_int_config_desklock.c
  56. 4
      src/modules/conf_exebuf/e_int_config_exebuf.c
  57. 70
      src/modules/conf_fonts/e_int_config_fonts.c
  58. 2
      src/modules/conf_icon_theme/e_int_config_icon_themes.c
  59. 18
      src/modules/conf_imc/e_int_config_imc.c
  60. 42
      src/modules/conf_intl/e_int_config_intl.c
  61. 64
      src/modules/conf_keybindings/e_int_config_keybindings.c
  62. 24
      src/modules/conf_mime/e_int_config_mime.c
  63. 14
      src/modules/conf_mime/e_int_config_mime_edit.c
  64. 74
      src/modules/conf_mousebindings/e_int_config_mousebindings.c
  65. 6
      src/modules/conf_paths/e_int_config_paths.c
  66. 4
      src/modules/conf_shelves/e_int_config_shelf.c
  67. 4
      src/modules/conf_startup/e_int_config_startup.c
  68. 8
      src/modules/conf_theme/e_int_config_theme.c
  69. 12
      src/modules/conf_transitions/e_int_config_transitions.c
  70. 8
      src/modules/conf_wallpaper/e_int_config_wallpaper.c
  71. 8
      src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
  72. 130
      src/modules/connman/e_iface.c
  73. 1
      src/modules/connman/e_iface.h
  74. 16
      src/modules/connman/e_mod_main.c
  75. 10
      src/modules/cpufreq/e_mod_main.c
  76. 6
      src/modules/exebuf/e_exebuf.c
  77. 33
      src/modules/fileman/e_fwin.c
  78. 11
      src/modules/fileman/e_mod_main.c
  79. 4
      src/modules/gadman/e_mod_config.c
  80. 30
      src/modules/gadman/e_mod_gadman.c
  81. 2
      src/modules/gadman/e_mod_main.c
  82. 4
      src/modules/ibar/e_mod_config.c
  83. 14
      src/modules/ibar/e_mod_main.c
  84. 8
      src/modules/ibox/e_mod_main.c
  85. 4
      src/modules/layout/e_mod_main.c
  86. 22
      src/modules/mixer/conf_gadget.c
  87. 4
      src/modules/mixer/conf_module.c
  88. 22
      src/modules/mixer/e_mod_main.c
  89. 4
      src/modules/temperature/e_mod_config.c
  90. 12
      src/modules/temperature/e_mod_main.c

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

@ -2049,12 +2049,12 @@ static void
_delayed_action_free(Delayed_Action *da)
{
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->def.action) evas_stringshare_del(da->def.action);
if (da->def.params) evas_stringshare_del(da->def.params);
if (da->delayed.action) evas_stringshare_del(da->delayed.action);
if (da->delayed.params) evas_stringshare_del(da->delayed.params);
if (da->def.action) eina_stringshare_del(da->def.action);
if (da->def.params) eina_stringshare_del(da->def.params);
if (da->delayed.action) eina_stringshare_del(da->delayed.action);
if (da->delayed.params) eina_stringshare_del(da->delayed.params);
free(da);
}
@ -2097,7 +2097,7 @@ _delayed_action_list_parse_action(const char *str, double *delay, const char **a
buf[0] = 0;
sscanf(str, "%10s %1000s", fbuf, buf);
*action = evas_stringshare_add(buf);
*action = eina_stringshare_add(buf);
*delay = atof(fbuf);
p = strchr(str, ' ');
if (p)
@ -2107,7 +2107,7 @@ _delayed_action_list_parse_action(const char *str, double *delay, const char **a
if (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);
}
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);
_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);
if (!actg) return;
actg->act_grp = evas_stringshare_add(act_grp);
actg->act_grp = eina_stringshare_add(act_grp);
actg->acts = NULL;
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);
if (!actd) return;
actd->act_name = evas_stringshare_add(act_name);
actd->act_cmd = act_cmd == NULL ? NULL : evas_stringshare_add(act_cmd);
actd->act_params = act_params == NULL ? NULL : evas_stringshare_add(act_params);
actd->param_example = param_example == NULL ? NULL : evas_stringshare_add(param_example);
actd->act_name = eina_stringshare_add(act_name);
actd->act_cmd = act_cmd == NULL ? NULL : eina_stringshare_add(act_cmd);
actd->act_params = act_params == NULL ? NULL : eina_stringshare_add(act_params);
actd->param_example = param_example == NULL ? NULL : eina_stringshare_add(param_example);
actd->editable = editable;
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);
if (actd->act_name) evas_stringshare_del(actd->act_name);
if (actd->act_cmd) evas_stringshare_del(actd->act_cmd);
if (actd->act_params) evas_stringshare_del(actd->act_params);
if (actd->param_example) evas_stringshare_del(actd->param_example);
if (actd->act_name) eina_stringshare_del(actd->act_name);
if (actd->act_cmd) eina_stringshare_del(actd->act_cmd);
if (actd->act_params) eina_stringshare_del(actd->act_params);
if (actd->param_example) eina_stringshare_del(actd->param_example);
E_FREE(actd);
if (!evas_list_count(actg->acts))
{
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);
}
break;
@ -2818,16 +2818,16 @@ e_action_predef_name_all_del(void)
{
actd = actg->acts->data;
if (actd->act_name) evas_stringshare_del(actd->act_name);
if (actd->act_cmd) evas_stringshare_del(actd->act_cmd);
if (actd->act_params) evas_stringshare_del(actd->act_params);
if (actd->param_example) evas_stringshare_del(actd->param_example);
if (actd->act_name) eina_stringshare_del(actd->act_name);
if (actd->act_cmd) eina_stringshare_del(actd->act_cmd);
if (actd->act_params) eina_stringshare_del(actd->act_params);
if (actd->param_example) eina_stringshare_del(actd->param_example);
E_FREE(actd);
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);
action_groups = evas_list_remove_list(action_groups, action_groups);

@ -255,13 +255,13 @@ e_bg_default_set(char *file)
if (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)
{
e_filereg_register(file);
e_config->desktop_default_background = evas_stringshare_add(file);
e_config->desktop_default_background = eina_stringshare_add(file);
}
else
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->desk_x = desk_x;
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_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_filereg_deregister(cfbg->file);
if (cfbg->file) evas_stringshare_del(cfbg->file);
if (cfbg->file) eina_stringshare_del(cfbg->file);
free(cfbg);
break;
}

@ -126,8 +126,8 @@ e_bindings_mouse_add(E_Binding_Context ctxt, int button, E_Binding_Modifier mod,
bind->button = button;
bind->mod = mod;
bind->any_mod = any_mod;
if (action) bind->action = evas_stringshare_add(action);
if (params) bind->params = evas_stringshare_add(params);
if (action) bind->action = eina_stringshare_add(action);
if (params) bind->params = eina_stringshare_add(params);
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->ctxt = ctxt;
bind->key = evas_stringshare_add(key);
bind->key = eina_stringshare_add(key);
bind->mod = mod;
bind->any_mod = any_mod;
if (action) bind->action = evas_stringshare_add(action);
if (params) bind->params = evas_stringshare_add(params);
if (action) bind->action = eina_stringshare_add(action);
if (params) bind->params = eina_stringshare_add(params);
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->ctxt = ctxt;
if (sig) bind->sig = evas_stringshare_add(sig);
if (src) bind->src = evas_stringshare_add(src);
if (sig) bind->sig = eina_stringshare_add(sig);
if (src) bind->src = eina_stringshare_add(src);
bind->mod = mod;
bind->any_mod = any_mod;
if (action) bind->action = evas_stringshare_add(action);
if (params) bind->params = evas_stringshare_add(params);
if (action) bind->action = eina_stringshare_add(action);
if (params) bind->params = eina_stringshare_add(params);
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->mod = mod;
bind->any_mod = any_mod;
if (action) bind->action = evas_stringshare_add(action);
if (params) bind->params = evas_stringshare_add(params);
if (action) bind->action = eina_stringshare_add(action);
if (params) bind->params = eina_stringshare_add(params);
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
_e_bindings_mouse_free(E_Binding_Mouse *bind)
{
if (bind->action) evas_stringshare_del(bind->action);
if (bind->params) evas_stringshare_del(bind->params);
if (bind->action) eina_stringshare_del(bind->action);
if (bind->params) eina_stringshare_del(bind->params);
free(bind);
}
static void
_e_bindings_key_free(E_Binding_Key *bind)
{
if (bind->key) evas_stringshare_del(bind->key);
if (bind->action) evas_stringshare_del(bind->action);
if (bind->params) evas_stringshare_del(bind->params);
if (bind->key) eina_stringshare_del(bind->key);
if (bind->action) eina_stringshare_del(bind->action);
if (bind->params) eina_stringshare_del(bind->params);
free(bind);
}
static void
_e_bindings_signal_free(E_Binding_Signal *bind)
{
if (bind->sig) evas_stringshare_del(bind->sig);
if (bind->src) evas_stringshare_del(bind->src);
if (bind->action) evas_stringshare_del(bind->action);
if (bind->params) evas_stringshare_del(bind->params);
if (bind->sig) eina_stringshare_del(bind->sig);
if (bind->src) eina_stringshare_del(bind->src);
if (bind->action) eina_stringshare_del(bind->action);
if (bind->params) eina_stringshare_del(bind->params);
free(bind);
}
static void
_e_bindings_wheel_free(E_Binding_Wheel *bind)
{
if (bind->action) evas_stringshare_del(bind->action);
if (bind->params) evas_stringshare_del(bind->params);
if (bind->action) eina_stringshare_del(bind->action);
if (bind->params) eina_stringshare_del(bind->params);
free(bind);
}

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

@ -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);
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->r2 = cc->g2 = cc->b2 = cc->a2 = 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);
edje_color_class_del(cc->name);
evas_stringshare_del(cc->name);
eina_stringshare_del(cc->name);
E_FREE(cc);
e_config_save_queue();

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

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

@ -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->view = view;
cfd->con = con;
cfd->title = evas_stringshare_add(title);
cfd->name = evas_stringshare_add(name);
cfd->class = evas_stringshare_add(class);
cfd->title = eina_stringshare_add(title);
cfd->name = eina_stringshare_add(name);
cfd->class = eina_stringshare_add(class);
if (icon)
{
cfd->icon = evas_stringshare_add(icon);
cfd->icon = eina_stringshare_add(icon);
cfd->icon_size = icon_size;
}
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);
if (cfd->auto_apply_timer) _e_config_dialog_cb_auto_apply_timer(cfd);
if (cfd->title) evas_stringshare_del(cfd->title);
if (cfd->name) evas_stringshare_del(cfd->name);
if (cfd->class) evas_stringshare_del(cfd->class);
if (cfd->icon) evas_stringshare_del(cfd->icon);
if (cfd->title) eina_stringshare_del(cfd->title);
if (cfd->name) eina_stringshare_del(cfd->name);
if (cfd->class) eina_stringshare_del(cfd->class);
if (cfd->icon) eina_stringshare_del(cfd->icon);
if (cfd->cfdata)
{
cfd->view->free_cfdata(cfd, cfd->cfdata);

@ -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);
if (!eci) goto done;
eci->item = evas_stringshare_add(item);
eci->item = eina_stringshare_add(item);
eci->pri = pri;
eci->label = evas_stringshare_add(label);
if (icon_file) eci->icon_file = evas_stringshare_add(icon_file);
if (icon) eci->icon = evas_stringshare_add(icon);
eci->label = eina_stringshare_add(label);
if (icon_file) eci->icon_file = eina_stringshare_add(icon_file);
if (icon) eci->icon = eina_stringshare_add(icon);
eci->func = func;
eci->generic_func = generic_func;
eci->desktop = desktop;
@ -262,10 +262,10 @@ e_configure_registry_item_del(const char *path)
if (!strcmp(item, eci->item))
{
ecat->items = evas_list_remove_list(ecat->items, ll);
evas_stringshare_del(eci->item);
evas_stringshare_del(eci->label);
evas_stringshare_del(eci->icon);
if (eci->icon_file) evas_stringshare_del(eci->icon_file);
eina_stringshare_del(eci->item);
eina_stringshare_del(eci->label);
eina_stringshare_del(eci->icon);
if (eci->icon_file) eina_stringshare_del(eci->icon_file);
if (eci->desktop) efreet_desktop_free(eci->desktop);
free(eci);
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);
if (!ecat) return;
ecat->cat = evas_stringshare_add(path);
ecat->cat = eina_stringshare_add(path);
ecat->pri = pri;
ecat->label = evas_stringshare_add(label);
if (icon_file) ecat->icon_file = evas_stringshare_add(icon_file);
if (icon) ecat->icon = evas_stringshare_add(icon);
ecat->label = eina_stringshare_add(label);
if (icon_file) ecat->icon_file = eina_stringshare_add(icon_file);
if (icon) ecat->icon = eina_stringshare_add(icon);
for (l = e_configure_registry; l; l = l->next)
{
E_Configure_Cat *ecat2;
@ -332,10 +332,10 @@ e_configure_registry_category_del(const char *path)
{
if (ecat->items) goto done;
e_configure_registry = evas_list_remove_list(e_configure_registry, l);
evas_stringshare_del(ecat->cat);
evas_stringshare_del(ecat->label);
if (ecat->icon) evas_stringshare_del(ecat->icon);
if (ecat->icon_file) evas_stringshare_del(ecat->icon_file);
eina_stringshare_del(ecat->cat);
eina_stringshare_del(ecat->label);
if (ecat->icon) eina_stringshare_del(ecat->icon);
if (ecat->icon_file) eina_stringshare_del(ecat->icon_file);
free(ecat);
goto done;
}

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

@ -72,7 +72,7 @@ e_desk_new(E_Zone *zone, int x, int y)
(zone->num != cfname->zone)) continue;
if ((cfname->desk_x != desk->x) || (cfname->desk_y != desk->y))
continue;
desk->name = evas_stringshare_add(cfname->name);
desk->name = eina_stringshare_add(cfname->name);
ok = 1;
break;
}
@ -80,7 +80,7 @@ e_desk_new(E_Zone *zone, int x, int y)
if (!ok)
{
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;
@ -93,8 +93,8 @@ e_desk_name_set(E_Desk *desk, const char *name)
E_OBJECT_CHECK(desk);
E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE);
if (desk->name) evas_stringshare_del(desk->name);
desk->name = evas_stringshare_add(name);
if (desk->name) eina_stringshare_del(desk->name);
desk->name = eina_stringshare_add(name);
ev = E_NEW(E_Event_Desk_Name_Change, 1);
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->desk_x = desk_x;
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);
}
@ -133,7 +133,7 @@ e_desk_name_del(int container, int zone, int desk_x, int desk_y)
{
e_config->desktop_names =
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);
break;
}
@ -507,7 +507,7 @@ e_desk_prev(E_Zone *zone)
static void
_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);
free(desk);
}

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

@ -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_edit_select_cb(void *data, Evas_Object *obj);
#define IFADD(src, dst) if (src) dst = evas_stringshare_add(src); else dst = NULL
#define IFDEL(src) if (src) evas_stringshare_del(src); src = NULL;
#define IFADD(src, dst) if (src) dst = eina_stringshare_add(src); else dst = 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 IFFREE(src) if (src) free(src); src = NULL;

@ -110,7 +110,7 @@ e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec,
e_object_ref(E_OBJECT(launch->zone));
}
if (launch_method)