[gimp/gtk3-port: 176/227] libgimpwidgets: move all GimpColorProfileStore members to a private struct

[Michael Natterer <mitch src gnome org>]

commit 9c721aaaa40345855f42915a8b223fe3f0595a77
Author: Michael Natterer <mitch gimp org>
Date:   Mon Jan 3 14:31:51 2011 +0100

    libgimpwidgets: move all GimpColorProfileStore members to a private struct

 libgimpwidgets/gimpcolorprofilestore.c |   52 +++++++++++++++++++------------
 libgimpwidgets/gimpcolorprofilestore.h |    4 +--
 2 files changed, 33 insertions(+), 23 deletions(-)
---
diff --git a/libgimpwidgets/gimpcolorprofilestore.c b/libgimpwidgets/gimpcolorprofilestore.c
index c2212da..a4a9cc7 100644
--- a/libgimpwidgets/gimpcolorprofilestore.c
+++ b/libgimpwidgets/gimpcolorprofilestore.c
@@ -54,6 +54,18 @@ enum
 };
 
 
+typedef struct _GimpColorProfileStorePrivate GimpColorProfileStorePrivate;
+
+struct _GimpColorProfileStorePrivate
+{
+  gchar *history;
+};
+
+#define GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE (obj, \
+                                                      GIMP_TYPE_COLOR_PROFILE_STORE, \
+                                                      GimpColorProfileStorePrivate)
+
+
 static void      gimp_color_profile_store_constructed    (GObject               *object);
 static void      gimp_color_profile_store_dispose        (GObject               *object);
 static void      gimp_color_profile_store_finalize       (GObject               *object);
@@ -112,6 +124,8 @@ gimp_color_profile_store_class_init (GimpColorProfileStoreClass *klass)
                                                         NULL,
                                                         G_PARAM_CONSTRUCT_ONLY |
                                                         GIMP_PARAM_READWRITE));
+
+  g_type_class_add_private (object_class, sizeof (GimpColorProfileStorePrivate));
 }
 
 static void
@@ -132,8 +146,9 @@ gimp_color_profile_store_init (GimpColorProfileStore *store)
 static void
 gimp_color_profile_store_constructed (GObject *object)
 {
-  GimpColorProfileStore *store = GIMP_COLOR_PROFILE_STORE (object);
-  GtkTreeIter            iter;
+  GimpColorProfileStore        *store   = GIMP_COLOR_PROFILE_STORE (object);
+  GimpColorProfileStorePrivate *private = GET_PRIVATE (store);
+  GtkTreeIter                   iter;
 
   if (G_OBJECT_CLASS (parent_class)->constructed)
     G_OBJECT_CLASS (parent_class)->constructed (object);
@@ -146,21 +161,18 @@ gimp_color_profile_store_constructed (GObject *object)
                       _("Select color profile from disk..."),
                       -1);
 
-  if (store->history)
-    {
-      gimp_color_profile_store_load (store, store->history, NULL);
-    }
+  if (private->history)
+    gimp_color_profile_store_load (store, private->history, NULL);
 }
 
 static void
 gimp_color_profile_store_dispose (GObject *object)
 {
-  GimpColorProfileStore *store = GIMP_COLOR_PROFILE_STORE (object);
+  GimpColorProfileStore        *store   = GIMP_COLOR_PROFILE_STORE (object);
+  GimpColorProfileStorePrivate *private = GET_PRIVATE (store);
 
-  if (store->history)
-    {
-      gimp_color_profile_store_save (store, store->history, NULL);
-    }
+  if (private->history)
+    gimp_color_profile_store_save (store, private->history, NULL);
 
   G_OBJECT_CLASS (parent_class)->dispose (object);
 }
@@ -168,12 +180,12 @@ gimp_color_profile_store_dispose (GObject *object)
 static void
 gimp_color_profile_store_finalize (GObject *object)
 {
-  GimpColorProfileStore *store = GIMP_COLOR_PROFILE_STORE (object);
+  GimpColorProfileStorePrivate *private = GET_PRIVATE (object);
 
-  if (store->history)
+  if (private->history)
     {
-      g_free (store->history);
-      store->history = NULL;
+      g_free (private->history);
+      private->history = NULL;
     }
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -185,13 +197,13 @@ gimp_color_profile_store_set_property (GObject      *object,
                                        const GValue *value,
                                        GParamSpec   *pspec)
 {
-  GimpColorProfileStore *store = GIMP_COLOR_PROFILE_STORE (object);
+  GimpColorProfileStorePrivate *private = GET_PRIVATE (object);
 
   switch (property_id)
     {
     case PROP_HISTORY:
-      g_return_if_fail (store->history == NULL);
-      store->history = g_value_dup_string (value);
+      g_return_if_fail (private->history == NULL);
+      private->history = g_value_dup_string (value);
       break;
 
     default:
@@ -206,12 +218,12 @@ gimp_color_profile_store_get_property (GObject    *object,
                                        GValue     *value,
                                        GParamSpec *pspec)
 {
-  GimpColorProfileStore *store = GIMP_COLOR_PROFILE_STORE (object);
+  GimpColorProfileStorePrivate *private = GET_PRIVATE (object);
 
   switch (property_id)
     {
     case PROP_HISTORY:
-      g_value_set_string (value, store->history);
+      g_value_set_string (value, private->history);
       break;
 
     default:
diff --git a/libgimpwidgets/gimpcolorprofilestore.h b/libgimpwidgets/gimpcolorprofilestore.h
index ce39a8d..dc7c06c 100644
--- a/libgimpwidgets/gimpcolorprofilestore.h
+++ b/libgimpwidgets/gimpcolorprofilestore.h
@@ -41,9 +41,7 @@ typedef struct _GimpColorProfileStoreClass  GimpColorProfileStoreClass;
 
 struct _GimpColorProfileStore
 {
-  GtkListStore       parent_instance;
-
-  gchar             *history;
+  GtkListStore  parent_instance;
 };
 
 struct _GimpColorProfileStoreClass