Enlightenment CVS committal Author : doursse Project : e17 Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/xrender_xcb Modified Files: evas_engine_font.c evas_engine_image.c evas_engine_ximage.c Log Message: update to the new xcb api =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/modules/engines/xrender_xcb/evas_engine_font.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- evas_engine_font.c 10 Mar 2006 19:10:07 -0000 1.1 +++ evas_engine_font.c 15 Mar 2006 21:14:34 -0000 1.2 @@ -31,7 +31,7 @@ if ((fs->xcbinf->conn == xcbinf->conn) && (fs->xcbinf->root.window.xid == xcbinf->root.window.xid)) return fs; - snprintf(buf, sizeof(buf), "@%p@/@%lx@", fs->xcbinf->conn, fs->xcbinf->root.window.xid); + snprintf(buf, sizeof(buf), "@%p@/@%x@", fs->xcbinf->conn, fs->xcbinf->root.window.xid); pool = evas_hash_find(_xr_fg_pool, buf); if (pool) { @@ -50,7 +50,7 @@ fs->w = w; fs->h = h; - snprintf(buf, sizeof(buf), "@%p@/@%lx@", fs->xcbinf->conn, fs->xcbinf->root.window.xid); + snprintf(buf, sizeof(buf), "@%p@/@%x@", fs->xcbinf->conn, fs->xcbinf->root.window.xid); pool = evas_hash_find(_xr_fg_pool, buf); snprintf(buf2, sizeof(buf2), "%p", fg); pool = evas_hash_add(pool, buf2, fs); @@ -137,7 +137,7 @@ fs = fdata; pool = data; - snprintf(buf, sizeof(buf), "@%p@/@%lx@", fs->xcbinf->conn, fs->xcbinf->root.window.xid); + snprintf(buf, sizeof(buf), "@%p@/@%x@", fs->xcbinf->conn, fs->xcbinf->root.window.xid); pool = evas_hash_del(pool, buf, fs); hash = evas_hash_modify(hash, key, pool); return 1; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/modules/engines/xrender_xcb/evas_engine_image.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- evas_engine_image.c 10 Mar 2006 19:10:07 -0000 1.1 +++ evas_engine_image.c 15 Mar 2006 21:14:34 -0000 1.2 @@ -73,9 +73,9 @@ if (!file) return NULL; if (key) - snprintf(buf, sizeof(buf), "/@[EMAIL PROTECTED]@/%s//://%s", xcbinf->conn, xcbinf->root.window.xid, file, key); + snprintf(buf, sizeof(buf), "/@[EMAIL PROTECTED]@/%s//://%s", xcbinf->conn, xcbinf->root.window.xid, file, key); else - snprintf(buf, sizeof(buf), "/@[EMAIL PROTECTED]@/%s", xcbinf->conn, xcbinf->root.window.xid, file); + snprintf(buf, sizeof(buf), "/@[EMAIL PROTECTED]@/%s", xcbinf->conn, xcbinf->root.window.xid, file); im = __xre_image_find(buf); if (im) { =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/modules/engines/xrender_xcb/evas_engine_ximage.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- evas_engine_ximage.c 10 Mar 2006 19:10:07 -0000 1.1 +++ evas_engine_ximage.c 15 Mar 2006 21:14:34 -0000 1.2 @@ -312,7 +312,7 @@ XCBConnSetupSuccessRep *rep; XCBSCREENIter iter_screen; - rep = XCBGetSetup(xcbinf->conn); + rep = (XCBConnSetupSuccessRep *)XCBGetSetup(xcbinf->conn); iter_screen = XCBConnSetupSuccessRepRootsIter(rep); for (; iter_screen.rem ; XCBSCREENNext (&iter_screen)) { XCBDEPTHIter iter_depth; ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs