From f8b420783da92e17a5cb24fd8900e898853d274c Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Wed, 8 Sep 2010 22:20:34 +0200
Subject: [PATCH] tests: Connect to draw signal in testoffscreenwindow

---
 tests/testoffscreenwindow.c | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/tests/testoffscreenwindow.c b/tests/testoffscreenwindow.c
index ded2762bbe..c3b064c578 100644
--- a/tests/testoffscreenwindow.c
+++ b/tests/testoffscreenwindow.c
@@ -1,23 +1,16 @@
 #include <gtk/gtk.h>
 
 static gboolean
-da_expose (GtkWidget *widget,
-           GdkEventExpose *event,
-           gpointer user_data)
+da_draw (GtkWidget *widget,
+         cairo_t   *cr,
+         gpointer   user_data)
 {
   GtkOffscreenWindow *offscreen = (GtkOffscreenWindow *)user_data;
-  cairo_surface_t *surface;
-  cairo_t *cr;
 
-  if (gtk_widget_is_drawable (widget))
-    {
-      surface = gtk_offscreen_window_get_surface (offscreen);
-
-      cr = gdk_cairo_create (gtk_widget_get_window (widget));
-      cairo_set_source_surface (cr, surface, 50, 50);
-      cairo_paint (cr);
-      cairo_destroy (cr);
-    }
+  cairo_set_source_surface (cr,
+                            gtk_offscreen_window_get_surface (offscreen),
+                            50, 50);
+  cairo_paint (cr);
 
   return FALSE;
 }
@@ -73,8 +66,8 @@ main (int argc, char **argv)
   gtk_container_add (GTK_CONTAINER (window), da);
 
   g_signal_connect (da,
-                    "expose-event",
-                    G_CALLBACK (da_expose),
+                    "draw",
+                    G_CALLBACK (da_draw),
                     offscreen);
 
   g_signal_connect (offscreen,