--- xorg-server-1.3.0.0/GL/mesa/X/xf86glx.c.opengl-remote-or-xnest	2007-09-11 17:22:17.000000000 -0300
+++ xorg-server-1.3.0.0/GL/mesa/X/xf86glx.c	2007-09-11 17:50:07.000000000 -0300
@@ -298,19 +298,15 @@ find_mesa_visual(__GLXscreen *screen, Vi
 {
     __GLXMESAscreen *mesaScreen = (__GLXMESAscreen *) screen;
     const __GLcontextModes *modes;
-    unsigned i = 0;
+    int i;
 
-    for ( modes = screen->modes ; modes != NULL ; modes = modes->next ) {
+    for (i = 0, modes = screen->modes ; modes != NULL ; modes = modes->next, i++) {
 	if ( modes->visualID == vid ) {
 	    break;
 	}
-
-	i++;
     }
     
-    i--;
-
-    return (modes != NULL && i >=0 ) ? mesaScreen->xm_vis[i] : NULL;
+    return (modes != NULL) ? mesaScreen->xm_vis[i] : NULL;
 }
 
 static void init_screen_visuals(__GLXMESAscreen *screen)