[Xfce4-commits] [xfce/thunar] 02/02: Revert "Workaround for crashes on RHEL5"

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

andrzejr pushed a commit to branch master
in repository xfce/thunar.

commit c87e97d128ec5b0a06f063d29b2e177b5b4e1e86
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Thu Jan 29 00:11:50 2015 +0000

    Revert "Workaround for crashes on RHEL5"
    
    This reverts commit 8780e13f86378151899d3e701fff2320e963f6ac.
---
 thunar/thunar-icon-renderer.c |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/thunar/thunar-icon-renderer.c b/thunar/thunar-icon-renderer.c
index 8ffa0d3..556ac92 100644
--- a/thunar/thunar-icon-renderer.c
+++ b/thunar/thunar-icon-renderer.c
@@ -322,10 +322,7 @@ 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_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_mask (cr, source);
 
   cairo_pattern_destroy (source);
   cairo_restore (cr);
@@ -343,11 +340,7 @@ 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_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_set_operator (cr, CAIRO_OPERATOR_COLOR_DODGE);
 
   cairo_mask (cr, source);
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.