Hi all, i notice that evas_stringshare left on some of the modules. Here
is attached the patch to replac evas_stringshare by eina ones.
PS: I test them quickly, they seem to be working.
Index: alarm/e_mod_config.c
===================================================================
--- alarm/e_mod_config.c (revision 37361)
+++ alarm/e_mod_config.c (working copy)
@@ -279,8 +279,8 @@
alarm_config->alarms_open_popup_default = cfdata->alarms_open_popup_default;
alarm_config->alarms_run_program_default = cfdata->alarms_run_program_default;
if (alarm_config->alarms_program_default)
- evas_stringshare_del(alarm_config->alarms_program_default);
- alarm_config->alarms_program_default = evas_stringshare_add(cfdata->alarms_program_default);
+ eina_stringshare_del(alarm_config->alarms_program_default);
+ alarm_config->alarms_program_default = eina_stringshare_add(cfdata->alarms_program_default);
e_config_save_queue();
return ret;
Index: alarm/e_mod_main.c
===================================================================
--- alarm/e_mod_main.c (revision 37361)
+++ alarm/e_mod_main.c (working copy)
@@ -229,7 +229,7 @@
al->state = ALARM_STATE_ON;
else
al->state = ALARM_STATE_OFF;
- al->name = evas_stringshare_add(name);
+ al->name = eina_stringshare_add(name);
al->sched.type = type;
switch(type)
{
@@ -275,12 +275,12 @@
al->snooze.hour = ALARM_SNOOZE_HOUR_DEFAULT;
al->autoremove = autoremove;
if (description)
- al->description = evas_stringshare_add(description);
+ al->description = eina_stringshare_add(description);
al->open_popup = open_popup;
al->run_program = run_program;
if (program)
if (strlen(program))
- al->program = evas_stringshare_add(program);
+ al->program = eina_stringshare_add(program);
if (!_alarm_check_date(al, 1))
{
@@ -299,16 +299,16 @@
alarm_alarm_del(Alarm *al)
{
if (al->name)
- evas_stringshare_del(al->name);
+ eina_stringshare_del(al->name);
if (al->state == ALARM_STATE_RINGING)
alarm_alarm_ring_stop(al, 0);
if (al->config_dialog)
e_object_del(E_OBJECT(al->config_dialog));
if (al->description)
- evas_stringshare_del(al->description);
+ eina_stringshare_del(al->description);
if (al->program)
- evas_stringshare_del(al->program);
+ eina_stringshare_del(al->program);
if (al->snooze.dia)
e_object_del(E_OBJECT(al->snooze.dia));
@@ -345,15 +345,15 @@
al_new = E_NEW(Alarm, 1);
if (al->name)
- al_new->name = evas_stringshare_add(al->name);
+ al_new->name = eina_stringshare_add(al->name);
al_new->state = al->state;
if (al->description)
- al_new->description = evas_stringshare_add(al->description);
+ al_new->description = eina_stringshare_add(al->description);
al_new->autoremove = al->autoremove;
al_new->open_popup = al->open_popup;
al_new->run_program = al->run_program;
if (al->program)
- al_new->program = evas_stringshare_add(al->program);
+ al_new->program = eina_stringshare_add(al->program);
al_new->sched.type = al->sched.type;
al_new->sched.date_epoch = al->sched.date_epoch;
al_new->sched.hour = al->sched.hour;
@@ -1143,7 +1143,7 @@
if (alarm_config->alarms_ring_etimer)
ecore_timer_del(alarm_config->alarms_ring_etimer);
if (alarm_config->alarms_program_default)
- evas_stringshare_del(alarm_config->alarms_program_default);
+ eina_stringshare_del(alarm_config->alarms_program_default);
if (alarm_config->theme)
free(alarm_config->theme);
Index: calendar/e_mod_main.c
===================================================================
--- calendar/e_mod_main.c (revision 37361)
+++ calendar/e_mod_main.c (working copy)
@@ -205,7 +205,7 @@
}
ci = E_NEW(Config_Item, 1);
- ci->id = evas_stringshare_add(id);
+ ci->id = eina_stringshare_add(id);
ci->firstweekday = 0;
calendar_conf->items = eina_list_append(calendar_conf->items, ci);
@@ -538,7 +538,7 @@
calendar_conf = E_NEW(Config, 1);
ci = E_NEW(Config_Item, 1);
- ci->id = evas_stringshare_add("0");
+ ci->id = eina_stringshare_add("0");
ci->firstweekday = 0;
calendar_conf->items = eina_list_append(calendar_conf->items, ci);
@@ -578,7 +578,7 @@
ci = calendar_conf->items->data;
if (ci->id)
- evas_stringshare_del(ci->id);
+ eina_stringshare_del(ci->id);
calendar_conf->items = eina_list_remove_list(calendar_conf->items, calendar_conf->items);
E_FREE(ci);
}
Index: execwatch/e_mod_config.c
===================================================================
--- execwatch/e_mod_config.c (revision 37361)
+++ execwatch/e_mod_config.c (working copy)
@@ -189,19 +189,19 @@
}
if (!cfdata->poll_time_mins && !cfdata->poll_time_hours) return 0;
- if (ci->display_name) evas_stringshare_del(ci->display_name);
- ci->display_name = evas_stringshare_add(cfdata->display_name);
- if (ci->status_cmd) evas_stringshare_del(ci->status_cmd);
- ci->status_cmd = evas_stringshare_add(cfdata->status_cmd);
+ if (ci->display_name) eina_stringshare_del(ci->display_name);
+ ci->display_name = eina_stringshare_add(cfdata->display_name);
+ if (ci->status_cmd) eina_stringshare_del(ci->status_cmd);
+ ci->status_cmd = eina_stringshare_add(cfdata->status_cmd);
if (strlen(cfdata->okstate_string))
{
- if (ci->okstate_string) evas_stringshare_del(ci->okstate_string);
- ci->okstate_string = evas_stringshare_add(cfdata->okstate_string);
+ if (ci->okstate_string) eina_stringshare_del(ci->okstate_string);
+ ci->okstate_string = eina_stringshare_add(cfdata->okstate_string);
}
if (strlen(cfdata->dblclk_cmd))
{
- if (ci->dblclk_cmd) evas_stringshare_del(ci->dblclk_cmd);
- ci->dblclk_cmd = evas_stringshare_add(cfdata->dblclk_cmd);
+ if (ci->dblclk_cmd) eina_stringshare_del(ci->dblclk_cmd);
+ ci->dblclk_cmd = eina_stringshare_add(cfdata->dblclk_cmd);
}
if (strlen(cfdata->okstate_exitcode))
ci->okstate_exitcode = atoi (cfdata->okstate_exitcode);
Index: execwatch/e_mod_main.c
===================================================================
--- execwatch/e_mod_main.c (revision 37361)
+++ execwatch/e_mod_main.c (working copy)
@@ -209,13 +209,13 @@
}
ci = E_NEW(Config_Item, 1);
- ci->id = evas_stringshare_add(id);
- ci->display_name = evas_stringshare_add("Edit!");
- ci->status_cmd = evas_stringshare_add("");
- ci->dblclk_cmd = evas_stringshare_add("");
+ ci->id = eina_stringshare_add(id);
+ ci->display_name = eina_stringshare_add("Edit!");
+ ci->status_cmd = eina_stringshare_add("");
+ ci->dblclk_cmd = eina_stringshare_add("");
ci->okstate_mode = 0;
ci->okstate_exitcode = 0;
- ci->okstate_string = evas_stringshare_add("");
+ ci->okstate_string = eina_stringshare_add("");
ci->okstate_lines = 0;
ci->refresh_after_dblclk_cmd = 0;
ci->poll_time_mins = 0.0;
@@ -589,13 +589,13 @@
execwatch_config = E_NEW(Config, 1);
ci = E_NEW(Config_Item, 1);
- ci->id = evas_stringshare_add("0");
- ci->display_name = evas_stringshare_add("Edit!");
- ci->status_cmd = evas_stringshare_add("");
- ci->dblclk_cmd = evas_stringshare_add("");
+ ci->id = eina_stringshare_add("0");
+ ci->display_name = eina_stringshare_add("Edit!");
+ ci->status_cmd = eina_stringshare_add("");
+ ci->dblclk_cmd = eina_stringshare_add("");
ci->okstate_mode = 0;
ci->okstate_exitcode = 0;
- ci->okstate_string = evas_stringshare_add("");
+ ci->okstate_string = eina_stringshare_add("");
ci->okstate_lines = 0;
ci->refresh_after_dblclk_cmd = 0;
ci->poll_time_mins = 0.0;
@@ -632,7 +632,7 @@
Config_Item *ci;
ci = execwatch_config->items->data;
- if (ci->id) evas_stringshare_del(ci->id);
+ if (ci->id) eina_stringshare_del(ci->id);
execwatch_config->items = eina_list_remove_list(execwatch_config->items, execwatch_config->items);
E_FREE(ci);
}
Index: forecasts/e_mod_config.c
===================================================================
--- forecasts/e_mod_config.c (revision 37361)
+++ forecasts/e_mod_config.c (working copy)
@@ -139,12 +139,12 @@
ci->degrees = cfdata->degrees;
ci->poll_time = (cfdata->poll_time * 60.0);
if (ci->code)
- evas_stringshare_del(ci->code);
+ eina_stringshare_del(ci->code);
char *t;
t = strdup(cfdata->code);
*t = toupper(*t);
- ci->code = evas_stringshare_add(t);
+ ci->code = eina_stringshare_add(t);
ci->show_text = cfdata->show_text;
ci->popup_on_hover = cfdata->popup_on_hover;
Index: mpdule/e_mod_config.c
===================================================================
--- mpdule/e_mod_config.c (revision 37361)
+++ mpdule/e_mod_config.c (working copy)
@@ -115,8 +115,8 @@
ci = cfd->data;
ci->poll_time = cfdata->poll_time;
if (ci->hostname)
- evas_stringshare_del (ci->hostname);
- ci->hostname = evas_stringshare_add (cfdata->hostname);
+ eina_stringshare_del (ci->hostname);
+ ci->hostname = eina_stringshare_add (cfdata->hostname);
ci->port = atoi (cfdata->port);
e_config_save_queue ();
_mpdule_config_updated (ci);
Index: mpdule/e_mod_main.c
===================================================================
--- mpdule/e_mod_main.c (revision 37361)
+++ mpdule/e_mod_main.c (working copy)
@@ -92,7 +92,7 @@
inst->ci = _mpdule_config_item_get (id);
if (!inst->ci->id)
- inst->ci->id = evas_stringshare_add (id);
+ inst->ci->id = eina_stringshare_add (id);
o = edje_object_add (gc->evas);
snprintf (buf, sizeof (buf), "%s/mpdule.edj",
@@ -430,9 +430,9 @@
}
ci = E_NEW (Config_Item, 1);
- ci->id = evas_stringshare_add (id);
+ ci->id = eina_stringshare_add (id);
ci->poll_time = 1.0;
- ci->hostname = evas_stringshare_add ("localhost");
+ ci->hostname = eina_stringshare_add ("localhost");
ci->port = 6600;
mpdule_config->items = eina_list_append (mpdule_config->items, ci);
@@ -716,9 +716,9 @@
mpdule_config = E_NEW (Config, 1);
ci = E_NEW (Config_Item, 1);
- ci->id = evas_stringshare_add ("0");
+ ci->id = eina_stringshare_add ("0");
ci->poll_time = 1.0;
- ci->hostname = evas_stringshare_add ("localhost");
+ ci->hostname = eina_stringshare_add ("localhost");
ci->port = 6600;
mpdule_config->items = eina_list_append (mpdule_config->items, ci);
@@ -752,7 +752,7 @@
mpdule_config->items =
eina_list_remove_list (mpdule_config->items, mpdule_config->items);
if (ci->id)
- evas_stringshare_del (ci->id);
+ eina_stringshare_del (ci->id);
free (ci);
ci = NULL;
}
Index: penguins/e_mod_config.c
===================================================================
--- penguins/e_mod_config.c (revision 37361)
+++ penguins/e_mod_config.c (working copy)
@@ -154,8 +154,8 @@
pop->conf->zoom = cfdata->zoom;
pop->conf->alpha = cfdata->alpha;
- if (pop->conf->theme) evas_stringshare_del(pop->conf->theme);
- pop->conf->theme = evas_stringshare_add(cfdata->theme);
+ if (pop->conf->theme) eina_stringshare_del(pop->conf->theme);
+ pop->conf->theme = eina_stringshare_add(cfdata->theme);
e_config_save_queue();
e_border_button_bindings_grab_all();
Index: penguins/e_mod_main.c
===================================================================
--- penguins/e_mod_main.c (revision 37361)
+++ penguins/e_mod_main.c (working copy)
@@ -134,7 +134,7 @@
pop->conf->alpha = 200;
snprintf(buf, sizeof(buf), "%s/themes/default.edj", e_module_dir_get(m));
- pop->conf->theme = evas_stringshare_add(buf);
+ pop->conf->theme = eina_stringshare_add(buf);
}
managers = e_manager_list();
@@ -275,7 +275,7 @@
pop->themes = eina_list_remove_list(pop->themes, pop->themes);
}
- if (pop->conf->theme) evas_stringshare_del(pop->conf->theme);
+ if (pop->conf->theme) eina_stringshare_del(pop->conf->theme);
E_FREE(pop->conf);
E_CONFIG_DD_FREE(pop->conf_edd);
Index: taskbar/e_mod_main.c
===================================================================
--- taskbar/e_mod_main.c (revision 37361)
+++ taskbar/e_mod_main.c (working copy)
@@ -132,7 +132,7 @@
taskbar_config = E_NEW(Config, 1);
config = E_NEW(Config_Item, 1);
- config->id = evas_stringshare_add("0");
+ config->id = eina_stringshare_add("0");
config->show_all = 0;
taskbar_config->items = eina_list_append(taskbar_config->items, config);
@@ -607,7 +607,7 @@
}
config = E_NEW(Config_Item, 1);
- config->id = evas_stringshare_add(id);
+ config->id = eina_stringshare_add(id);
config->show_all = 0;
taskbar_config->items = eina_list_append(taskbar_config->items, config);
Index: tiling/trivials.c
===================================================================
--- tiling/trivials.c (revision 37361)
+++ tiling/trivials.c (working copy)
@@ -11,8 +11,8 @@
change_window_border(E_Border *bd, char *bordername)
{
if (bd->bordername)
- evas_stringshare_del(bd->bordername);
- bd->bordername = evas_stringshare_add(bordername);
+ eina_stringshare_del(bd->bordername);
+ bd->bordername = eina_stringshare_add(bordername);
bd->client.border.changed = 1;
bd->changed = 1;
}
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
