[PATCH 4/4] xcb: Use a normal image surface if SHM fails

[Uli Schlachter]

If we can't use SHM, we still have PutImage. So instead of returning the error
to the caller, it makes sense to retry with a normal image surface.

Signed-off-by: Uli Schlachter <psychon at znc.in>
---
 src/cairo-xcb-surface.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c
index 33e42ce..c350f6f 100644
--- a/src/cairo-xcb-surface.c
+++ b/src/cairo-xcb-surface.c
@@ -159,8 +159,7 @@ _cairo_xcb_surface_create_similar_image (cairo_xcb_surface_t *other,
 							pixman_format,
 							width, height,
 							&image);
-	if (_cairo_status_is_error (status))
-	    return _cairo_surface_create_in_error (status);
+	/* Ignore errors and fall through */
     }
 #endif
 
-- 
1.7.2.3


--------------060000060309050604010504
Content-Type: application/octet-stream;
 name="0001-xcb-Limit-the-amount-of-SHM-used.patch.sig"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename="0001-xcb-Limit-the-amount-of-SHM-used.patch.sig"

iQEcBAABCAAGBQJNRZ4AAAoJECLkKOvLj8sG05kH/j5qpL/F6SaMWZ2Kqsq8z0fQLY2D/PsP
6hatbihloIocYokcyJlwZSkPI2Hl5VL/jiDCs0yiZ8YvAs73wRv2CdhqILIXYFPKM/0ybBAv
zITEMRNBkCbI0cTp8tJyYibbNFXKtLrlwzEeWvquPz5fDNFCyDP3R6NSaz9+kxaAF/esF6a6
CJrGPRHRkJuBl+xsxHGT98aZjX7lhT9VGrCTQnuhlnXaRxA2UgedZwMwpBvvFADpwm8ZOX7z
mfM8RIh0lOF5gPapuPFsgG1lGw0WcC4wIV3p4bq8W2qk8Et1z4Sgb8nM5f8RG4CD5Hqa8wqc
FeDDyp7XJyUuW0LIX3Zge/0=
--------------060000060309050604010504
Content-Type: application/octet-stream;
 name="0002-xcb-Remove-a-duplicate-static-function.patch.sig"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename="0002-xcb-Remove-a-duplicate-static-function.patch.sig"

iQEcBAABCAAGBQJNRZ4AAAoJECLkKOvLj8sGA30H/RtHfzMqfqliSjSiFSFc7+l48SlIijwm
0xELv9YkPQnLE5y84H2pmqVQPwtceNUSBUAjvqEnJY7wE4N4YiNaW9R/jgXgp6XoIm8r+LST
NldxY69/x7vxGMfny1vJCDwIaQ33mGqXZCwQGTMV+jY3wfgt4T15Il2317FAPFosY3YyezfV
YU/ADVbh/3kDpMrg8A7s3KK6Xhko+mUuTJzbYeXou47n71CygLRR3WqBAHXucGW7DLRih0A8
vw0lET5TZ+0jpeVvKQYASKltZp8ghTBAX71K2WaLElJpZIxKIWTfXoA5pGzgkbqlKw96VB3D
fWo26TMC9/+mg6KK/aWrK3Q=
--------------060000060309050604010504
Content-Type: application/octet-stream;
 name="0003-xcb-Move-the-allocation-of-a-shm-surface-into-its-ow.patch.sig"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename*0="0003-xcb-Move-the-allocation-of-a-shm-surface-into-its-ow.pa";
 filename*1="tch.sig"

iQEcBAABCAAGBQJNRZ4AAAoJECLkKOvLj8sG4hAH/RvevBtwNZDyccshfqVnoc7u+ho/M0/H
SGjqL6il97cRgSQ5xwPO8WMloTXq7Z+xLz6/fWzywxwxB13QHzlOhyP7gjUeaZI1TQfAqrnt
sFl7fDZ5veFk5hX5C9JGJuiII9bZukJP7i/4Gvk2gmRdM6QCH7ZrEghWhuHw4vw2BfpTI4lY
wxQz9Rc18vyzKjFoa0ErE2SwJWaSE4tIfMzUOhvw7Abftgimhgz8Nx+BhHnybi2GZnWAs0d0
plxecBo9aOF0eBKNfc7xs8s5dgL0dCndSnGKcO/Qpd9wpBIjuD/AZTwZwvuwryRCieDP57ai
X9kieWV+63KZyHTRoMUsR2E=
--------------060000060309050604010504
Content-Type: application/octet-stream;
 name="0004-xcb-Use-a-normal-image-surface-if-SHM-fails.patch.sig"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename*0="0004-xcb-Use-a-normal-image-surface-if-SHM-fails.patch.sig"

iQEcBAABCAAGBQJNRZ4AAAoJECLkKOvLj8sG5AsH/0waOAVbaO9VepwrsTSVCkOINtVmUUVF
VXIrO4G0WWgTNRTgEyFAcxhDdtmI5pyv/djRsNvzfGDqcIE7SIT4U9Nd6H5A/5+b7+SfI8jg
t9XWDQA+E+KFD3UZygx6TPZ0HqPia+nWXf+YOuN7xiGi/zyJjufxD4dlOtvseqSYEI4XqH1Q
m9YYQyv27icBXJKf3ASlb3GcTFirCPoqLDKb/h7nkUNzx0yxdO5IHsuUvI9e/VAiie4XJCO8
KiVEmQTsQAQ2YTyC0AmamclTv8u3F2Gz0FGXJgRBRLSZM08EUDs3cUpT8xj0yMd15WhfNE6D
HUBGd5FL4fiC+R+pawroZaY=
--------------060000060309050604010504--