[gimp/soc-2011-seamless-clone2] app: missed two shell->canvas, use gimp_canvas_item_get_canvas() instead

[Clayton Walker <claytonw src gnome org>]

commit 885172a0ddcf3e539642675091acd1ad2c12a618
Author: Michael Natterer <mitch gimp org>
Date:   Thu Apr 18 14:44:09 2013 +0200

    app: missed two shell->canvas, use gimp_canvas_item_get_canvas() instead

 app/display/gimpcanvaspath.c        |    5 +++--
 app/display/gimpcanvassamplepoint.c |    3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/app/display/gimpcanvaspath.c b/app/display/gimpcanvaspath.c
index f4b17b1..b487429 100644
--- a/app/display/gimpcanvaspath.c
+++ b/app/display/gimpcanvaspath.c
@@ -250,14 +250,15 @@ gimp_canvas_path_get_extents (GimpCanvasItem   *item,
                               GimpDisplayShell *shell)
 {
   GimpCanvasPathPrivate *private = GET_PRIVATE (item);
+  GtkWidget             *canvas  = gimp_canvas_item_get_canvas (item);
 
-  if (private->path && gtk_widget_get_realized (shell->canvas))
+  if (private->path && gtk_widget_get_realized (canvas))
     {
       cairo_t               *cr;
       cairo_rectangle_int_t  rectangle;
       gdouble                x1, y1, x2, y2;
 
-      cr = gdk_cairo_create (gtk_widget_get_window (shell->canvas));
+      cr = gdk_cairo_create (gtk_widget_get_window (canvas));
 
       cairo_save (cr);
       cairo_translate (cr, -shell->offset_x, -shell->offset_y);
diff --git a/app/display/gimpcanvassamplepoint.c b/app/display/gimpcanvassamplepoint.c
index c639613..7682c90 100644
--- a/app/display/gimpcanvassamplepoint.c
+++ b/app/display/gimpcanvassamplepoint.c
@@ -219,6 +219,7 @@ gimp_canvas_sample_point_draw (GimpCanvasItem   *item,
                                cairo_t          *cr)
 {
   GimpCanvasSamplePointPrivate *private = GET_PRIVATE (item);
+  GtkWidget                    *canvas  = gimp_canvas_item_get_canvas (item);
   PangoLayout                  *layout;
   gdouble                       x, y;
   gint                          x1, x2, y1, y2;
@@ -246,7 +247,7 @@ gimp_canvas_sample_point_draw (GimpCanvasItem   *item,
 
   _gimp_canvas_item_stroke (item, cr);
 
-  layout = gimp_canvas_get_layout (GIMP_CANVAS (shell->canvas),
+  layout = gimp_canvas_get_layout (GIMP_CANVAS (canvas),
                                    "%d", private->index);
 
   cairo_move_to (cr, x + 2.5, y + 2.5);