Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/ewl

Dir     : e17/libs/ewl/src/lib


Modified Files:
        ewl_widget.c 


Log Message:
Centralize cleanup of embed widget references on container remove.
Testing removal of default reparent callback, as it is probably now redundant.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- ewl_widget.c        14 Feb 2006 20:49:44 -0000      1.66
+++ ewl_widget.c        15 Feb 2006 00:13:24 -0000      1.67
@@ -715,6 +715,7 @@
 {
        Ewl_Widget *tmp;
        Ewl_Container *op;
+       Ewl_Embed *emb;
 
        DENTER_FUNCTION(DLEVEL_STABLE);
        DCHECK_PARAM_PTR("w", w);
@@ -728,6 +729,10 @@
        if (!p)
                ewl_widget_obscure(w);
 
+       emb = ewl_embed_widget_find(w);
+       if (emb)
+               ewl_embed_info_widgets_cleanup(emb, w);
+
        /*
         * Verify this will not result in recursively nested widgets.
         */
@@ -752,17 +757,21 @@
         */
        if (op) {
                ewl_container_child_remove(op, w);
+               /*
                if (!p)
                        ewl_callback_del(w, EWL_CALLBACK_DESTROY,
                                        ewl_widget_child_destroy_cb);
+                                       */
        }
        /*
         * A widget that has not had a previous parent needs the parent
         * destruction callback added.
         */
        else if (p) {
+               /*
                ewl_callback_prepend(w, EWL_CALLBACK_DESTROY,
                                        ewl_widget_child_destroy_cb, NULL);
+                                       */
        }
 
        ewl_callback_call_with_event_data(w, EWL_CALLBACK_REPARENT, p);
@@ -2562,6 +2571,7 @@
        DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
 
+/*
 void
 ewl_widget_child_destroy_cb(Ewl_Widget * w, void *ev_data __UNUSED__,
                                void *user_data __UNUSED__)
@@ -2575,12 +2585,13 @@
 
        DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
-
+*/
 
 
 void
 ewl_widget_drag_down_cb(Ewl_Widget *w, void *ev_data ,
-                               void *user_data __UNUSED__) {
+                               void *user_data __UNUSED__)
+{
        Ewl_Event_Mouse_Down *ev;
 
        DENTER_FUNCTION(DLEVEL_STABLE);




-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to