summaryrefslogtreecommitdiff
path: root/legacy/edje/src/lib/edje_text.c
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2010-08-12 12:58:54 +0000
committerCedric BAIL <cedric.bail@free.fr>2010-08-12 12:58:54 +0000
commit26233677322e16ff339971237edde49408facf99 (patch)
tree23b5a84372193c7f6b4ecda108363244275f5099 /legacy/edje/src/lib/edje_text.c
parent3ec81c0b3e612c02319dc44bbb83a7bd6d301538 (diff)
* edje: fix some memleak issue.
SVN revision: 51033
Diffstat (limited to 'legacy/edje/src/lib/edje_text.c')
-rw-r--r--legacy/edje/src/lib/edje_text.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/legacy/edje/src/lib/edje_text.c b/legacy/edje/src/lib/edje_text.c
index c662871..23dd35f 100644
--- a/legacy/edje/src/lib/edje_text.c
+++ b/legacy/edje/src/lib/edje_text.c
@@ -280,7 +280,7 @@ _edje_text_class_font_get(Edje *ed, Edje_Part_Description_Text *chosen_desc, int
280 Edje_Text_Class *tc; 280 Edje_Text_Class *tc;
281 const char *text_class_name, *font; 281 const char *text_class_name, *font;
282 282
283 font = chosen_desc->text.font; 283 font = edje_string_get(&chosen_desc->text.font);
284 *size = chosen_desc->text.size; 284 *size = chosen_desc->text.size;
285 285
286 text_class_name = chosen_desc->text.text_class; 286 text_class_name = chosen_desc->text.text_class;
@@ -291,7 +291,7 @@ _edje_text_class_font_get(Edje *ed, Edje_Part_Description_Text *chosen_desc, int
291 if (!tc) 291 if (!tc)
292 return font; 292 return font;
293 293
294 font = _edje_text_font_get(chosen_desc->text.font, tc->font, free_later); 294 font = _edje_text_font_get(edje_string_get(&chosen_desc->text.font), tc->font, free_later);
295 *size = _edje_text_size_calc(*size, tc); 295 *size = _edje_text_size_calc(*size, tc);
296 296
297 return font; 297 return font;
@@ -314,7 +314,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
314 314
315 sc = ed->scale; 315 sc = ed->scale;
316 if (sc == 0.0) sc = _edje_scale; 316 if (sc == 0.0) sc = _edje_scale;
317 text = chosen_desc->text.text; 317 text = edje_string_get(&chosen_desc->text.text);
318 font = _edje_text_class_font_get(ed, chosen_desc, &size, &sfont); 318 font = _edje_text_class_font_get(ed, chosen_desc, &size, &sfont);
319 319
320 if (ep->text.text) text = (char *) ep->text.text; 320 if (ep->text.text) text = (char *) ep->text.text;
@@ -323,12 +323,12 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
323 323
324 if (ep->text.text_source) 324 if (ep->text.text_source)
325 { 325 {
326 text = ((Edje_Part_Description_Text *)ep->text.text_source->chosen_description)->text.text; 326 text = edje_string_get(&(((Edje_Part_Description_Text *)ep->text.text_source->chosen_description)->text.text));
327 if (ep->text.text_source->text.text) text = ep->text.text_source->text.text; 327 if (ep->text.text_source->text.text) text = ep->text.text_source->text.text;
328 } 328 }
329 if (ep->text.source) 329 if (ep->text.source)
330 { 330 {
331 font = ((Edje_Part_Description_Text *)ep->text.source->chosen_description)->text.font; 331 font = edje_string_get(&(((Edje_Part_Description_Text *)ep->text.source->chosen_description)->text.font));
332 size = ((Edje_Part_Description_Text *)ep->text.source->chosen_description)->text.size; 332 size = ((Edje_Part_Description_Text *)ep->text.source->chosen_description)->text.size;
333 if (ep->text.source->text.font) font = ep->text.source->text.font; 333 if (ep->text.source->text.font) font = ep->text.source->text.font;
334 if (ep->text.source->text.size > 0) size = ep->text.source->text.size; 334 if (ep->text.source->text.size > 0) size = ep->text.source->text.size;