Enlightenment CVS committal Author : raster Project : e17 Module : apps/e
Dir : e17/apps/e/src/bin Modified Files: e_border.c e_container.c Log Message: safety from setting null zone =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.541 retrieving revision 1.542 diff -u -3 -r1.541 -r1.542 --- e_border.c 6 Sep 2006 18:04:13 -0000 1.541 +++ e_border.c 14 Sep 2006 23:16:46 -0000 1.542 @@ -508,7 +508,7 @@ E_OBJECT_CHECK(bd); E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE); - if (!bd->pre_res_change.valid) return ; + if (!bd->pre_res_change.valid) return; memcpy(&pre_res_change, &bd->pre_res_change, sizeof(pre_res_change)); @@ -571,7 +571,8 @@ E_OBJECT_CHECK(zone); E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE); if (bd->zone == zone) return; - + if (!zone) return; + /* if the window does not lie in the new zone, move it so that it does */ if (!E_INTERSECTS(bd->x, bd->y, bd->w, bd->h, zone->x, zone->y, zone->w, zone->h)) { =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_container.c,v retrieving revision 1.109 retrieving revision 1.110 diff -u -3 -r1.109 -r1.110 --- e_container.c 5 Sep 2006 13:49:16 -0000 1.109 +++ e_container.c 14 Sep 2006 23:16:46 -0000 1.110 @@ -569,6 +569,7 @@ { int pos = 0; + if (!bd->zone) return; if (bd->layer == 0) pos = 0; else if ((bd->layer > 0) && (bd->layer <= 50)) pos = 1; else if ((bd->layer > 50) && (bd->layer <= 100)) pos = 2; @@ -645,6 +646,7 @@ Evas_List *l; int pos = 0, i; + if (!bd->zone) return; /* Remove from old layer */ for (i = 0; i < 7; i++) { @@ -698,6 +700,7 @@ Evas_List *l; int pos = 0, i; + if (!bd->zone) return; /* Remove from old layer */ for (i = 0; i < 7; i++) { @@ -748,6 +751,7 @@ { int pos = 0, i; + if (!bd->zone) return; /* Remove from old layer */ for (i = 0; i < 7; i++) { @@ -780,6 +784,7 @@ { int pos = 0, i; + if (!bd->zone) return; /* Remove from old layer */ for (i = 0; i < 7; i++) { ------------------------------------------------------------------------- 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