summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2005-08-27 18:49:06 +0000
committerOwen Taylor <otaylor@redhat.com>2005-08-27 18:49:06 +0000
commit30e3d538dfbd763872117760ec473481e2c5926d (patch)
tree715f9fd586de716d23f3943b166aa8d1077ad9dd
parenta6acc962f76c1eba9dec3ee1646413f6c82ac6e0 (diff)
Make the vendor string check for XFree86 more liberal, to deal with older versions of gentoo that modified it in a different way. (#4231, fix from Billy Biggs)
-rw-r--r--ChangeLog7
-rw-r--r--src/cairo-xlib-surface.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0b9154ee8..ac429fa0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2005-08-27 Owen Taylor <otaylor@redhat.com>
+ * src/cairo-xlib-surface.c (_cairo_xlib_surface_create_internal):
+ Make the vendor string check for XFree86 more liberal, to deal
+ with older versions of gentoo that modified it in a different
+ way. (#4231, fix from Billy Biggs)
+
+2005-08-27 Owen Taylor <otaylor@redhat.com>
+
* src/cairoint.h: Undef MIN/MAX before defining them in case
some system header happens to define them. (#4196, Christian
Biesinger)
diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
index d52642a7c..9e7979fdb 100644
--- a/src/cairo-xlib-surface.c
+++ b/src/cairo-xlib-surface.c
@@ -1649,7 +1649,7 @@ _cairo_xlib_surface_create_internal (Display *dpy,
if (strstr (ServerVendor (dpy), "The X.Org Foundation") != NULL) {
if (VendorRelease (dpy) <= 60802000)
surface->buggy_repeat = TRUE;
- } else if (strstr (ServerVendor (dpy), "The XFree86 Project, Inc") != NULL) {
+ } else if (strstr (ServerVendor (dpy), "XFree86") != NULL) {
if (VendorRelease (dpy) <= 40500000)
surface->buggy_repeat = TRUE;
}