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

Move to eina_stringshare 

Put some _replace instead of _del/_add,
so look there if something unespectedly breaks.


SVN revision: 40342
This commit is contained in:
Iván Briano 2009-04-24 02:38:55 +00:00
parent 0b4c458687
commit b8d666c195
14 changed files with 113 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/illume/e_appwin.c
View File

@ -68,7 +68,7 @@ e_appwin_new(E_Zone *zone, const char *themedir)
if (!esw) return NULL;
esw->zone = zone;
if (themedir) esw->themedir = evas_stringshare_add(themedir);
if (themedir) esw->themedir = eina_stringshare_add(themedir);
esw->clickwin = ecore_x_window_input_new(zone->container->win,
zone->x, zone->y, zone->w, zone->h);
@ -229,7 +229,7 @@ _e_appwin_free(E_Appwin *esw)
EINA_LIST_FREE(esw->handlers, handle)
ecore_event_handler_del(handle);
if (esw->animator) ecore_animator_del(esw->animator);
if (esw->themedir) evas_stringshare_del(esw->themedir);
if (esw->themedir) eina_stringshare_del(esw->themedir);
ecore_x_window_free(esw->clickwin);
e_object_del(E_OBJECT(esw->popup));
free(esw);

12
src/modules/illume/e_busycover.c
View File

@ -56,7 +56,7 @@ e_busycover_new(E_Zone *zone, const char *themedir)
if (!esw) return NULL;
esw->zone = zone;
if (themedir) esw->themedir = evas_stringshare_add(themedir);
if (themedir) esw->themedir = eina_stringshare_add(themedir);
busycovers = eina_list_append(busycovers, esw);
@ -78,8 +78,8 @@ e_busycover_push(E_Busycover *esw, const char *message, const char *icon)
if (!esw->base_obj) _e_busycover_add_object(esw);
h = calloc(1, sizeof(E_Busycover_Handle));
h->busycover = esw;
if (message) h->message = evas_stringshare_add(message);
if (icon) h->icon = evas_stringshare_add(icon);
if (message) h->message = eina_stringshare_add(message);
if (icon) h->icon = eina_stringshare_add(icon);
esw->handles = eina_list_prepend(esw->handles, h);
edje_object_part_text_set(esw->base_obj, "e.text.label", h->message);
/* FIXME: handle icon... */
@ -94,8 +94,8 @@ e_busycover_pop(E_Busycover *esw, E_Busycover_Handle *handle)
E_OBJECT_TYPE_CHECK(esw, E_BUSYCOVER_TYPE);
if (!eina_list_data_find(esw->handles, handle)) return;
esw->handles = eina_list_remove(esw->handles, handle);
if (handle->message) evas_stringshare_del(handle->message);
if (handle->icon) evas_stringshare_del(handle->icon);
if (handle->message) eina_stringshare_del(handle->message);
if (handle->icon) eina_stringshare_del(handle->icon);
free(handle);
if (esw->handles)
{
@ -121,7 +121,7 @@ _e_busycover_free(E_Busycover *esw)
busycovers = eina_list_remove(busycovers, esw);
EINA_LIST_FREE(esw->handlers, handle)
ecore_event_handler_del(handle);
if (esw->themedir) evas_stringshare_del(esw->themedir);
if (esw->themedir) eina_stringshare_del(esw->themedir);
free(esw);
}

12
src/modules/illume/e_busywin.c
View File

@ -42,7 +42,7 @@ e_busywin_new(E_Zone *zone, const char *themedir)
if (!esw) return NULL;
esw->zone = zone;
if (themedir) esw->themedir = evas_stringshare_add(themedir);
if (themedir) esw->themedir = eina_stringshare_add(themedir);
esw->clickwin = ecore_x_window_input_new(zone->container->win,
zone->x, zone->y, zone->w, zone->h);
@ -95,8 +95,8 @@ e_busywin_push(E_Busywin *esw, const char *message, const char *icon)
E_OBJECT_TYPE_CHECK_RETURN(esw, E_BUSYWIN_TYPE, NULL);
h = calloc(1, sizeof(E_Busywin_Handle));
h->busywin = esw;
if (message) h->message = evas_stringshare_add(message);
if (icon) h->icon = evas_stringshare_add(icon);
if (message) h->message = eina_stringshare_add(message);
if (icon) h->icon = eina_stringshare_add(icon);
esw->handles = eina_list_prepend(esw->handles, h);
edje_object_part_text_set(esw->base_obj, "e.text.label", h->message);
/* FIXME: handle icon... */
@ -111,8 +111,8 @@ e_busywin_pop(E_Busywin *esw, E_Busywin_Handle *handle)
E_OBJECT_TYPE_CHECK(esw, E_BUSYWIN_TYPE);
if (!eina_list_data_find(esw->handles, handle)) return;
esw->handles = eina_list_remove(esw->handles, handle);
if (handle->message) evas_stringshare_del(handle->message);
if (handle->icon) evas_stringshare_del(handle->icon);
if (handle->message) eina_stringshare_del(handle->message);
if (handle->icon) eina_stringshare_del(handle->icon);
free(handle);
if (esw->handles)
{
@ -139,7 +139,7 @@ _e_busywin_free(E_Busywin *esw)
esw->handlers = eina_list_remove_list(esw->handlers, esw->handlers);
}
if (esw->animator) ecore_animator_del(esw->animator);
if (esw->themedir) evas_stringshare_del(esw->themedir);
if (esw->themedir) eina_stringshare_del(esw->themedir);
ecore_x_window_free(esw->clickwin);
e_object_del(E_OBJECT(esw->popup));
free(esw);

20
src/modules/illume/e_cfg.c
View File

@ -104,7 +104,7 @@ e_cfg_init(E_Module *m)
}
if ((illume_cfg->config_version & 0xffff) < 2) // new in minor ver 2
{
illume_cfg->kbd.dict = evas_stringshare_add("English_(US).dic");
illume_cfg->kbd.dict = eina_stringshare_add("English_(US).dic");
}
if ((illume_cfg->config_version & 0xffff) < 3) // new in minor ver 3
{
@ -141,8 +141,8 @@ e_cfg_shutdown(void)
e_configure_registry_item_del("display/power");
e_configure_registry_item_del("display/launcher");
e_configure_registry_category_del("display");
if (illume_cfg->kbd.run_keyboard) evas_stringshare_del(illume_cfg->kbd.run_keyboard);
if (illume_cfg->kbd.dict) evas_stringshare_del(illume_cfg->kbd.dict);
if (illume_cfg->kbd.run_keyboard) eina_stringshare_del(illume_cfg->kbd.run_keyboard);
if (illume_cfg->kbd.dict) eina_stringshare_del(illume_cfg->kbd.dict);
free(illume_cfg);
E_CONFIG_DD_FREE(conf_edd);
illume_cfg = NULL;
@ -858,7 +858,7 @@ _e_cfg_gadgets_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
EINA_LIST_FREE(gadits, gi)
{
evas_stringshare_del(gi->name);
eina_stringshare_del(gi->name);
free(gi);
}
e_object_unref(E_OBJECT(local_slipshelf));
@ -897,7 +897,7 @@ _e_cfg_gadgets_ui(E_Config_Dialog *cfd, Evas *e, E_Config_Dialog_Data *cfdata)
gi = E_NEW(Gadit, 1);
gi->gc = local_slipshelf->gadcon;
gi->name = evas_stringshare_add(cc->name);
gi->name = eina_stringshare_add(cc->name);
gi->was_enabled = on;
gi->enabled = on;
gadits = eina_list_append(gadits, gi);
@ -928,7 +928,7 @@ _e_cfg_gadgets_ui(E_Config_Dialog *cfd, Evas *e, E_Config_Dialog_Data *cfdata)
gi = E_NEW(Gadit, 1);
gi->gc = local_slipshelf->gadcon_extra;
gi->name = evas_stringshare_add(cc->name);
gi->name = eina_stringshare_add(cc->name);
gi->was_enabled = on;
gi->enabled = on;
gadits = eina_list_append(gadits, gi);
@ -972,7 +972,7 @@ static int _e_cfg_keyboard_change_timeout(void *data)
illume_cfg->kbd.use_internal = 0;
if (illume_cfg->kbd.run_keyboard)
{
evas_stringshare_del(illume_cfg->kbd.run_keyboard);
eina_stringshare_del(illume_cfg->kbd.run_keyboard);
illume_cfg->kbd.run_keyboard = NULL;
}
if (external_keyboard == 0)
@ -1001,7 +1001,7 @@ static int _e_cfg_keyboard_change_timeout(void *data)
if (nn == external_keyboard)
{
if (dname)
illume_cfg->kbd.run_keyboard = evas_stringshare_add(dname);
illume_cfg->kbd.run_keyboard = eina_stringshare_add(dname);
break;
}
nn++;
@ -1940,7 +1940,7 @@ _dbcb_keyboard_set(E_DBus_Object *obj, DBusMessage *msg)
illume_cfg->kbd.use_internal = 0;
if (illume_cfg->kbd.run_keyboard)
{
evas_stringshare_del(illume_cfg->kbd.run_keyboard);
eina_stringshare_del(illume_cfg->kbd.run_keyboard);
illume_cfg->kbd.run_keyboard = NULL;
}
if (!strcmp(s, "none"))
@ -1948,7 +1948,7 @@ _dbcb_keyboard_set(E_DBus_Object *obj, DBusMessage *msg)
else if (!strcmp(s, "internal"))
illume_cfg->kbd.use_internal = 1;
else
illume_cfg->kbd.run_keyboard = evas_stringshare_add(s);
illume_cfg->kbd.run_keyboard = eina_stringshare_add(s);
e_mod_win_cfg_kbd_update();
e_config_save_queue();
return dbus_message_new_method_return(msg);

8
src/modules/illume/e_flaunch.c
View File

@ -44,7 +44,7 @@ static void
_e_flaunch_button_del(E_Flaunch_App *fla)
{
evas_object_del(fla->obj);
if (fla->desktop) evas_stringshare_del(fla->desktop);
if (fla->desktop) eina_stringshare_del(fla->desktop);
free(fla);
}
@ -71,7 +71,7 @@ _e_flaunch_app_add(E_Flaunch *fl, const char *deskfile)
desktop = efreet_util_desktop_file_id_find(deskfile);
if (desktop) label = desktop->name;
fla = _e_fluanch_button_add(fl, label, 1, _e_fluanch_cb_app_button, NULL);
if (deskfile) fla->desktop = evas_stringshare_add(deskfile);
if (deskfile) fla->desktop = eina_stringshare_add(deskfile);
fl->apps = eina_list_append(fl->apps, fla);
e_box_pack_end(fl->app_box_obj, fla->obj);
e_box_pack_options_set(fla->obj, 1, 1, 1, 1, 0.5, 0.5, 0, 0, 9999, 9999);
@ -153,7 +153,7 @@ _e_flaunch_free(E_Flaunch *fl)
if (fl->repopulate_timer) ecore_timer_del(fl->repopulate_timer);
_e_flaunch_apps_clear(fl);
_e_flaunch_button_del(fl->start_button);
evas_stringshare_del(fl->themedir);
eina_stringshare_del(fl->themedir);
evas_object_del(fl->app_box_obj);
evas_object_del(fl->box_obj);
EINA_LIST_FREE(fl->handlers, handle)
@ -233,7 +233,7 @@ e_flaunch_new(E_Zone *zone, const char *themedir)
if (!fl) return NULL;
fl->zone = zone;
fl->themedir = evas_stringshare_add(themedir);
fl->themedir = eina_stringshare_add(themedir);
// FIXME: height should become config
fl->height = 30 * e_scale;

20
src/modules/illume/e_kbd.c
View File

@ -465,15 +465,14 @@ _e_kbd_cb_border_hook_pre_post_fetch(void *data, E_Border *bd)
{
if (bd->bordername)
{
evas_stringshare_del(bd->bordername);
eina_stringshare_del(bd->bordername);
bd->bordername = NULL;
bd->client.border.changed = 1;
}
e_remember_unuse(bd->remember);
bd->remember = NULL;
}
if (bd->bordername) evas_stringshare_del(bd->bordername);
bd->bordername = evas_stringshare_add("borderless");
eina_stringshare_replace(&bd->bordername, "borderless");
bd->client.border.changed = 1;
return;
}
@ -485,15 +484,14 @@ _e_kbd_cb_border_hook_pre_post_fetch(void *data, E_Border *bd)
{
if (bd->bordername)
{
evas_stringshare_del(bd->bordername);
eina_stringshare_del(bd->bordername);
bd->bordername = NULL;
bd->client.border.changed = 1;
}
e_remember_unuse(bd->remember);
bd->remember = NULL;
}
if (bd->bordername) evas_stringshare_del(bd->bordername);
bd->bordername = evas_stringshare_add("borderless");
eina_stringshare_replace(&bd->bordername, "borderless");
bd->client.border.changed = 1;
return;
}
@ -673,7 +671,7 @@ _e_kbd_dbus_keyboard_add(const char *udi)
if (!strcmp(str, udi)) return;
_e_kbd_dbus_keyboards = eina_list_append
(_e_kbd_dbus_keyboards, evas_stringshare_add(udi));
(_e_kbd_dbus_keyboards, eina_stringshare_add(udi));
}
static void
@ -685,7 +683,7 @@ _e_kbd_dbus_keyboard_del(const char *udi)
EINA_LIST_FOREACH(_e_kbd_dbus_keyboards, l, str)
if (!strcmp(str, udi))
{
evas_stringshare_del(str);
eina_stringshare_del(str);
_e_kbd_dbus_keyboards = eina_list_remove_list(_e_kbd_dbus_keyboards, l);
return;
}
@ -827,7 +825,7 @@ _e_kbd_dbus_ignore_keyboards_file_load(const char *file)
while (isspace(*p)) p++;
if (*p)
_e_kbd_dbus_real_ignore = eina_list_append
(_e_kbd_dbus_real_ignore, evas_stringshare_add(p));
(_e_kbd_dbus_real_ignore, eina_stringshare_add(p));
}
fclose(f);
}
@ -886,9 +884,9 @@ _e_kbd_dbus_real_kbd_shutdown(void)
e_dbus_signal_handler_del(_e_kbd_dbus_conn, _e_kbd_dbus_handler_dev_chg);
}
EINA_LIST_FREE(_e_kbd_dbus_real_ignore, str)
evas_stringshare_del(str);
eina_stringshare_del(str);
EINA_LIST_FREE(_e_kbd_dbus_keyboards, str)
evas_stringshare_del(str);
eina_stringshare_del(str);
_e_kbd_dbus_have_real_keyboard = 0;
}

30
src/modules/illume/e_kbd_buf.c
View File

@ -31,9 +31,9 @@ _e_kbd_buf_layout_unref(E_Kbd_Buf_Layout *kbl)
E_Kbd_Buf_Key *ky;
ky = kbl->keys->data;
if (ky->key) evas_stringshare_del(ky->key);
if (ky->key_shift) evas_stringshare_del(ky->key_shift);
if (ky->key_capslock) evas_stringshare_del(ky->key_capslock);
if (ky->key) eina_stringshare_del(ky->key);
if (ky->key_shift) eina_stringshare_del(ky->key_shift);
if (ky->key_capslock) eina_stringshare_del(ky->key_capslock);
free(ky);
kbl->keys = eina_list_remove_list(kbl->keys, kbl->keys);
}
@ -46,7 +46,7 @@ _e_kbd_buf_string_matches_clear(E_Kbd_Buf *kb)
while (kb->string_matches)
{
if (kb->string_matches->data)
evas_stringshare_del(kb->string_matches->data);
eina_stringshare_del(kb->string_matches->data);
kb->string_matches = eina_list_remove_list(kb->string_matches, kb->string_matches);
}
}
@ -54,7 +54,7 @@ _e_kbd_buf_string_matches_clear(E_Kbd_Buf *kb)
static void
_e_kbd_buf_actual_string_clear(E_Kbd_Buf *kb)
{
if (kb->actual_string) evas_stringshare_del(kb->actual_string);
if (kb->actual_string) eina_stringshare_del(kb->actual_string);
kb->actual_string = NULL;
}
@ -174,7 +174,7 @@ _e_kbd_buf_actual_string_update(E_Kbd_Buf *kb)
}
if (actual)
{
kb->actual_string = evas_stringshare_add(actual);
kb->actual_string = eina_stringshare_add(actual);
if (actual) free(actual);
}
}
@ -214,7 +214,7 @@ _e_kbd_buf_matches_update(E_Kbd_Buf *kb)
if (!word) break;
if (!_e_kbd_buf_matches_find(kb->string_matches, word))
kb->string_matches = eina_list_append(kb->string_matches,
evas_stringshare_add(word));
eina_stringshare_add(word));
e_kbd_dict_matches_next(dicts[i]);
}
}
@ -253,7 +253,7 @@ e_kbd_buf_new(const char *sysdicts, const char *dict)
kb = E_NEW(E_Kbd_Buf, 1);
if (!kb) return NULL;
kb->sysdicts = evas_stringshare_add(sysdicts);
kb->sysdicts = eina_stringshare_add(sysdicts);
e_user_dir_concat_static(buf, "dicts");
if (!ecore_file_exists(buf)) ecore_file_mkpath(buf);
@ -296,7 +296,7 @@ e_kbd_buf_free(E_Kbd_Buf *kb)
e_kbd_buf_clear(kb);
e_kbd_buf_layout_clear(kb);
e_kbd_buf_lookup_cancel(kb);
evas_stringshare_del(kb->sysdicts);
eina_stringshare_del(kb->sysdicts);
if (kb->dict.sys) e_kbd_dict_free(kb->dict.sys);
if (kb->dict.personal) e_kbd_dict_free(kb->dict.personal);
if (kb->dict.data) e_kbd_dict_free(kb->dict.data);
@ -335,7 +335,7 @@ e_kbd_buf_clear(E_Kbd_Buf *kb)
E_Kbd_Buf_Keystroke *ks;
ks = kb->keystrokes->data;
if (ks->key) evas_stringshare_del(ks->key);
if (ks->key) eina_stringshare_del(ks->key);
_e_kbd_buf_layout_unref(ks->layout);
free(ks);
kb->keystrokes = eina_list_remove_list(kb->keystrokes, kb->keystrokes);
@ -384,9 +384,9 @@ e_kbd_buf_layout_key_add(E_Kbd_Buf *kb, const char *key, const char *key_shift,
if (!kb->layout) return;
ky = E_NEW(E_Kbd_Buf_Key, 1);
if (!ky) return;
if (key) ky->key = evas_stringshare_add(key);
if (key_shift) ky->key_shift = evas_stringshare_add(key_shift);
if (key_capslock) ky->key_capslock = evas_stringshare_add(key_capslock);
if (key) ky->key = eina_stringshare_add(key);
if (key_shift) ky->key_shift = eina_stringshare_add(key_shift);
if (key_capslock) ky->key_capslock = eina_stringshare_add(key_capslock);
ky->x = x;
ky->y = y;
ky->w = w;
@ -419,7 +419,7 @@ e_kbd_buf_pressed_key_add(E_Kbd_Buf *kb, const char *key, int shift, int capsloc
if (!kb->layout) return;
ks = E_NEW(E_Kbd_Buf_Keystroke, 1);
if (!ks) return;
ks->key = evas_stringshare_add(key);
ks->key = eina_stringshare_add(key);
if (shift) ks->shift = 1;
if (capslock) ks->capslock = 1;
ks->layout = kb->layout;
@ -516,7 +516,7 @@ e_kbd_buf_backspace(E_Kbd_Buf *kb)
E_Kbd_Buf_Keystroke *ks;
ks = l->data;
if (ks->key) evas_stringshare_del(ks->key);
if (ks->key) eina_stringshare_del(ks->key);
_e_kbd_buf_layout_unref(ks->layout);
free(ks);
kb->keystrokes = eina_list_remove_list(kb->keystrokes, l);

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

@ -303,7 +303,7 @@ e_kbd_dict_new(const char *file)
_e_kbd_normalise_init();
kd = E_NEW(E_Kbd_Dict, 1);
if (!kd) return NULL;
kd->file.file = evas_stringshare_add(file);
kd->file.file = eina_stringshare_add(file);
if (!kd->file.file)
{
free(kd);
@ -312,7 +312,7 @@ e_kbd_dict_new(const char *file)
kd->file.fd = -1;
if (!_e_kbd_dict_open(kd))
{
evas_stringshare_del(kd->file.file);
eina_stringshare_del(kd->file.file);
free(kd);
return NULL;
}
@ -394,7 +394,7 @@ e_kbd_dict_save(E_Kbd_Dict *kd)
{
fprintf(f, "%s %i\n", kw->word, kw->usage);
writeline = 1;
evas_stringshare_del(kw->word);
eina_stringshare_del(kw->word);
free(kw);
kd->changed.writes = eina_list_remove_list(kd->changed.writes, kd->changed.writes);
writeline = 1;
@ -406,7 +406,7 @@ e_kbd_dict_save(E_Kbd_Dict *kd)
writeline = 0;
else
writeline = 1;
evas_stringshare_del(kw->word);
eina_stringshare_del(kw->word);
free(kw);
kd->changed.writes = eina_list_remove_list(kd->changed.writes, kd->changed.writes);
break;
@ -433,7 +433,7 @@ e_kbd_dict_save(E_Kbd_Dict *kd)
kw = kd->changed.writes->data;
fprintf(f, "%s %i\n", kw->word, kw->usage);
evas_stringshare_del(kw->word);
eina_stringshare_del(kw->word);
free(kw);
kd->changed.writes = eina_list_remove_list(kd->changed.writes, kd->changed.writes);
}
@ -466,7 +466,7 @@ _e_kbd_dict_changed_write_add(E_Kbd_Dict *kd, const char *word, int usage)
E_Kbd_Dict_Word *kw;
kw = E_NEW(E_Kbd_Dict_Word, 1);
kw->word = evas_stringshare_add(word);
kw->word = eina_stringshare_add(word);
kw->usage = usage;
kd->changed.writes = eina_list_prepend(kd->changed.writes, kw);
if (eina_list_count(kd->changed.writes) > 64)
@ -641,7 +641,7 @@ e_kbd_dict_word_letter_clear(E_Kbd_Dict *kd)
E_Kbd_Dict_Word *kw;
kw = kd->matches.list->data;
evas_stringshare_del(kw->word);
eina_stringshare_del(kw->word);
free(kw);
kd->matches.list = eina_list_remove_list(kd->matches.list, kd->matches.list);
}
@ -660,7 +660,7 @@ e_kbd_dict_word_letter_add(E_Kbd_Dict *kd, const char *letter, int dist)
list = l->data;
kl = E_NEW(E_Kbd_Dict_Letter, 1);
if (!kl) return;
kl->letter = evas_stringshare_add(letter);
kl->letter = eina_stringshare_add(letter);
kl->dist = dist;
list = eina_list_append(list, kl);
l->data = list;
@ -687,7 +687,7 @@ e_kbd_dict_word_letter_delete(E_Kbd_Dict *kd)
E_Kbd_Dict_Letter *kl;
kl = list->data;
evas_stringshare_del(kl->letter);
eina_stringshare_del(kl->letter);
free(kl);
list = eina_list_remove_list(list, list);
}
@ -786,7 +786,7 @@ _e_kbd_dict_matches_lookup_iter(E_Kbd_Dict *kd, Eina_List *word,
w = w2;
b = b2;
}
kw->word = evas_stringshare_add(wd);
kw->word = eina_stringshare_add(wd);
// FIXME: magic combination of distance metric and
// frequency of useage. this is simple now, but could
// be tweaked
@ -834,7 +834,7 @@ e_kbd_dict_matches_lookup(E_Kbd_Dict *kd)
E_Kbd_Dict_Word *kw;
kw = kd->matches.list->data;
evas_stringshare_del(kw->word);
eina_stringshare_del(kw->word);
free(kw);
kd->matches.list = eina_list_remove_list(kd->matches.list, kd->matches.list);
}

67
src/modules/illume/e_kbd_int.c
View File

@ -258,7 +258,7 @@ _e_kbd_int_matches_add(E_Kbd_Int *ki, const char *str, int num)
o = _theme_obj_new(ki->win->evas, ki->themedir,
"e/modules/kbd/match/word");
km->ki = ki;
km->str = evas_stringshare_add(str);
km->str = eina_stringshare_add(str);
km->obj = o;
ki->matches = eina_list_append(ki->matches, km);
edje_object_part_text_set(o, "e.text.label", str);
@ -281,7 +281,7 @@ _e_kbd_int_matches_free(E_Kbd_Int *ki)
EINA_LIST_FREE(ki->matches, km)
{
if (km->str) evas_stringshare_del(km->str);
if (km->str) eina_stringshare_del(km->str);
evas_object_del(km->obj);
free(km);
}
@ -862,7 +862,7 @@ _e_kbd_int_layout_free(E_Kbd_Int *ki)
E_Kbd_Int_Key *ky;
if (ki->layout.directory) free(ki->layout.directory);
if (ki->layout.file) evas_stringshare_del(ki->layout.file);
if (ki->layout.file) eina_stringshare_del(ki->layout.file);
ki->layout.directory = NULL;
ki->layout.file = NULL;
EINA_LIST_FREE(ki->layout.keys, ky)
@ -871,9 +871,9 @@ _e_kbd_int_layout_free(E_Kbd_Int *ki)
EINA_LIST_FREE(ky->states, st)
{
if (st->label) evas_stringshare_del(st->label);
if (st->icon) evas_stringshare_del(st->icon);
if (st->out) evas_stringshare_del(st->out);
if (st->label) eina_stringshare_del(st->label);
if (st->icon) eina_stringshare_del(st->icon);
if (st->out) eina_stringshare_del(st->out);
free(st);
}
if (ky->obj) evas_object_del(ky->obj);
@ -896,7 +896,7 @@ _e_kbd_int_layout_parse(E_Kbd_Int *ki, const char *layout)
f = fopen(layout, "r");
if (!f) return;
ki->layout.directory = ecore_file_dir_get(layout);
ki->layout.file = evas_stringshare_add(layout);
ki->layout.file = eina_stringshare_add(layout);
while (fgets(buf, sizeof(buf), f))
{
int len;
@ -954,13 +954,13 @@ _e_kbd_int_layout_parse(E_Kbd_Int *ki, const char *layout)
if (!strcmp(str, "capslock")) st->state = CAPSLOCK;
p = strrchr(label, '.');
if ((p) && (!strcmp(p, ".png")))
st->icon = evas_stringshare_add(label);
st->icon = eina_stringshare_add(label);
else if ((p) && (!strcmp(p, ".edj")))
st->icon = evas_stringshare_add(label);
st->icon = eina_stringshare_add(label);
else
st->label = evas_stringshare_add(label);
st->label = eina_stringshare_add(label);
if (sscanf(buf, "%*s %*s %4000s", str) != 1) continue;
st->out = evas_stringshare_add(str);
st->out = eina_stringshare_add(str);
}
if (!strcmp(str, "is_shift")) ky->is_shift = 1;
if (!strcmp(str, "is_ctrl")) ky->is_ctrl = 1;
@ -1053,10 +1053,10 @@ _e_kbd_int_layouts_free(E_Kbd_Int *ki)
EINA_LIST_FREE(ki->layouts, kil)
{
evas_stringshare_del(kil->path);
evas_stringshare_del(kil->dir);
evas_stringshare_del(kil->icon);
evas_stringshare_del(kil->name);
eina_stringshare_del(kil->path);
eina_stringshare_del(kil->dir);
eina_stringshare_del(kil->icon);
eina_stringshare_del(kil->name);
free(kil);
}
}
@ -1088,7 +1088,7 @@ _e_kbd_int_layouts_list_update(E_Kbd_Int *ki)
{
if (ecore_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
continue;
kbs = eina_list_append(kbs, evas_stringshare_add(buf));
kbs = eina_list_append(kbs, eina_stringshare_add(buf));
}
free(file);
}
@ -1119,7 +1119,7 @@ _e_kbd_int_layouts_list_update(E_Kbd_Int *ki)
{
if (ecore_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
continue;
kbs = eina_list_append(kbs, evas_stringshare_add(buf));
kbs = eina_list_append(kbs, eina_stringshare_add(buf));
}
}
free(file);
@ -1144,13 +1144,13 @@ _e_kbd_int_layouts_list_update(E_Kbd_Int *ki)
{
p = strrchr(s, '.');
if (p) *p = 0;
kil->name = evas_stringshare_add(s);
kil->name = eina_stringshare_add(s);
free(s);
}
s = ecore_file_dir_get(kil->path);
if (s)
{
kil->dir = evas_stringshare_add(s);
kil->dir = eina_stringshare_add(s);
free(s);
}
f = fopen(kil->path, "r");
@ -1198,7 +1198,7 @@ _e_kbd_int_layouts_list_update(E_Kbd_Int *ki)
{
sscanf(buf, "%*s %4000s\n", str);
snprintf(buf, sizeof(buf), "%s/%s", kil->dir, str);
kil->icon = evas_stringshare_add(buf);
kil->icon = eina_stringshare_add(buf);
continue;
}
}
@ -1330,7 +1330,7 @@ _e_kbd_int_dictlist_down(E_Kbd_Int *ki)
e_object_del(E_OBJECT(ki->dictlist.popup));
ki->dictlist.popup = NULL;
EINA_LIST_FREE(ki->dictlist.matches, str)
evas_stringshare_del(str);
eina_stringshare_del(str);
}
static void
@ -1350,8 +1350,7 @@ _e_kbd_int_cb_dictlist_item_sel(void *data)
_e_kbd_int_layout_state_update(ki);
}
if (illume_cfg->kbd.dict) evas_stringshare_del(illume_cfg->kbd.dict);
illume_cfg->kbd.dict = evas_stringshare_add(str);
eina_stringshare_replace(&illume_cfg->kbd.dict, str);
e_kbd_buf_dict_set(ki->kbuf, illume_cfg->kbd.dict);
@ -1410,7 +1409,7 @@ _e_kbd_int_dictlist_up(E_Kbd_Int *ki)
}
pp = strrchr(p, '.');
*pp = 0;
str = evas_stringshare_add(file);
str = eina_stringshare_add(file);
ki->dictlist.matches = eina_list_append(ki->dictlist.matches, str);
e_widget_ilist_append(o, NULL, p, _e_kbd_int_cb_dictlist_item_sel,
ki, NULL);
@ -1445,7 +1444,7 @@ _e_kbd_int_dictlist_up(E_Kbd_Int *ki)
}
pp = strrchr(p, '.');
*pp = 0;
str = evas_stringshare_add(file);
str = eina_stringshare_add(file);
ki->dictlist.matches = eina_list_append(ki->dictlist.matches, str);
e_widget_ilist_append(o, NULL, p, _e_kbd_int_cb_dictlist_item_sel,
ki, NULL);
@ -1493,7 +1492,7 @@ _e_kbd_int_matchlist_down(E_Kbd_Int *ki)
e_object_del(E_OBJECT(ki->matchlist.popup));
ki->matchlist.popup = NULL;
EINA_LIST_FREE(ki->matchlist.matches, str)
evas_stringshare_del(str);
eina_stringshare_del(str);
}
static void
@ -1548,14 +1547,14 @@ _e_kbd_int_matchlist_up(E_Kbd_Int *ki)
str = e_kbd_buf_actual_string_get(ki->kbuf);
if (str)
{
str = evas_stringshare_add(str);
str = eina_stringshare_add(str);
ki->matchlist.matches = eina_list_append(ki->matchlist.matches, str);
e_widget_ilist_append(o, NULL, str, _e_kbd_int_cb_matchlist_item_sel,
ki, NULL);
}
}
str = l->data;
str = evas_stringshare_add(str);
str = eina_stringshare_add(str);
ki->matchlist.matches = eina_list_append(ki->matchlist.matches, str);
e_widget_ilist_append(o, NULL, str, _e_kbd_int_cb_matchlist_item_sel,
ki, NULL);
@ -1740,9 +1739,9 @@ e_kbd_int_new(const char *themedir, const char *syskbds, const char *sysdicts)
ki = E_NEW(E_Kbd_Int, 1);
if (!ki) return NULL;
if (themedir) ki->themedir = evas_stringshare_add(themedir);
if (syskbds) ki->syskbds = evas_stringshare_add(syskbds);
if (sysdicts) ki->sysdicts = evas_stringshare_add(sysdicts);
if (themedir) ki->themedir = eina_stringshare_add(themedir);
if (syskbds) ki->syskbds = eina_stringshare_add(syskbds);
if (sysdicts) ki->sysdicts = eina_stringshare_add(sysdicts);
ki->win = e_win_new(e_util_container_number_get(0));
states[0] = ECORE_X_WINDOW_STATE_SKIP_TASKBAR;
states[1] = ECORE_X_WINDOW_STATE_SKIP_PAGER;
@ -1818,9 +1817,9 @@ e_kbd_int_new(const char *themedir, const char *syskbds, const char *sysdicts)
EAPI void
e_kbd_int_free(E_Kbd_Int *ki)
{
if (ki->themedir) evas_stringshare_del(ki->themedir);
if (ki->syskbds) evas_stringshare_del(ki->syskbds);
if (ki->sysdicts) evas_stringshare_del(ki->sysdicts);
if (ki->themedir) eina_stringshare_del(ki->themedir);
if (ki->syskbds) eina_stringshare_del(ki->syskbds);
if (ki->sysdicts) eina_stringshare_del(ki->sysdicts);
_e_kbd_int_layouts_free(ki);
_e_kbd_int_matches_free(ki);
_e_kbd_int_layout_free(ki);

5
src/modules/illume/e_mod_layout.c
View File

@ -388,7 +388,7 @@ _e_mod_layout_cb_hook_post_fetch(void *data, E_Border *bd)
{
if (bd->bordername)
{
evas_stringshare_del(bd->bordername);
eina_stringshare_del(bd->bordername);
bd->bordername = NULL;
bd->client.border.changed = 1;
}
@ -397,8 +397,7 @@ _e_mod_layout_cb_hook_post_fetch(void *data, E_Border *bd)
}
if (!_is_dialog(bd))
{
if (bd->bordername) evas_stringshare_del(bd->bordername);
bd->bordername = evas_stringshare_add("borderless");
eina_stringshare_replace(&bd->bordername, "borderless");
bd->client.border.changed = 1;
}
bd->client.e.state.centered = 0;

12
src/modules/illume/e_slipshelf.c
View File

@ -71,7 +71,7 @@ e_slipshelf_new(E_Zone *zone, const char *themedir)
if (!ess) return NULL;
ess->zone = zone;
if (themedir) ess->themedir = evas_stringshare_add(themedir);
if (themedir) ess->themedir = eina_stringshare_add(themedir);
ess->clickwin = ecore_x_window_input_new(zone->container->win,
zone->x, zone->y, zone->w, zone->h);
@ -427,11 +427,7 @@ e_slipshelf_default_title_set(E_Slipshelf *ess, const char *title)
{
E_OBJECT_CHECK(ess);
E_OBJECT_TYPE_CHECK(ess, E_SLIPSHELF_TYPE);
if (ess->default_title) evas_stringshare_del(ess->default_title);
if (title)
ess->default_title = evas_stringshare_add(title);
else
ess->default_title = NULL;
eina_stringshare_replace(&ess->default_title, title);
if (!ess->focused_border)
edje_object_part_text_set(ess->base_obj, "e.text.label",
ess->default_title);
@ -468,8 +464,8 @@ _e_slipshelf_free(E_Slipshelf *ess)
EINA_LIST_FREE(ess->handlers, handle)
ecore_event_handler_del(handle);
if (ess->animator) ecore_animator_del(ess->animator);
if (ess->themedir) evas_stringshare_del(ess->themedir);
if (ess->default_title) evas_stringshare_del(ess->default_title);
if (ess->themedir) eina_stringshare_del(ess->themedir);
if (ess->default_title) eina_stringshare_del(ess->default_title);
if (ess->clickwin) ecore_x_window_free(ess->clickwin);
e_object_del(E_OBJECT(ess->popup));
free(ess);

4
src/modules/illume/e_slipwin.c
View File

@ -56,7 +56,7 @@ e_slipwin_new(E_Zone *zone, const char *themedir)
if (!esw) return NULL;
esw->zone = zone;
if (themedir) esw->themedir = evas_stringshare_add(themedir);
if (themedir) esw->themedir = eina_stringshare_add(themedir);
esw->clickwin = ecore_x_window_input_new(zone->container->win,
zone->x, zone->y, zone->w, zone->h);
@ -217,7 +217,7 @@ _e_slipwin_free(E_Slipwin *esw)
EINA_LIST_FREE(esw->handlers, handle)
ecore_event_handler_del(handle);
if (esw->animator) ecore_animator_del(esw->animator);
if (esw->themedir) evas_stringshare_del(esw->themedir);
if (esw->themedir) eina_stringshare_del(esw->themedir);
ecore_x_window_free(esw->clickwin);
e_object_del(E_OBJECT(esw->popup));
free(esw);

4
src/modules/illume/e_syswin.c
View File

@ -56,7 +56,7 @@ e_syswin_new(E_Zone *zone, const char *themedir)
if (!esw) return NULL;
esw->zone = zone;
if (themedir) esw->themedir = evas_stringshare_add(themedir);
if (themedir) esw->themedir = eina_stringshare_add(themedir);
esw->clickwin = ecore_x_window_input_new(zone->container->win,
zone->x, zone->y, zone->w, zone->h);
@ -217,7 +217,7 @@ _e_syswin_free(E_Syswin *esw)
EINA_LIST_FREE(esw->handlers, handle)
ecore_event_handler_del(handle);
if (esw->animator) ecore_animator_del(esw->animator);
if (esw->themedir) evas_stringshare_del(esw->themedir);
if (esw->themedir) eina_stringshare_del(esw->themedir);
ecore_x_window_free(esw->clickwin);
e_object_del(E_OBJECT(esw->popup));
free(esw);

14
src/modules/illume/e_winilist.c
View File

@ -123,7 +123,7 @@ e_winilist_special_append(Evas_Object *obj, Evas_Object *icon, const char *label
s = E_NEW(Special, 1);
d->special.prepend = eina_list_prepend(d->special.prepend, s);
s->icon = icon;
if (label) s->label = evas_stringshare_add(label);
if (label) s->label = eina_stringshare_add(label);
s->func = func;
s->data1 = data1;
s->data2 = data2;
@ -145,7 +145,7 @@ e_winilist_special_prepend(Evas_Object *obj, Evas_Object *icon, const char *labe
s = E_NEW(Special, 1);
d->special.append = eina_list_append(d->special.append, s);
s->icon = icon;
if (label) s->label = evas_stringshare_add(label);
if (label) s->label = eina_stringshare_add(label);
s->func = func;
s->data1 = data1;
s->data2 = data2;
@ -211,7 +211,7 @@ _cb_object_del(void *data, Evas *e, Evas_Object *obj, void *event_info)
}
while (d->labels)
{
evas_stringshare_del(d->labels->data);
eina_stringshare_del(d->labels->data);
d->labels = eina_list_remove_list(d->labels, d->labels);
}
@ -227,7 +227,7 @@ _cb_object_del(void *data, Evas *e, Evas_Object *obj, void *event_info)
}
if (s->label)
{
evas_stringshare_del(s->label);
eina_stringshare_del(s->label);
s->label = NULL;
}
free(s);
@ -245,7 +245,7 @@ _cb_object_del(void *data, Evas *e, Evas_Object *obj, void *event_info)
}
if (s->label)
{
evas_stringshare_del(s->label);
eina_stringshare_del(s->label);
s->label = NULL;
}
free(s);
@ -353,7 +353,7 @@ _refill(Data *d)
}
while (d->labels)
{
evas_stringshare_del(d->labels->data);
eina_stringshare_del(d->labels->data);
d->labels = eina_list_remove_list(d->labels, d->labels);
}
@ -386,7 +386,7 @@ _refill(Data *d)
else if (bd->client.icccm.title) title = bd->client.icccm.title;
e_object_ref(E_OBJECT(bd));
d->borders = eina_list_append(d->borders, bd);
d->labels = eina_list_append(d->labels, evas_stringshare_add(title));
d->labels = eina_list_append(d->labels, eina_stringshare_add(title));
e_ilist_append(d->o_ilist, NULL/*icon*/, title, 0,
_cb_item_sel,
NULL, d, bd);