enlightenment
/
enlightenment-module-news
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* E-MODULES-EXTRA: Remove all evas_stringshare from E-MODULES-EXTRA. 

Note: A lot of this code, would like some cleanup and benefit from using new Eina macro.



SVN revision: 40985
This commit is contained in:
Cedric BAIL 2009-06-09 15:54:09 +00:00
parent a41df460a1
commit 4acba75b67
6 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/module/news_config.c
View File

@ -149,10 +149,10 @@ news_config_init(void)
c->viewer.varticles.sort_date = NEWS_VIEWER_VARTICLES_SORT_DATE_DEFAULT;
c->viewer.vcontent.font_size = NEWS_VIEWER_VCONTENT_FONT_SIZE_DEFAULT;
snprintf(buf, sizeof(buf), "%s", NEWS_VIEWER_VCONTENT_FONT_COLOR_DEFAULT);
c->viewer.vcontent.font_color = evas_stringshare_add(buf);
c->viewer.vcontent.font_color = eina_stringshare_add(buf);
c->viewer.vcontent.font_shadow = NEWS_VIEWER_VCONTENT_FONT_SHADOW_DEFAULT;
snprintf(buf, sizeof(buf), "%s", NEWS_VIEWER_VCONTENT_FONT_SHADOW_COLOR_DEFAULT);
c->viewer.vcontent.font_shadow_color = evas_stringshare_add(buf);
c->viewer.vcontent.font_shadow_color = eina_stringshare_add(buf);
c->popup_news.active = NEWS_FEED_POPUP_NEWS_ACTIVE_DEFAULT;
c->popup_news.timer_s = NEWS_FEED_POPUP_NEWS_TIMER_S_DEFAULT;
c->popup_other.on_timeout = NEWS_FEED_POPUP_OTHER_ON_TIMEOUT_DEFAULT;
@ -187,13 +187,13 @@ news_config_shutdown(void)
news_feed_lang_list_free(news->config->feed.langs);
if (c->proxy.host) evas_stringshare_del(c->proxy.host);
if (c->proxy.host) eina_stringshare_del(c->proxy.host);
while ( (nic = eina_list_data_get(c->items)) )
news_config_item_del(nic);
evas_stringshare_del(c->viewer.vcontent.font_color);
evas_stringshare_del(c->viewer.vcontent.font_shadow_color);
eina_stringshare_del(c->viewer.vcontent.font_color);
eina_stringshare_del(c->viewer.vcontent.font_shadow_color);
E_FREE(news->config);
@ -256,7 +256,7 @@ news_config_item_add(const char *id)
/* no, create a new item config */
nic = E_NEW(News_Config_Item, 1);
nic->id = evas_stringshare_add(id);
nic->id = eina_stringshare_add(id);
nic->view_mode = NEWS_ITEM_VIEW_MODE_DEFAULT;
nic->openmethod = NEWS_ITEM_OPENMETHOD_DEFAULT;
nic->browser_open_home = NEWS_ITEM_BROWSER_OPEN_HOME_DEFAULT;
@ -269,13 +269,13 @@ news_config_item_add(const char *id)
void
news_config_item_del(News_Config_Item *nic)
{
evas_stringshare_del(nic->id);
eina_stringshare_del(nic->id);
while(eina_list_count(nic->feed_refs))
{
News_Feed_Ref *fr;
fr = eina_list_data_get(nic->feed_refs);
evas_stringshare_del(fr->name);
eina_stringshare_del(fr->name);
nic->feed_refs = eina_list_remove(nic->feed_refs, fr);
}

12
src/module/news_config_dialog.c
View File

@ -377,11 +377,11 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
}
if (c->proxy.host)
{
evas_stringshare_del(c->proxy.host);
eina_stringshare_del(c->proxy.host);
c->proxy.host = NULL;
}
if (cfdata->proxy.host && cfdata->proxy.host[0])
c->proxy.host = evas_stringshare_add(cfdata->proxy.host);
c->proxy.host = eina_stringshare_add(cfdata->proxy.host);
if (cfdata->proxy.port && cfdata->proxy.port[0])
sscanf(cfdata->proxy.port, "%d", &c->proxy.port);
@ -412,8 +412,8 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
cfdata->viewer.vcontent.font_color->r,
cfdata->viewer.vcontent.font_color->g,
cfdata->viewer.vcontent.font_color->b);
evas_stringshare_del(news->config->viewer.vcontent.font_color);
news->config->viewer.vcontent.font_color = evas_stringshare_add(buf);
eina_stringshare_del(news->config->viewer.vcontent.font_color);
news->config->viewer.vcontent.font_color = eina_stringshare_add(buf);
c->viewer.vcontent.font_shadow = cfdata->viewer.vcontent.font_shadow;
@ -424,8 +424,8 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
cfdata->viewer.vcontent.font_shadow_color->r,
cfdata->viewer.vcontent.font_shadow_color->g,
cfdata->viewer.vcontent.font_shadow_color->b);
evas_stringshare_del(news->config->viewer.vcontent.font_shadow_color);
news->config->viewer.vcontent.font_shadow_color = evas_stringshare_add(buf);
eina_stringshare_del(news->config->viewer.vcontent.font_shadow_color);
news->config->viewer.vcontent.font_shadow_color = eina_stringshare_add(buf);
news_viewer_all_refresh(1, recreate);
cfdata->viewer.vcontent.color_changed = 0;

4
src/module/news_config_dialog_langs.c
View File

@ -184,8 +184,8 @@ _cb_lang_change(void *data, Evas_Object *obj)
if (choice->ok)
{
lang = E_NEW(News_Feed_Lang, 1);
lang->key = evas_stringshare_add(choice->lang->key);
lang->name = evas_stringshare_add(choice->lang->name);
lang->key = eina_stringshare_add(choice->lang->key);
lang->name = eina_stringshare_add(choice->lang->name);
list = eina_list_append(list, lang);
}
}

80
src/module/news_feed.c
View File

@ -74,8 +74,8 @@ news_feed_init(void)
while (_feed_langs[i].key)
{
lang = E_NEW(News_Feed_Lang, 1);
lang->key = evas_stringshare_add(_feed_langs[i].key);
lang->name = evas_stringshare_add(_feed_langs[i].name);
lang->key = eina_stringshare_add(_feed_langs[i].key);
lang->name = eina_stringshare_add(_feed_langs[i].name);
l = eina_list_append(l, lang);
i++;
}
@ -324,8 +324,8 @@ news_feed_edit(News_Feed *f, char *name, int name_ovrw, char *language, int lang
{
if (f->name != name)
{
if (f->name) evas_stringshare_del(f->name);
f->name = evas_stringshare_add(name);
if (f->name) eina_stringshare_del(f->name);
f->name = eina_stringshare_add(name);
}
f->name_ovrw = name_ovrw;
@ -333,31 +333,31 @@ news_feed_edit(News_Feed *f, char *name, int name_ovrw, char *language, int lang
{
char lang[3];
if (f->language) evas_stringshare_del(f->language);
if (f->language) eina_stringshare_del(f->language);
snprintf(lang, sizeof(lang), "%2s", language);
if (language) f->language = evas_stringshare_add(lang);
if (language) f->language = eina_stringshare_add(lang);
}
f->language_ovrw = language_ovrw;
if (f->description != description)
{
if (f->description) evas_stringshare_del(f->description);
if (description) f->description = evas_stringshare_add(description);
if (f->description) eina_stringshare_del(f->description);
if (description) f->description = eina_stringshare_add(description);
}
f->description_ovrw = description_ovrw;
if (f->url_home != url_home)
{
if (f->url_home) evas_stringshare_del(f->url_home);
if (url_home) f->url_home = evas_stringshare_add(url_home);
if (f->url_home) eina_stringshare_del(f->url_home);
if (url_home) f->url_home = eina_stringshare_add(url_home);
}
f->url_home_ovrw = url_home_ovrw;
if ( (f->url_feed != url_feed) &&
(!f->url_feed || strcmp(f->url_feed, url_feed)) )
{
if (f->url_feed) evas_stringshare_del(f->url_feed);
f->url_feed = evas_stringshare_add(url_feed);
if (f->url_feed) eina_stringshare_del(f->url_feed);
f->url_feed = eina_stringshare_add(url_feed);
update = 1;
}
@ -366,7 +366,7 @@ news_feed_edit(News_Feed *f, char *name, int name_ovrw, char *language, int lang
if ( f->icon &&
!(icon && !strcmp(f->icon, icon)) )
{
evas_stringshare_del(f->icon);
eina_stringshare_del(f->icon);
f->icon = NULL;
if (f->obj_icon)
{
@ -374,7 +374,7 @@ news_feed_edit(News_Feed *f, char *name, int name_ovrw, char *language, int lang
f->obj_icon = NULL;
}
}
if (icon && !f->icon) f->icon = evas_stringshare_add(icon);
if (icon && !f->icon) f->icon = eina_stringshare_add(icon);
}
f->icon_ovrw = icon_ovrw;
@ -402,10 +402,10 @@ news_feed_edit(News_Feed *f, char *name, int name_ovrw, char *language, int lang
ref = news_feed_ref_find(f, f->item);
if (ref)
{
if (ref->name) evas_stringshare_del(ref->name);
ref->name = evas_stringshare_add(f->name);
if (ref->category) evas_stringshare_del(ref->category);
ref->category = evas_stringshare_add(f->category->name);
if (ref->name) eina_stringshare_del(ref->name);
ref->name = eina_stringshare_add(f->name);
if (ref->category) eina_stringshare_del(ref->category);
ref->category = eina_stringshare_add(f->category->name);
}
}
@ -444,12 +444,12 @@ news_feed_free(News_Feed *f)
if (f->menu) news_menu_feed_hide(f);
if (f->obj_icon) evas_object_del(f->obj_icon);
if (f->name) evas_stringshare_del(f->name);
if (f->language) evas_stringshare_del(f->language);
if (f->description) evas_stringshare_del(f->description);
if (f->url_home) evas_stringshare_del(f->url_home);
if (f->url_feed) evas_stringshare_del(f->url_feed);
if (f->icon) evas_stringshare_del(f->icon);
if (f->name) eina_stringshare_del(f->name);
if (f->language) eina_stringshare_del(f->language);
if (f->description) eina_stringshare_del(f->description);
if (f->url_home) eina_stringshare_del(f->url_home);
if (f->url_feed) eina_stringshare_del(f->url_feed);
if (f->icon) eina_stringshare_del(f->icon);
if (f->host) free(f->host);
if (f->file) free(f->file);
@ -494,8 +494,8 @@ news_feed_attach(News_Feed *f, News_Feed_Ref *ref, News_Item *ni)
if (!ref)
{
ref = E_NEW(News_Feed_Ref, 1);
ref->category = evas_stringshare_add(f->category->name);
ref->name = evas_stringshare_add(f->name);
ref->category = eina_stringshare_add(f->category->name);
ref->name = eina_stringshare_add(f->name);
ref->feed = f;
ni->config->feed_refs = eina_list_append(ni->config->feed_refs, ref);
}
@ -543,8 +543,8 @@ news_feed_detach(News_Feed *f, int really)
{
DITEM(("feed detach : delete feed ref (%s)", ref->feed->name));
ni->config->feed_refs = eina_list_remove(ni->config->feed_refs, ref);
evas_stringshare_del(ref->category);
evas_stringshare_del(ref->name);
eina_stringshare_del(ref->category);
eina_stringshare_del(ref->name);
free(ref);
}
else
@ -892,14 +892,14 @@ news_feed_category_edit(News_Feed_Category *cat, char *name, char *icon)
if (cat->name != name)
{
if (cat->name) evas_stringshare_del(cat->name);
cat->name = evas_stringshare_add(name);
if (cat->name) eina_stringshare_del(cat->name);
cat->name = eina_stringshare_add(name);
}
if (cat->icon != icon)
{
if (cat->icon) evas_stringshare_del(cat->icon);
if (icon) cat->icon = evas_stringshare_add(icon);
if (cat->icon) eina_stringshare_del(cat->icon);
if (icon) cat->icon = eina_stringshare_add(icon);
}
return 1;
@ -910,8 +910,8 @@ news_feed_category_free(News_Feed_Category *cat)
{
if (cat->feeds && eina_list_count(cat->feeds)) return;
if (cat->name) evas_stringshare_del(cat->name);
if (cat->icon) evas_stringshare_del(cat->icon);
if (cat->name) eina_stringshare_del(cat->name);
if (cat->icon) eina_stringshare_del(cat->icon);
if (cat->feeds_visible_free && cat->feeds_visible)
eina_list_free(cat->feeds_visible);
if (cat->config_dialog) news_config_dialog_category_hide(cat);
@ -954,8 +954,8 @@ news_feed_lang_list_free(Eina_List *list)
while ((lang = eina_list_data_get(list)))
{
if (lang->key) evas_stringshare_del(lang->key);
if (lang->name) evas_stringshare_del(lang->name);
if (lang->key) eina_stringshare_del(lang->key);
if (lang->name) eina_stringshare_del(lang->name);
list = eina_list_remove_list(list, list);
free(lang);
}
@ -1032,10 +1032,10 @@ _feed_deactivate(News_Feed *f)
if (doc->parse.parser) news_parse_stop(doc);
if (doc->parse.meta_article) evas_stringshare_del(doc->parse.meta_article);
if (doc->parse.meta_channel) evas_stringshare_del(doc->parse.meta_channel);
if (doc->parse.meta_date) evas_stringshare_del(doc->parse.meta_date);
if (doc->parse.charset) evas_stringshare_del(doc->parse.charset);
if (doc->parse.meta_article) eina_stringshare_del(doc->parse.meta_article);
if (doc->parse.meta_channel) eina_stringshare_del(doc->parse.meta_channel);
if (doc->parse.meta_date) eina_stringshare_del(doc->parse.meta_date);
if (doc->parse.charset) eina_stringshare_del(doc->parse.charset);
//FIXME: waiting ecore_con patch to be able to delete the server in all cases
if (doc->server.conn && doc->server.waiting_reply) ecore_con_server_del(doc->server.conn);

18
src/module/news_parse.c
View File

@ -297,22 +297,22 @@ _idler_parse_detect_metas(News_Parse *parser)
if (ver == 1.0)
{
if (strstr(doc->server.buffer, "<item rdf"))
doc->parse.meta_article = evas_stringshare_add("<item rdf");
doc->parse.meta_article = eina_stringshare_add("<item rdf");
else
doc->parse.meta_article = evas_stringshare_add("<item>");
doc->parse.meta_article = eina_stringshare_add("<item>");
if (strstr(doc->server.buffer, "<channel rdf"))
doc->parse.meta_channel = evas_stringshare_add("<channel rdf");
doc->parse.meta_channel = eina_stringshare_add("<channel rdf");
else
doc->parse.meta_channel = evas_stringshare_add("<channel>");
doc->parse.meta_channel = eina_stringshare_add("<channel>");
doc->parse.meta_date = evas_stringshare_add("<dc:date");
doc->parse.meta_date = eina_stringshare_add("<dc:date");
}
else if ((ver > 0.0) && (ver <= 2.0))
{
doc->parse.meta_article = evas_stringshare_add("<item>");
doc->parse.meta_channel = evas_stringshare_add("<channel>");
doc->parse.meta_date = evas_stringshare_add("<pubDate");
doc->parse.meta_article = eina_stringshare_add("<item>");
doc->parse.meta_channel = eina_stringshare_add("<channel>");
doc->parse.meta_date = eina_stringshare_add("<pubDate");
}
if (!doc->parse.meta_channel)
@ -991,7 +991,7 @@ _parse_infos_item(News_Parse *parser, char *meta, const char *prev, int *edit)
{
memcpy(buf, ibeg, ilen);
buf[ilen] = '\0';
item = evas_stringshare_add(buf);
item = eina_stringshare_add(buf);
*edit = 1;
}
}

12
src/module/news_utils.c
View File

@ -88,8 +88,8 @@ news_util_lang_detect(void)
const char *key, *name;
lang = E_NEW(News_Feed_Lang, 1);
lang->key = evas_stringshare_add("en");
lang->name = evas_stringshare_add("English");
lang->key = eina_stringshare_add("en");
lang->name = eina_stringshare_add("English");
list = eina_list_append(list, lang);
//FIXME is that get from env correct ?
@ -101,8 +101,8 @@ news_util_lang_detect(void)
(name = news_feed_lang_name_get(key)))
{
lang = E_NEW(News_Feed_Lang, 1);
lang->key = evas_stringshare_add(key);
lang->name = evas_stringshare_add(name);
lang->key = eina_stringshare_add(key);
lang->name = eina_stringshare_add(name);
list = eina_list_append(list, lang);
}
@ -125,8 +125,8 @@ news_util_proxy_detect(void)
if (!port || (port == buf)) return 0;
if (!sscanf(port+1, "%d", &c->proxy.port)) return 0;
*port = '\0';
if (c->proxy.host) evas_stringshare_del(c->proxy.host);
c->proxy.host = evas_stringshare_add(buf);
if (c->proxy.host) eina_stringshare_del(c->proxy.host);
c->proxy.host = eina_stringshare_add(buf);
return 1;
}