From 65ce400db99d3a2523b87f259c41d66fd7f63327 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Sat, 24 Nov 2012 12:43:31 +0000 Subject: [PATCH] elementary/naviframe - free the text parts when it's item is deleted.x SVN revision: 79633 --- legacy/elementary/ChangeLog | 4 ++++ legacy/elementary/NEWS | 1 + legacy/elementary/src/lib/elc_naviframe.c | 6 ++++++ 3 files changed, 11 insertions(+) diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index 07b175fb01..2e2c42f1e0 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -709,3 +709,7 @@ 2012-11-22 Thiep Ha * Fixed entry to enable have_selection only when a text is actually selected. + +2012-11-23 ChunEon Park (Hermet) + + * Free the text parts of the naviframe item when item is deleted. diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS index 08f3ea83e8..3a08f278a2 100644 --- a/legacy/elementary/NEWS +++ b/legacy/elementary/NEWS @@ -63,6 +63,7 @@ Fixes: * Fix the naviframe to delete contents which are preserved_on set if the naviframe is deleted. * Fix the naviframe to clear the title contents when it's item is deleted. * Fix entry to enable have_selection only when a text is actually selected. + * Fix the naviframe to clear the text parts when it's item is deleted. Removals: diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/legacy/elementary/src/lib/elc_naviframe.c index 4b59da89b7..39f0dd734e 100644 --- a/legacy/elementary/src/lib/elc_naviframe.c +++ b/legacy/elementary/src/lib/elc_naviframe.c @@ -91,6 +91,7 @@ _item_free(Elm_Naviframe_Item *it) { Eina_Inlist *l; Elm_Naviframe_Content_Item_Pair *content_pair; + Elm_Naviframe_Text_Item_Pair *text_pair; Evas_Object *title_content; ELM_NAVIFRAME_DATA_GET(WIDGET(it), sd); @@ -118,6 +119,11 @@ _item_free(Elm_Naviframe_Item *it) eina_stringshare_del(content_pair->part); free(content_pair); } + EINA_INLIST_FOREACH_SAFE(it->text_list, l, text_pair) + { + eina_stringshare_del(text_pair->part); + free(text_pair); + } if (it->content) {