[gimp] app: rename gimp_image_get, set, validate_icc_profile() to _icc_parasite()

[Michael Natterer <mitch src gnome org>]

commit ee2f9ee846ee67e744825f4abf79d1bee14a53d9
Author: Michael Natterer <mitch gimp org>
Date:   Tue Jun 16 23:56:53 2015 +0200

    app: rename gimp_image_get,set,validate_icc_profile() to _icc_parasite()
    
    to make sure we don't have some _icc_profile() functions that deal
    with raw data/size and some that deal with GimpParasite.

 app/actions/image-actions.c  |    2 +-
 app/core/gimpimage-profile.c |   20 ++++++++++----------
 app/core/gimpimage-profile.h |    6 +++---
 app/core/gimpimage.c         |    4 ++--
 app/file/file-open.c         |    2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/app/actions/image-actions.c b/app/actions/image-actions.c
index 8fd0f04..f3d6633 100644
--- a/app/actions/image-actions.c
+++ b/app/actions/image-actions.c
@@ -414,7 +414,7 @@ image_actions_update (GimpActionGroup *group,
 
       groups = ! gimp_item_stack_is_flat (GIMP_ITEM_STACK (layers));
 
-      profile = (gimp_image_get_icc_profile (image) != NULL);
+      profile = (gimp_image_get_icc_parasite (image) != NULL);
     }
 
 #define SET_SENSITIVE(action,condition) \
diff --git a/app/core/gimpimage-profile.c b/app/core/gimpimage-profile.c
index 95dca1d..762e991 100644
--- a/app/core/gimpimage-profile.c
+++ b/app/core/gimpimage-profile.c
@@ -68,9 +68,9 @@ static void   gimp_image_convert_profile_indexed (GimpImage                *imag
 /*  public functions  */
 
 gboolean
-gimp_image_validate_icc_profile (GimpImage           *image,
-                                 const GimpParasite  *icc_profile,
-                                 GError             **error)
+gimp_image_validate_icc_parasite (GimpImage           *image,
+                                  const GimpParasite  *icc_profile,
+                                  GError             **error)
 {
   GimpColorProfile *profile;
 
@@ -118,7 +118,7 @@ gimp_image_validate_icc_profile (GimpImage           *image,
 }
 
 const GimpParasite *
-gimp_image_get_icc_profile (GimpImage *image)
+gimp_image_get_icc_parasite (GimpImage *image)
 {
   g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
 
@@ -126,15 +126,15 @@ gimp_image_get_icc_profile (GimpImage *image)
 }
 
 void
-gimp_image_set_icc_profile (GimpImage          *image,
-                            const GimpParasite *icc_profile)
+gimp_image_set_icc_parasite (GimpImage          *image,
+                             const GimpParasite *icc_profile)
 {
   g_return_if_fail (GIMP_IS_IMAGE (image));
 
   if (icc_profile)
     {
-      g_return_if_fail (gimp_image_validate_icc_profile (image, icc_profile,
-                                                         NULL) == TRUE);
+      g_return_if_fail (gimp_image_validate_icc_parasite (image, icc_profile,
+                                                          NULL) == TRUE);
 
       gimp_image_parasite_attach (image, icc_profile);
     }
@@ -181,7 +181,7 @@ gimp_image_get_color_profile (GimpImage  *image,
   g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
-  parasite = gimp_image_get_icc_profile (image);
+  parasite = gimp_image_get_icc_parasite (image);
 
   if (parasite)
     return gimp_color_profile_open_from_data (gimp_parasite_data (parasite),
@@ -220,7 +220,7 @@ gimp_image_set_color_profile (GimpImage         *image,
       g_free (data);
     }
 
-  gimp_image_set_icc_profile (image, parasite);
+  gimp_image_set_icc_parasite (image, parasite);
 
   if (parasite)
     gimp_parasite_free (parasite);
diff --git a/app/core/gimpimage-profile.h b/app/core/gimpimage-profile.h
index 00cefa3..b0922c7 100644
--- a/app/core/gimpimage-profile.h
+++ b/app/core/gimpimage-profile.h
@@ -25,11 +25,11 @@
 #define GIMP_ICC_PROFILE_PARASITE_NAME "icc-profile"
 
 
-gboolean             gimp_image_validate_icc_profile   (GimpImage           *image,
+gboolean             gimp_image_validate_icc_parasite  (GimpImage           *image,
                                                         const GimpParasite  *icc_profile,
                                                         GError             **error);
-const GimpParasite * gimp_image_get_icc_profile        (GimpImage           *image);
-void                 gimp_image_set_icc_profile        (GimpImage           *image,
+const GimpParasite * gimp_image_get_icc_parasite       (GimpImage           *image);
+void                 gimp_image_set_icc_parasite       (GimpImage           *image,
                                                         const GimpParasite  *icc_profile);
 
 gboolean             gimp_image_validate_color_profile (GimpImage           *image,
diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c
index 33b6da4..a7dabe3 100644
--- a/app/core/gimpimage.c
+++ b/app/core/gimpimage.c
@@ -1368,7 +1368,7 @@ gimp_image_color_managed_get_icc_profile (GimpColorManaged *managed,
 {
   const GimpParasite *parasite;
 
-  parasite = gimp_image_get_icc_profile (GIMP_IMAGE (managed));
+  parasite = gimp_image_get_icc_parasite (GIMP_IMAGE (managed));
 
   if (parasite)
     {
@@ -3353,7 +3353,7 @@ gimp_image_parasite_validate (GimpImage           *image,
 
   if (strcmp (name, GIMP_ICC_PROFILE_PARASITE_NAME) == 0)
     {
-      return gimp_image_validate_icc_profile (image, parasite, error);
+      return gimp_image_validate_icc_parasite (image, parasite, error);
     }
 
   return TRUE;
diff --git a/app/file/file-open.c b/app/file/file-open.c
index 27c919b..0f3e33f 100644
--- a/app/file/file-open.c
+++ b/app/file/file-open.c
@@ -824,7 +824,7 @@ file_open_handle_color_profile (GimpImage    *image,
                                 GimpProgress *progress,
                                 GimpRunMode   run_mode)
 {
-  if (gimp_image_get_icc_profile (image))
+  if (gimp_image_get_icc_parasite (image))
     {
       gimp_image_undo_disable (image);