E SVN: hermet IN trunk/elementary: . src/lib

[Enlightenment S. <no-...@en...>]

Log:
elementary/naviframe - let's remove contents which are preserved on set if the naviframe is deleted.
  
  

Author:       hermet
Date:         2012-11-22 06:47:08 -0800 (Thu, 22 Nov 2012)
New Revision: 79541
Trac:         http://trac.enlightenment.org/e/changeset/79541

Modified:
  trunk/elementary/ChangeLog trunk/elementary/NEWS trunk/elementary/src/lib/elc_naviframe.c 

Modified: trunk/elementary/ChangeLog
===================================================================
--- trunk/elementary/ChangeLog	2012-11-22 14:46:45 UTC (rev 79540)
+++ trunk/elementary/ChangeLog	2012-11-22 14:47:08 UTC (rev 79541)
@@ -695,4 +695,11 @@
 
 2012-11-22  Michael Bouchaud (yoz)
 
-        * fix elm_flip to show only one face at a time 
+        * fix elm_flip to show only one face at a time
+
+2012-11-22  ChunEon Park (Hermet)
+
+        * Lets remove contents regardless of the preseve_on_set if naviframe is
+		  deleted.
+
+

Modified: trunk/elementary/NEWS
===================================================================
--- trunk/elementary/NEWS	2012-11-22 14:46:45 UTC (rev 79540)
+++ trunk/elementary/NEWS	2012-11-22 14:47:08 UTC (rev 79541)
@@ -60,6 +60,7 @@
    * Fix the elm_image which is made up of a edje object can call a callback function
    * Fix update the min size hint on elm_label after a text set
    * Fix flip widget who show the two face at same time
+   * Fix the naviframe to delete contents which are preserved_on set if the naviframe is deleted.
 
 Removals:
 

Modified: trunk/elementary/src/lib/elc_naviframe.c
===================================================================
--- trunk/elementary/src/lib/elc_naviframe.c	2012-11-22 14:46:45 UTC (rev 79540)
+++ trunk/elementary/src/lib/elc_naviframe.c	2012-11-22 14:47:08 UTC (rev 79541)
@@ -84,16 +84,19 @@
      evas_object_del(it->title_next_btn);
    if (it->title_icon) evas_object_del(it->title_icon);
 
-   if (sd->preserve && it->content)
+   if (it->content)
      {
-        /* so that elm does not delete the contents with the item's
-         * view after the del_pre_hook */
-        edje_object_part_unswallow(VIEW(it), it->content);
-        evas_object_event_callback_del
-          (it->content, EVAS_CALLBACK_DEL, _item_content_del_cb);
+        if ((sd->preserve) && (!sd->on_deletion))
+          {
+             /* so that elm does not delete the contents with the item's
+              * view after the del_pre_hook */
+             edje_object_part_unswallow(VIEW(it), it->content);
+             evas_object_event_callback_del
+                (it->content, EVAS_CALLBACK_DEL, _item_content_del_cb);
+          }
+        else
+          evas_object_del(it->content);
      }
-   else if (it->content)
-     evas_object_del(it->content);
 }
 
 static void