[cairo-commit] cairo/src cairo-xlib-surface.c,1.113,1.114

Owen Taylor commit at pdx.freedesktop.org
Mon Aug 22 01:11:27 EST 2005


Committed by: otaylor

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv9165/src

Modified Files:
	cairo-xlib-surface.c 
Log Message:
2005-08-21  Owen Taylor  <otaylor at redhat.com>

        * src/cairo-xlib-surface.c (_cairo_xlib_surface_create_internal):
        Recognize gentoo's (and maybe other distro's) modified
        server vendor string, where extra text is added to the
        upstream value. (#4068, reported by Doug Goldstein, others.
        Patch from Mart Raudsepp)


Index: cairo-xlib-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-xlib-surface.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- cairo-xlib-surface.c	20 Aug 2005 12:23:52 -0000	1.113
+++ cairo-xlib-surface.c	21 Aug 2005 15:11:24 -0000	1.114
@@ -1646,10 +1646,10 @@
     }
 
     surface->buggy_repeat = FALSE;
-    if (strcmp (ServerVendor (dpy), "The X.Org Foundation") == 0) {
+    if (strstr (ServerVendor (dpy), "The X.Org Foundation") != NULL) {
 	if (VendorRelease (dpy) <= 60802000)
 	    surface->buggy_repeat = TRUE;
-    } else if (strcmp (ServerVendor (dpy), "The XFree86 Project, Inc") == 0) {
+    } else if (strstr (ServerVendor (dpy), "The XFree86 Project, Inc") != NULL) {
 	if (VendorRelease (dpy) <= 40500000)
 	    surface->buggy_repeat = TRUE;
     }



More information about the cairo-commit mailing list