Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_floater.c ewl_iconbox.c
Log Message:
* Fixed bug preventing floater/followers being destroyed properly
* Updated iconbox vis a vis above.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_floater.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ewl_floater.c 9 Oct 2005 05:18:39 -0000 1.5
+++ ewl_floater.c 15 Oct 2005 05:45:37 -0000 1.6
@@ -52,8 +52,6 @@
ewl_widget_appearance_set(w, "floater");
ewl_widget_inherit(w, "floater");
- ewl_callback_append(EWL_WIDGET(f), EWL_CALLBACK_DESTROY,
- ewl_floater_follow_destroy_cb, w);
DRETURN_INT(FALSE, DLEVEL_STABLE);
}
@@ -67,8 +65,10 @@
* Don't follow the old parent.
*/
if (f->follows) {
- ewl_callback_del_with_data(p, EWL_CALLBACK_CONFIGURE,
+ ewl_callback_del_with_data(f->follows, EWL_CALLBACK_CONFIGURE,
ewl_floater_follow_configure_cb, f);
+ ewl_callback_del_with_data(EWL_WIDGET(f->follows),
EWL_CALLBACK_DESTROY,
+ ewl_floater_follow_destroy_cb, f);
}
/*
@@ -78,6 +78,8 @@
if (p) {
ewl_callback_append(p, EWL_CALLBACK_CONFIGURE,
ewl_floater_follow_configure_cb, f);
+ ewl_callback_append(p, EWL_CALLBACK_DESTROY,
+ ewl_floater_follow_configure_cb, f);
}
f->follows = p;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_iconbox.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- ewl_iconbox.c 15 Oct 2005 03:08:32 -0000 1.29
+++ ewl_iconbox.c 15 Oct 2005 05:45:37 -0000 1.30
@@ -826,6 +826,8 @@
if (icon->label_compressed) {
free(icon->label_compressed);
}
+
+ ewl_widget_destroy(EWL_ICONBOX_ICON(w)->floater);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -931,6 +933,8 @@
//ewl_widget_hide(list_item);
//ewl_container_child_remove(EWL_CONTAINER(ib->ewl_iconbox_pane_inner),
EWL_WIDGET(list_item));
+ //
+
ewl_floater_follow_set(EWL_FLOATER(EWL_ICONBOX_ICON(list_item)->floater), NULL);
ewl_widget_destroy(EWL_WIDGET(list_item));
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
