[gimp] app: behave as if "show all" is disabled in GimpCanvasGrid when keeping padding

[Ell <ell src gnome org>]

commit f418ac3e2d83356f5330ade49ea7c43298a1338a
Author: Ell <ell_se yahoo com>
Date:   Sun Sep 15 16:28:13 2019 +0300

    app: behave as if "show all" is disabled in GimpCanvasGrid when keeping padding

 app/display/gimpcanvasgrid.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/app/display/gimpcanvasgrid.c b/app/display/gimpcanvasgrid.c
index 3764f27244..23b46ee773 100644
--- a/app/display/gimpcanvasgrid.c
+++ b/app/display/gimpcanvasgrid.c
@@ -221,11 +221,11 @@ gimp_canvas_grid_draw (GimpCanvasItem *item,
   x2 = ceil  (dx2) + 1;
   y2 = ceil  (dy2) + 1;
 
-  if (! shell->show_all)
+  if (! gimp_display_shell_get_infinite_canvas (shell))
     {
       GeglRectangle bounds;
 
-      gimp_display_shell_scale_get_image_unrotated_bounding_box (
+      gimp_display_shell_scale_get_image_unrotated_bounds (
         shell,
         &bounds.x, &bounds.y, &bounds.width, &bounds.height);
 
@@ -349,7 +349,7 @@ gimp_canvas_grid_get_extents (GimpCanvasItem *item)
   if (! image)
     return NULL;
 
-  if (! shell->show_all)
+  if (! gimp_display_shell_get_infinite_canvas (shell))
     {
       
       gdouble x1, y1;