summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2012-11-26 04:13:38 +0000
committerChunEon Park <hermet@hermet.pe.kr>2012-11-26 04:13:38 +0000
commit69331e4e723cfc9f39d60d7c025e3a0b060f0f4e (patch)
tree0ea46add6e9de6e7bedb4fe06d8fa3e99a24d743
parent9a718b76d07a27efb927f212dda00468082c96c1 (diff)
elementary - backport 79633
SVN revision: 79666
-rw-r--r--ChangeLog3
-rw-r--r--NEWS11
-rw-r--r--src/lib/elc_naviframe.c6
3 files changed, 20 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 43465ad65..a5c9ee2d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -548,3 +548,6 @@
548 548
549 * Fix build on systems without clearenv() (eg bsd). 549 * Fix build on systems without clearenv() (eg bsd).
550 550
5512012-11-23 ChunEon Park (Hermet)
552
553 * Free the text parts of the naviframe item when item is deleted.
diff --git a/NEWS b/NEWS
index db3f741f5..4fe44ed68 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
1Elementary 1.7.3
2
3Changes since Elementary 1.7.2:
4-------------------------
5
6Fixes:
7
8 * Fix the naviframe to clear the text parts when it's item is deleted.
9
10
1Elementary 1.7.2 11Elementary 1.7.2
2 12
3Changes since Elementary 1.7.1: 13Changes since Elementary 1.7.1:
@@ -13,6 +23,7 @@ Fixes:
13 * Fix flip widget who show the two face at same time 23 * Fix flip widget who show the two face at same time
14 * Fix the naviframe to delete contents which are preserved_on set if the naviframe is deleted. 24 * Fix the naviframe to delete contents which are preserved_on set if the naviframe is deleted.
15 * Fix the naviframe to clear the title contents when it's item is deleted. 25 * Fix the naviframe to clear the title contents when it's item is deleted.
26 * Fix the naviframe to clear the text parts when it's item is deleted.
16 27
17 28
18Changes since Elementary 1.7.0: 29Changes since Elementary 1.7.0:
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 845546255..42b94b3e9 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -91,6 +91,7 @@ _item_free(Elm_Naviframe_Item *it)
91{ 91{
92 Eina_Inlist *l; 92 Eina_Inlist *l;
93 Elm_Naviframe_Content_Item_Pair *content_pair; 93 Elm_Naviframe_Content_Item_Pair *content_pair;
94 Elm_Naviframe_Text_Item_Pair *text_pair;
94 Evas_Object *title_content; 95 Evas_Object *title_content;
95 96
96 ELM_NAVIFRAME_DATA_GET(WIDGET(it), sd); 97 ELM_NAVIFRAME_DATA_GET(WIDGET(it), sd);
@@ -118,6 +119,11 @@ _item_free(Elm_Naviframe_Item *it)
118 eina_stringshare_del(content_pair->part); 119 eina_stringshare_del(content_pair->part);
119 free(content_pair); 120 free(content_pair);
120 } 121 }
122 EINA_INLIST_FOREACH_SAFE(it->text_list, l, text_pair)
123 {
124 eina_stringshare_del(text_pair->part);
125 free(text_pair);
126 }
121 127
122 if (it->content) 128 if (it->content)
123 { 129 {