Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
handlers.c setup.c
Log Message:
Don't exit while in X error handler.
===================================================================
RCS file: /cvs/e/e16/e/src/handlers.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- handlers.c 13 Jan 2007 19:14:27 -0000 1.57
+++ handlers.c 2 Dec 2007 11:15:57 -0000 1.58
@@ -185,20 +185,6 @@
{
char buf[64];
- if ((ev->request_code == X_ChangeWindowAttributes)
- && (ev->error_code == BadAccess))
- {
- if (Mode.wm.xselect)
- {
- AlertX(_("Another Window Manager is already running"),
- _("OK"), NULL, NULL,
- _("Another Window Manager is already running.\n" "\n"
- "You will have to quit your current Window Manager first
before\n"
- "you can successfully run Enlightenment.\n"));
- EExit(1);
- }
- }
-
if (EDebug(1))
{
XGetErrorText(disp, ev->error_code, buf, 63);
@@ -206,6 +192,11 @@
ev->resourceid, ev->error_code,
ev->request_code, ev->minor_code, buf);
}
+
+ if (Mode.wm.xselect &&
+ (ev->request_code == X_ChangeWindowAttributes) &&
+ (ev->error_code == BadAccess))
+ Mode.wm.xselect = 0;
}
void
===================================================================
RCS file: /cvs/e/e16/e/src/setup.c,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -3 -r1.185 -r1.186
--- setup.c 11 Jul 2007 09:05:43 -0000 1.185
+++ setup.c 2 Dec 2007 11:15:57 -0000 1.186
@@ -159,7 +159,15 @@
StructureNotifyMask | SubstructureNotifyMask | SubstructureRedirectMask;
ESelectInput(VRoot.win, mask);
ESync();
-
+ if (!Mode.wm.xselect)
+ {
+ AlertX(_("Another Window Manager is already running"),
+ _("OK"), NULL, NULL,
+ _("Another Window Manager is already running.\n" "\n"
+ "You will have to quit your current Window Manager first
before\n"
+ "you can successfully run Enlightenment.\n"));
+ EExit(1);
+ }
Mode.wm.xselect = 0;
/* warn, if necessary about X version problems */
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
