Follow change in cairo API to add Screen* to

2005-07-20  Keith Packard  <keithp@keithp.com>

	* gdk/x11/gdkdrawable-x11.c: (gdk_x11_ref_cairo_surface):

	Follow change in cairo API to add Screen* to
	cairo_xlib_create_surface_for_bitmap

diff --git a/ChangeLog b/ChangeLog
index 363cba72b46cbba5acbefdedec8dd6b9d0ca105f..2ce4f300e745ecfaeaeea72468098514a90b3ea6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-20  Keith Packard  <keithp@keithp.com>
+
+       * gdk/x11/gdkdrawable-x11.c: (gdk_x11_ref_cairo_surface):
+
+       Follow change in cairo API to add Screen* to
+       cairo_xlib_create_surface_for_bitmap
+
 2005-07-20  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkicontheme.c (load_svg_at_size): Explicitly use the 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 363cba72b46cbba5acbefdedec8dd6b9d0ca105f..2ce4f300e745ecfaeaeea72468098514a90b3ea6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2005-07-20  Keith Packard  <keithp@keithp.com>
+
+       * gdk/x11/gdkdrawable-x11.c: (gdk_x11_ref_cairo_surface):
+
+       Follow change in cairo API to add Screen* to
+       cairo_xlib_create_surface_for_bitmap
+
 2005-07-20  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkicontheme.c (load_svg_at_size): Explicitly use the 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 363cba72b46cbba5acbefdedec8dd6b9d0ca105f..2ce4f300e745ecfaeaeea72468098514a90b3ea6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2005-07-20  Keith Packard  <keithp@keithp.com>
+
+       * gdk/x11/gdkdrawable-x11.c: (gdk_x11_ref_cairo_surface):
+
+       Follow change in cairo API to add Screen* to
+       cairo_xlib_create_surface_for_bitmap
+
 2005-07-20  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkicontheme.c (load_svg_at_size): Explicitly use the 

diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index 15a41c437272a3446a35ca03f4137041c7181ff8..e18208bde708208a27f5aacdf05133f94adc4c37 100644 (file)
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@@ -1485,6 +1485,7 @@ gdk_x11_ref_cairo_surface (GdkDrawable *drawable)
       else if (gdk_drawable_get_depth (drawable) == 1)
        impl->cairo_surface = cairo_xlib_surface_create_for_bitmap (GDK_SCREEN_XDISPLAY (impl->screen),
                                                                    impl->xid,
+                                                                   GDK_SCREEN_XSCREEN (impl->screen),
                                                                    width, height);
       else
        {