[Xfce4-commits] <thunar:master> Workaround for crashes on RHEL5

[Andrzej]

Updating branch refs/heads/master
         to 8780e13f86378151899d3e701fff2320e963f6ac (commit)
       from 38e528cfe03d39ce6de3e82c3a338853352e21f4 (commit)

commit 8780e13f86378151899d3e701fff2320e963f6ac
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Sat Dec 7 03:50:03 2013 +0000

    Workaround for crashes on RHEL5
    
    Seems like a problem in cairo/x11.
    All cairo blend mode operators are affected.
    
    TODO: better fix with version checking and/or different operators.

 thunar/thunar-icon-renderer.c |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/thunar/thunar-icon-renderer.c b/thunar/thunar-icon-renderer.c
index f42cdc2..33ebbe0 100644
--- a/thunar/thunar-icon-renderer.c
+++ b/thunar/thunar-icon-renderer.c
@@ -322,7 +322,10 @@ thunar_icon_renderer_color_selected (cairo_t   *cr,
   gdk_cairo_set_source_color (cr, &widget->style->base[state]);
   cairo_set_operator (cr, CAIRO_OPERATOR_MULTIPLY);
 
-  cairo_mask (cr, source);
+  /* CAIRO_OPERATOR_MULTIPLY */
+  /* causes libx11 error: error_code 2 request_code 155 minor_code 8 */
+  /* with x11 1.0.3, xrender 0.9.1, cairo 1.12.2 */
+  /* cairo_mask (cr, source); */
 
   cairo_pattern_destroy (source);
   cairo_restore (cr);
@@ -340,7 +343,11 @@ thunar_icon_renderer_color_lighten (cairo_t   *cr,
 
   source = cairo_pattern_reference (cairo_get_source (cr));
   cairo_set_source_rgb (cr, .15, .15, .15);
-  cairo_set_operator (cr, CAIRO_OPERATOR_COLOR_DODGE);
+  /* CAIRO_OPERATOR_COLOR_DODGE */
+  /* causes libx11 error: error_code 2 request_code 155 minor_code 8 */
+  /* with x11 1.0.3, xrender 0.9.1, cairo 1.12.2 */
+  /* cairo_set_operator (cr, CAIRO_OPERATOR_COLOR_DODGE); */
+  cairo_set_operator (cr, CAIRO_OPERATOR_ADD);
 
   cairo_mask (cr, source);