From b8663e868f9769bd11ad703af630794c37de7b7b Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 18 Mar 2005 23:51:31 +0000 Subject: [PATCH] Call cairo_surface_finish() 2005-03-18 Owen Taylor * gdk/x11/gdkdrawable-x11.c (_gdk_x11_drawable_finish): Call cairo_surface_finish() * gdk/gdkinternals.c gdk/x11/gdkdrawable-x11.c: Remoev _gdk_windowing_set_surface_device_offset(). --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gdk/gdkinternals.h | 4 ---- gdk/x11/gdkdrawable-x11.c | 9 +-------- 5 files changed, 25 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index f13aefd403..dfe5f80012 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-03-18 Owen Taylor + + * gdk/x11/gdkdrawable-x11.c (_gdk_x11_drawable_finish): + Call cairo_surface_finish() + + * gdk/gdkinternals.c gdk/x11/gdkdrawable-x11.c: Remoev + _gdk_windowing_set_surface_device_offset(). + 2005-03-18 Tor Lillqvist * gdk/win32/gdkevents-win32.c (gdk_event_translate): On diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f13aefd403..dfe5f80012 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2005-03-18 Owen Taylor + + * gdk/x11/gdkdrawable-x11.c (_gdk_x11_drawable_finish): + Call cairo_surface_finish() + + * gdk/gdkinternals.c gdk/x11/gdkdrawable-x11.c: Remoev + _gdk_windowing_set_surface_device_offset(). + 2005-03-18 Tor Lillqvist * gdk/win32/gdkevents-win32.c (gdk_event_translate): On diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f13aefd403..dfe5f80012 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2005-03-18 Owen Taylor + + * gdk/x11/gdkdrawable-x11.c (_gdk_x11_drawable_finish): + Call cairo_surface_finish() + + * gdk/gdkinternals.c gdk/x11/gdkdrawable-x11.c: Remoev + _gdk_windowing_set_surface_device_offset(). + 2005-03-18 Tor Lillqvist * gdk/win32/gdkevents-win32.c (gdk_event_translate): On diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h index 8aee134d02..ffe770017f 100644 --- a/gdk/gdkinternals.h +++ b/gdk/gdkinternals.h @@ -262,10 +262,6 @@ void _gdk_windowing_window_clear_area_e (GdkWindow *window, gint width, gint height); -void _gdk_windowing_set_surface_device_offset (cairo_surface_t *surface, - gint x_offset, - gint y_offset); - void _gdk_windowing_get_pointer (GdkDisplay *display, GdkScreen **screen, gint *x, diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c index 0c49e87e43..c502ffa56c 100644 --- a/gdk/x11/gdkdrawable-x11.c +++ b/gdk/x11/gdkdrawable-x11.c @@ -240,6 +240,7 @@ _gdk_x11_drawable_finish (GdkDrawable *drawable) if (impl->cairo_surface) { + cairo_surface_finish (impl->cairo_surface); cairo_surface_set_user_data (impl->cairo_surface, &gdk_x11_cairo_key, NULL, NULL); } @@ -1461,13 +1462,5 @@ gdk_x11_ref_cairo_surface (GdkDrawable *drawable) return impl->cairo_surface; } -void -_gdk_windowing_set_surface_device_offset (cairo_surface_t *surface, - gint x_offset, - gint y_offset) -{ - cairo_xlib_surface_set_device_offset (surface, x_offset, y_offset); -} - #define __GDK_DRAWABLE_X11_C__ #include "gdkaliasdef.c" -- GitLab