Enlightenment CVS committal

Author  : lordchaos
Project : e17
Module  : libs/ewl

Dir     : e17/libs/ewl/src/lib


Modified Files:
        ewl_iconbox.c 


Log Message:
Free some objects we should have been destroying

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_iconbox.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ewl_iconbox.c       2 Aug 2005 12:20:21 -0000       1.14
+++ ewl_iconbox.c       4 Aug 2005 07:20:37 -0000       1.15
@@ -739,8 +739,16 @@
        Ewl_IconBox_Icon* icon = EWL_ICONBOX_ICON(w);
        
        DENTER_FUNCTION(DLEVEL_STABLE);
+       ewl_widget_hide(icon->image);
+       ewl_widget_hide(icon->floater);
+       /*ewl_widget_destroy(icon->image);
+       ewl_widget_destroy(icon->floater);*/
+       ewl_container_child_remove(EWL_CONTAINER(icon), icon->image);
+       ewl_container_child_remove(EWL_CONTAINER(icon), icon->w_label);
+       ewl_container_child_remove(EWL_CONTAINER(icon->floater), icon);
        ewl_widget_destroy(icon->image);
-       ewl_widget_destroy(icon->floater);
+       /*ewl_widget_destroy(icon->floater);*/
+       ewl_widget_destroy(icon->w_label);
        DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
 
@@ -752,8 +760,8 @@
 
        ib = ewl_iconbox_icon_new();
 
-       /*ewl_callback_append(EWL_WIDGET(ib), EWL_CALLBACK_DESTROY,
-                           ewl_iconbox_icon_destroy_cb, NULL);*/
+       ewl_callback_append(EWL_WIDGET(ib), EWL_CALLBACK_DESTROY,
+                           ewl_iconbox_icon_destroy_cb, NULL);
 
        EWL_ICONBOX_ICON(ib)->selected = 0;
        EWL_ICONBOX_ICON(ib)->floater = 
ewl_floater_new(iconbox->ewl_iconbox_pane_inner);
@@ -853,12 +861,12 @@
                        }
 
                        
ewl_container_child_remove(EWL_CONTAINER(ib->ewl_iconbox_pane_inner), 
EWL_WIDGET(list_item));
+
                        ewl_widget_destroy(EWL_WIDGET(list_item));              
                }
                /*printf("...dione\n");*/
 
-               ecore_list_destroy(ib->ewl_iconbox_icon_list);
+               ecore_list_clear(ib->ewl_iconbox_icon_list);
        }
        
-       ib->ewl_iconbox_icon_list = ecore_list_new();
 }




-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to