Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
ewin-ops.c ewins.c ewins.h
Log Message:
Fix segv when destroying client.
===================================================================
RCS file: /cvs/e/e16/e/src/ewin-ops.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -3 -r1.97 -r1.98
--- ewin-ops.c 3 May 2006 20:52:15 -0000 1.97
+++ ewin-ops.c 3 May 2006 21:04:08 -0000 1.98
@@ -1502,7 +1502,7 @@
EwinOpKill(EWin * ewin, int source __UNUSED__)
{
SoundPlay("SOUND_WINDOW_CLOSE");
- EDestroyWindow(_EwinGetClientWin(ewin));
+ EwinKill(ewin);
}
void
===================================================================
RCS file: /cvs/e/e16/e/src/ewins.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -3 -r1.161 -r1.162
--- ewins.c 3 May 2006 20:52:15 -0000 1.161
+++ ewins.c 3 May 2006 21:04:08 -0000 1.162
@@ -1457,6 +1457,19 @@
EwinDestroy(ewin);
}
+void
+EwinKill(EWin * ewin)
+{
+ if (EwinIsInternal(ewin))
+ return;
+
+ EwinUnmap1(ewin);
+ EoUnmap(ewin);
+ EwinUnmap2(ewin);
+
+ EwinDestroy(ewin);
+}
+
const char *
EwinGetName(const EWin * ewin)
{
===================================================================
RCS file: /cvs/e/e16/e/src/ewins.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- ewins.h 3 May 2006 20:52:15 -0000 1.50
+++ ewins.h 3 May 2006 21:04:08 -0000 1.51
@@ -295,6 +295,7 @@
void EwinLower(EWin * ewin);
void EwinShow(EWin * ewin);
void EwinHide(EWin * ewin);
+void EwinKill(EWin * ewin);
void DetermineEwinFloat(EWin * ewin, int dx, int dy);
EWin *GetEwinPointerInClient(void);
EWin *GetEwinByCurrentPointer(void);
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
