Commit d02dd9f0 authored by Michael Henning's avatar Michael Henning

app: Rename the pallete loading functions from last commit.

parent 198f2514
......@@ -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[] =
......
......@@ -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:
......
......@@ -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;
......
......@@ -34,10 +34,10 @@ 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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment