[gimp/gtk3-port: 61/227] app: didn't completely commit the display shell expose() -> draw() change

[Michael Natterer <mitch src gnome org>]

commit e32292a2bd1f5b09b303164dcd87c57a52f7f044
Author: Michael Natterer <mitch gimp org>
Date:   Wed Oct 20 13:24:12 2010 +0200

    app: didn't completely commit the display shell expose() -> draw() change

 app/display/gimpdisplayshell-callbacks.h | 8 ++++----
 app/display/gimpdisplayshell.c           | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/app/display/gimpdisplayshell-callbacks.h b/app/display/gimpdisplayshell-callbacks.h
index c81630c..a0bef6b 100644
--- a/app/display/gimpdisplayshell-callbacks.h
+++ b/app/display/gimpdisplayshell-callbacks.h
@@ -24,11 +24,11 @@ void       gimp_display_shell_canvas_realize          (GtkWidget        *widget,
 void       gimp_display_shell_canvas_size_allocate    (GtkWidget        *widget,
                                                        GtkAllocation    *alloc,
                                                        GimpDisplayShell *shell);
-gboolean   gimp_display_shell_canvas_expose           (GtkWidget        *widget,
-                                                       GdkEventExpose   *eevent,
+gboolean   gimp_display_shell_canvas_draw             (GtkWidget        *widget,
+                                                       cairo_t          *cr,
                                                        GimpDisplayShell *shell);
-gboolean   gimp_display_shell_canvas_expose_after     (GtkWidget        *widget,
-                                                       GdkEventExpose   *eevent,
+gboolean   gimp_display_shell_canvas_draw_after       (GtkWidget        *widget,
+                                                       cairo_t          *cr,
                                                        GimpDisplayShell *shell);
 
 gboolean   gimp_display_shell_origin_button_press     (GtkWidget        *widget,
diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
index b4288e5..a9a5ac9 100644
--- a/app/display/gimpdisplayshell.c
+++ b/app/display/gimpdisplayshell.c
@@ -561,11 +561,11 @@ gimp_display_shell_constructed (GObject *object)
   g_signal_connect (shell->canvas, "size-allocate",
                     G_CALLBACK (gimp_display_shell_canvas_size_allocate),
                     shell);
-  g_signal_connect (shell->canvas, "expose-event",
-                    G_CALLBACK (gimp_display_shell_canvas_expose),
+  g_signal_connect (shell->canvas, "draw",
+                    G_CALLBACK (gimp_display_shell_canvas_draw),
                     shell);
-  g_signal_connect_after (shell->canvas, "expose-event",
-                          G_CALLBACK (gimp_display_shell_canvas_expose_after),
+  g_signal_connect_after (shell->canvas, "draw",
+                          G_CALLBACK (gimp_display_shell_canvas_draw_after),
                           shell);
 
   g_signal_connect (shell->canvas, "enter-notify-event",