[gimp] Move some container handlers to GimpImagePrivate

[Michael Natterer <mitch src gnome org>]

commit 67014260dd3ed7ee0b2f5be6f2be4f5895f7b821
Author: Michael Natterer <mitch gimp org>
Date:   Wed Feb 3 23:05:49 2010 +0100

    Move some container handlers to GimpImagePrivate

 app/core/gimpimage-private.h |    4 ++++
 app/core/gimpimage.c         |   14 +++++++-------
 app/core/gimpimage.h         |    4 ----
 3 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/app/core/gimpimage-private.h b/app/core/gimpimage-private.h
index 773cb01..4132273 100644
--- a/app/core/gimpimage-private.h
+++ b/app/core/gimpimage-private.h
@@ -62,6 +62,10 @@ struct _GimpImagePrivate
   GimpContainer     *channels;              /*  the list of masks            */
   GimpContainer     *vectors;               /*  the list of vectors          */
   GSList            *layer_stack;           /*  the layers in MRU order      */
+
+  GQuark             layer_alpha_handler;
+  GQuark             channel_name_changed_handler;
+  GQuark             channel_color_changed_handler;
 };
 
 #define GIMP_IMAGE_GET_PRIVATE(image) \
diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c
index b36cd51..005b6be 100644
--- a/app/core/gimpimage.c
+++ b/app/core/gimpimage.c
@@ -627,7 +627,7 @@ gimp_image_init (GimpImage *image)
                             G_CALLBACK (gimp_image_invalidate),
                             image);
 
-  image->layer_alpha_handler =
+  private->layer_alpha_handler =
     gimp_container_add_handler (private->layers, "alpha-changed",
                                 G_CALLBACK (gimp_image_layer_alpha_changed),
                                 image);
@@ -636,11 +636,11 @@ gimp_image_init (GimpImage *image)
                             G_CALLBACK (gimp_image_invalidate),
                             image);
 
-  image->channel_name_changed_handler =
+  private->channel_name_changed_handler =
     gimp_container_add_handler (private->channels, "name-changed",
                                 G_CALLBACK (gimp_image_channel_name_changed),
                                 image);
-  image->channel_color_changed_handler =
+  private->channel_color_changed_handler =
     gimp_container_add_handler (private->channels, "color-changed",
                                 G_CALLBACK (gimp_image_channel_color_changed),
                                 image);
@@ -839,16 +839,16 @@ gimp_image_dispose (GObject *object)
                                         image);
 
   gimp_container_remove_handler (private->layers,
-                                 image->layer_alpha_handler);
+                                 private->layer_alpha_handler);
 
   g_signal_handlers_disconnect_by_func (private->channels,
                                         gimp_image_invalidate,
                                         image);
 
   gimp_container_remove_handler (private->channels,
-                                 image->channel_name_changed_handler);
+                                 private->channel_name_changed_handler);
   gimp_container_remove_handler (private->channels,
-                                 image->channel_color_changed_handler);
+                                 private->channel_color_changed_handler);
 
   g_signal_handlers_disconnect_by_func (private->channels,
                                         gimp_image_channel_add,
@@ -859,7 +859,7 @@ gimp_image_dispose (GObject *object)
 
   gimp_container_foreach (private->layers,   (GFunc) gimp_item_removed, NULL);
   gimp_container_foreach (private->channels, (GFunc) gimp_item_removed, NULL);
-  gimp_container_foreach (private->vectors, (GFunc) gimp_item_removed, NULL);
+  gimp_container_foreach (private->vectors,  (GFunc) gimp_item_removed, NULL);
 
   G_OBJECT_CLASS (parent_class)->dispose (object);
 }
diff --git a/app/core/gimpimage.h b/app/core/gimpimage.h
index bc727ec..62ef196 100644
--- a/app/core/gimpimage.h
+++ b/app/core/gimpimage.h
@@ -105,10 +105,6 @@ struct _GimpImage
 
   Gimp              *gimp;                  /*  the GIMP the image belongs to*/
 
-  GQuark             layer_alpha_handler;
-  GQuark             channel_name_changed_handler;
-  GQuark             channel_color_changed_handler;
-
   GimpLayer         *active_layer;          /*  the active layer             */
   GimpChannel       *active_channel;        /*  the active channel           */
   GimpVectors       *active_vectors;        /*  the active vectors           */