Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibox
Modified Files:
e_mod_main.h e_mod_main.c
Log Message:
Fix for Ibox making E segv when window quits
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_main.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_mod_main.h 8 Oct 2005 01:30:39 -0000 1.7
+++ e_mod_main.h 13 Dec 2005 02:56:19 -0000 1.8
@@ -54,6 +54,7 @@
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;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_main.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- e_mod_main.c 4 Nov 2005 00:21:34 -0000 1.24
+++ e_mod_main.c 13 Dec 2005 02:56:19 -0000 1.25
@@ -67,6 +67,7 @@
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 @@
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 @@
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 @@
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)
{
-------------------------------------------------------
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://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
