Fix cairo_content_t <-> cairo_format_t confusion. (#310086, Carlos

2005-07-12  Matthias Clasen  <mclasen@redhat.com>

	* gdk/gdkgc.c (make_stipple_tile_surface): Fix
	cairo_content_t <-> cairo_format_t confusion.  (#310086,
	Carlos Garnacho Parro)

diff --git a/ChangeLog b/ChangeLog
index 249d872ab77fe2714e78d8424a4a26b4c301bb3b..7538740941a09c07d4c92c467f6c5509d8f97318 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-07-12  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/gdkgc.c (make_stipple_tile_surface): Fix 
+       cairo_content_t <-> cairo_format_t confusion.  (#310086,
+       Carlos Garnacho Parro)
+
        * gtk/gtkfilesystemunix.c 
        (gtk_file_system_unix_volume_get_display_name): Follow
        the Nautilus change and rename "Filesystem" to "File System",

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 249d872ab77fe2714e78d8424a4a26b4c301bb3b..7538740941a09c07d4c92c467f6c5509d8f97318 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2005-07-12  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/gdkgc.c (make_stipple_tile_surface): Fix 
+       cairo_content_t <-> cairo_format_t confusion.  (#310086,
+       Carlos Garnacho Parro)
+
        * gtk/gtkfilesystemunix.c 
        (gtk_file_system_unix_volume_get_display_name): Follow
        the Nautilus change and rename "Filesystem" to "File System",

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 249d872ab77fe2714e78d8424a4a26b4c301bb3b..7538740941a09c07d4c92c467f6c5509d8f97318 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2005-07-12  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/gdkgc.c (make_stipple_tile_surface): Fix 
+       cairo_content_t <-> cairo_format_t confusion.  (#310086,
+       Carlos Garnacho Parro)
+
        * gtk/gtkfilesystemunix.c 
        (gtk_file_system_unix_volume_get_display_name): Follow
        the Nautilus change and rename "Filesystem" to "File System",

diff --git a/gdk/gdkgc.c b/gdk/gdkgc.c
index b29fecb6089d33485ca1595a1f36f3498272ee6e..6a6f12047daaf4c8d25d43b292c8e79e333c6e6b 100644 (file)
--- a/gdk/gdkgc.c
+++ b/gdk/gdkgc.c
@@ -1045,7 +1045,7 @@ make_stipple_tile_surface (cairo_t   *cr,
   alpha_surface = _gdk_drawable_ref_cairo_surface (stipple);
   
   surface = cairo_surface_create_similar (cairo_get_target (cr),
-                                         CAIRO_FORMAT_ARGB32,
+                                         CAIRO_CONTENT_COLOR_ALPHA,
                                          width, height);
 
   tmp_cr = cairo_create (surface);