[gimp] Move "tattoo_state" to GimpImagePrivate

[Michael Natterer <mitch src gnome org>]

commit bb624cb8c40fff4465735c4d6bc0edfa5990ad2a
Author: Michael Natterer <mitch gimp org>
Date:   Wed Feb 3 21:31:27 2010 +0100

    Move "tattoo_state" to GimpImagePrivate

 app/core/gimpimage-private.h |    2 ++
 app/core/gimpimage.c         |   16 ++++++++++------
 app/core/gimpimage.h         |    2 --
 3 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/app/core/gimpimage-private.h b/app/core/gimpimage-private.h
index 67dc115..5789701 100644
--- a/app/core/gimpimage-private.h
+++ b/app/core/gimpimage-private.h
@@ -47,6 +47,8 @@ struct _GimpImagePrivate
 
   gint               instance_count;        /*  number of instances          */
   gint               disp_count;            /*  number of displays           */
+
+  GimpTattoo         tattoo_state;          /*  the last used tattoo         */
 };
 
 #define GIMP_IMAGE_GET_PRIVATE(image) \
diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c
index c9004c7..0897300 100644
--- a/app/core/gimpimage.c
+++ b/app/core/gimpimage.c
@@ -610,7 +610,7 @@ gimp_image_init (GimpImage *image)
   private->instance_count      = 0;
   private->disp_count          = 0;
 
-  image->tattoo_state          = 0;
+  private->tattoo_state        = 0;
 
   image->projection            = gimp_projection_new (GIMP_PROJECTABLE (image));
 
@@ -2641,14 +2641,18 @@ gimp_image_parasite_detach (GimpImage   *image,
 GimpTattoo
 gimp_image_get_new_tattoo (GimpImage *image)
 {
+  GimpImagePrivate *private;
+
   g_return_val_if_fail (GIMP_IS_IMAGE (image), 0);
 
-  image->tattoo_state++;
+  private = GIMP_IMAGE_GET_PRIVATE (image);
+
+  private->tattoo_state++;
 
-  if (G_UNLIKELY (image->tattoo_state == 0))
+  if (G_UNLIKELY (private->tattoo_state == 0))
     g_warning ("%s: Tattoo state corrupted (integer overflow).", G_STRFUNC);
 
-  return image->tattoo_state;
+  return private->tattoo_state;
 }
 
 GimpTattoo
@@ -2656,7 +2660,7 @@ gimp_image_get_tattoo_state (GimpImage *image)
 {
   g_return_val_if_fail (GIMP_IS_IMAGE (image), 0);
 
-  return image->tattoo_state;
+  return GIMP_IMAGE_GET_PRIVATE (image)->tattoo_state;
 }
 
 gboolean
@@ -2726,7 +2730,7 @@ gimp_image_set_tattoo_state (GimpImage  *image,
 
   /* Must check if the state is valid */
   if (retval == TRUE)
-    image->tattoo_state = val;
+    GIMP_IMAGE_GET_PRIVATE (image)->tattoo_state = val;
 
   return retval;
 }
diff --git a/app/core/gimpimage.h b/app/core/gimpimage.h
index d5520b1..90c6d42 100644
--- a/app/core/gimpimage.h
+++ b/app/core/gimpimage.h
@@ -105,8 +105,6 @@ struct _GimpImage
 
   Gimp              *gimp;                  /*  the GIMP the image belongs to*/
 
-  GimpTattoo         tattoo_state;          /*  the last used tattoo         */
-
   GimpProjection    *projection;            /*  projection layers & channels */
   GeglNode          *graph;                 /*  GEGL projection graph        */