[gimp] app: Rename the pallete loading functions from last commit.

[Michael Henning <mhenning src gnome org>]

commit d02dd9f0da778640a0a8a82420ee22f9a6efc943
Author: Michael Henning <drawoc darkrefraction com>
Date:   Tue Sep 17 18:57:28 2013 -0400

    app: Rename the pallete loading functions from last commit.

 app/core/gimp.c               |    4 ++--
 app/core/gimppalette-import.c |    2 +-
 app/core/gimppalette-load.c   |   17 ++++++++---------
 app/core/gimppalette-load.h   |    6 +++---
 4 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/app/core/gimp.c b/app/core/gimp.c
index d27a19d..33c0652 100644
--- a/app/core/gimp.c
+++ b/app/core/gimp.c
@@ -585,8 +585,8 @@ gimp_real_initialize (Gimp               *gimp,
 
   static const GimpDataFactoryLoaderEntry palette_loader_entries[] =
   {
-    { gimp_startup_palette_load,         GIMP_PALETTE_FILE_EXTENSION,         TRUE  },
-    { gimp_startup_palette_load,         NULL /* legacy loader */,            TRUE  }
+    { gimp_palette_load,         GIMP_PALETTE_FILE_EXTENSION,         TRUE  },
+    { gimp_palette_load,         NULL /* legacy loader */,            TRUE  }
   };
 
   static const GimpDataFactoryLoaderEntry tool_preset_loader_entries[] =
diff --git a/app/core/gimppalette-import.c b/app/core/gimppalette-import.c
index 499ee95..c32324b 100644
--- a/app/core/gimppalette-import.c
+++ b/app/core/gimppalette-import.c
@@ -520,7 +520,7 @@ gimp_palette_import_from_file (GimpContext  *context,
   switch (gimp_palette_load_detect_format (filename, file))
     {
     case GIMP_PALETTE_FILE_FORMAT_GPL:
-      palette_list = gimp_palette_load (context, filename, file, error);
+      palette_list = gimp_palette_load_gpl (context, filename, file, error);
       break;
 
     case GIMP_PALETTE_FILE_FORMAT_ACT:
diff --git a/app/core/gimppalette-load.c b/app/core/gimppalette-load.c
index e7f0237..2d235bf 100644
--- a/app/core/gimppalette-load.c
+++ b/app/core/gimppalette-load.c
@@ -46,11 +46,10 @@
 
 #include "gimp-intl.h"
 
-
 GList *
-gimp_startup_palette_load (GimpContext  *context,
-                           const gchar  *filename,
-                           GError      **error)
+gimp_palette_load (GimpContext  *context,
+                   const gchar  *filename,
+                   GError      **error)
 {
   FILE  *file;
   GList *glist;
@@ -68,17 +67,17 @@ gimp_startup_palette_load (GimpContext  *context,
                    gimp_filename_to_utf8 (filename), g_strerror (errno));
       return NULL;
     }
-  glist = gimp_palette_load (context, filename, file, error);
+  glist = gimp_palette_load_gpl (context, filename, file, error);
   fclose (file);
   return glist;
 }
 
 
 GList *
-gimp_palette_load (GimpContext  *context,
-                   const gchar  *filename,
-                   FILE         *file,
-                   GError      **error)
+gimp_palette_load_gpl (GimpContext  *context,
+                       const gchar  *filename,
+                       FILE         *file,
+                       GError      **error)
 {
   GimpPalette      *palette;
   GimpPaletteEntry *entry;
diff --git a/app/core/gimppalette-load.h b/app/core/gimppalette-load.h
index 5a1f80b..6457bfb 100644
--- a/app/core/gimppalette-load.h
+++ b/app/core/gimppalette-load.h
@@ -34,11 +34,11 @@ typedef enum
 } GimpPaletteFileFormat;
 
 
-GList               * gimp_startup_palette_load        (GimpContext  *context,
-                                                        const gchar  *filename,
-                                                        GError      **error);
 GList               * gimp_palette_load               (GimpContext  *context,
                                                        const gchar  *filename,
+                                                       GError      **error);
+GList               * gimp_palette_load_gpl           (GimpContext  *context,
+                                                       const gchar  *filename,
                                                        FILE         *file,
                                                        GError      **error);
 GList               * gimp_palette_load_act           (GimpContext  *context,