Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/bin
Modified Files:
evas_software_xcb_main.c evas_xrender_xcb_main.c
Log Message:
free the event and don't use deprecated XCBSync function
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/bin/evas_software_xcb_main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- evas_software_xcb_main.c 12 Sep 2006 07:35:49 -0000 1.10
+++ evas_software_xcb_main.c 12 Sep 2006 07:48:44 -0000 1.11
@@ -295,13 +295,8 @@
if (ev->detail.id == 3)
{
- setdown();
- evas_free(evas);
free(e);
- XCBDisconnect(conn);
- evas_shutdown();
- exit(0);
-
+ goto exit;
}
#if 0
if (!pause_me)
@@ -361,6 +356,7 @@
usleep(100000);
}
+ exit:
setdown();
evas_free(evas);
XCBDisconnect(conn);
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/bin/evas_xrender_xcb_main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_xrender_xcb_main.c 12 Sep 2006 07:35:49 -0000 1.3
+++ evas_xrender_xcb_main.c 12 Sep 2006 07:48:44 -0000 1.4
@@ -102,6 +102,7 @@
XCBConnection *conn;
const XCBQueryExtensionRep *rep_shm;
const XCBQueryExtensionRep *rep_xrender;
+ XCBGetInputFocusRep *reply;
XCBSCREEN *screen;
XCBDRAWABLE win;
XCBGenericEvent *e;
@@ -154,7 +155,11 @@
XSetWMNormalHints(disp, win, &szhints);
#endif
XCBMapWindow (conn, win.window);
- XCBSync(conn, 0);
+ /* we sync */
+ reply = XCBGetInputFocusReply(conn,
+ XCBGetInputFocusUnchecked(conn),
+ NULL);
+ free(reply);
/* test evas_free.... :) */
evas_init();
@@ -187,7 +192,10 @@
XCBButtonPressEvent *ev = (XCBButtonPressEvent *)e;
if (ev->detail.id == 3)
- goto exit;
+ {
+ free(e);
+ goto exit;
+ }
#if 0
if (!pause_me)
pause_me = 1;
-------------------------------------------------------------------------
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
