enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

Fix for Ibox making E segv when window quits 

SVN revision: 18984
This commit is contained in:
Christopher Michael 2005-12-13 02:56:19 +00:00
parent c426bec3db
commit c69241e9e4
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/modules/ibox/e_mod_main.c
View File

@ -67,6 +67,7 @@ static int _ibox_box_cb_animator(void *data);
static int _ibox_box_cb_event_border_iconify(void *data, int type, void *event);
static int _ibox_box_cb_event_border_uniconify(void *data, int type, void *event);
static int _ibox_box_cb_event_border_remove(void *data, int type, void *event);
static void _ibox_icon_cb_intercept_move(void *data, Evas_Object *o, Evas_Coord x, Evas_Coord y);
static void _ibox_icon_cb_intercept_resize(void *data, Evas_Object *o, Evas_Coord w, Evas_Coord h);
@ -335,7 +336,9 @@ _ibox_box_new(IBox *ib, E_Container *con)
ecore_event_handler_add(E_EVENT_BORDER_ICONIFY, _ibox_box_cb_event_border_iconify, ibb);
ibb->ev_handler_border_uniconify =
ecore_event_handler_add(E_EVENT_BORDER_UNICONIFY, _ibox_box_cb_event_border_uniconify, ibb);
ibb->ev_handler_border_remove =
ecore_event_handler_add(E_EVENT_BORDER_REMOVE, _ibox_box_cb_event_border_remove, ibb);
bl = e_container_border_list_first(ibb->con);
while ((bd = e_container_border_list_next(bl)))
{
@ -411,6 +414,8 @@ _ibox_box_free(IBox_Box *ibb)
ecore_event_handler_del(ibb->ev_handler_border_iconify);
ecore_event_handler_del(ibb->ev_handler_border_uniconify);
ecore_event_handler_del(ibb->ev_handler_border_remove);
while (ibb->icons)
_ibox_icon_free(ibb->icons->data);
@ -1201,6 +1206,24 @@ _ibox_box_cb_event_border_uniconify(void *data, int type, void *event)
return 1;
}
static int
_ibox_box_cb_event_border_remove(void *data, int type, void *event)
{
E_Event_Border_Remove *ev;
IBox_Box *ibb;
IBox_Icon *ic;
ev = event;
ibb = data;
ic = _ibox_icon_find(ibb, ev->border);
if (ic)
_ibox_icon_free(ic);
_ibox_box_frame_resize(ibb);
return 1;
}
static void
_ibox_box_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change)
{

1
src/modules/ibox/e_mod_main.h
View File

@ -54,6 +54,7 @@ struct _IBox_Box
Ecore_Event_Handler *ev_handler_border_iconify;
Ecore_Event_Handler *ev_handler_border_uniconify;
Ecore_Event_Handler *ev_handler_border_remove;
double align, align_req;
double follow, follow_req;