[byzanz/0.2] layer: Uncrap the workaround

[Benjamin Otte <otte src gnome org>]

commit ebd0778cad5b93a98ab6a1dce1e447415cea18a4
Author: Benjamin Otte <otte redhat com>
Date:   Mon Feb 21 19:39:44 2011 +0100

    layer: Uncrap the workaround
    
    So that it actually works with cairo < 1.8.8 and doesn't use the
    workaround for cairo > 1.8.8

 src/byzanzlayerwindow.c |   15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)
---
diff --git a/src/byzanzlayerwindow.c b/src/byzanzlayerwindow.c
index e8737e8..abe1073 100644
--- a/src/byzanzlayerwindow.c
+++ b/src/byzanzlayerwindow.c
@@ -97,22 +97,10 @@ byzanz_layer_window_snapshot (ByzanzLayer *layer)
   return region;
 }
 
-#if CAIRO_VERSION < CAIRO_VERSION_ENCODE (1, 8, 8)
-  /* This fix is for RHEL6 only */
-static void
-byzanz_layer_window_render (ByzanzLayer *layer,
-                            cairo_t *    cr)
-{
-  cairo_t *tmp;
-
-  byzanz_cairo_set_source_window (cr, layer->recorder->window, 0, 0);
-  cairo_paint (cr);
-}
-#else
 static void
 byzanz_cairo_set_source_window (cairo_t *cr, GdkWindow *window, double x, double y)
 {
-#if CAIRO_VERSION < CAIRO_VERSION_ENCODE (1, 80, 10)
+#if CAIRO_VERSION < CAIRO_VERSION_ENCODE (1, 8, 10)
   /* This fix is for RHEL6 only */
   {
     static const cairo_user_data_key_t key;
@@ -162,7 +150,6 @@ byzanz_layer_window_render (ByzanzLayer *layer,
   byzanz_cairo_set_source_window (cr, layer->recorder->window, 0, 0);
   cairo_paint (cr);
 }
-#endif
 
 static void
 byzanz_layer_window_finalize (GObject *object)