summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.pre-2-107
-rw-r--r--ChangeLog.pre-2-87
-rw-r--r--gdk/x11/gdkdrawable-x11.c1
4 files changed, 22 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 363cba72b..2ce4f300e 100644
--- 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 363cba72b..2ce4f300e 100644
--- 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 363cba72b..2ce4f300e 100644
--- 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 15a41c437..e18208bde 100644
--- 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
{