dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libgimp, libgimpbase: rename gimp_base_compat_enum_init() 

to gimp_base_compat_enums_init() and move its prototype from
gimputils.h to gimpbase-private.h; it's not supposed to be
public API even though it's callable from the outside.
This commit is contained in:
Michael Natterer 2017-10-29 18:37:18 +01:00
parent 61727c69e0
commit d14f6647ad
7 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libgimp/Makefile.am
View File

@ -445,7 +445,7 @@ CLEANFILES = $(gen_sources)
gimpenums.c: $(srcdir)/gimpenums.h $(srcdir)/gimpenums.c.tail $(GIMP_MKENUMS) Makefile.am
$(AM_V_GEN) $(GIMP_MKENUMS) \
--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#undef GIMP_DISABLE_DEPRECATED\n#include \"libgimpbase/gimpbase.h\"\n#include \"libgimpconfig/gimpconfigenums.h\"\n#include \"gimpenums.h\"" \
--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#undef GIMP_DISABLE_DEPRECATED\n#include \"libgimpbase/gimpbase.h\"\n#include \"libgimpbase/gimpbase-private.h\"\n#include \"libgimpconfig/gimpconfigenums.h\"\n#include \"gimpenums.h\"" \
--fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "GType\n@enum_name@_get_type (void)\n{\n static const G@Type@Value values[] =\n {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \

2
libgimp/gimpenums.c.tail
View File

@ -174,7 +174,7 @@ gimp_enums_init (void)
g_type_set_qdata (GIMP_TYPE_LAYER_MODE, quark,
(gpointer) gimp_layer_mode_effects_get_type ());
gimp_base_compat_enum_init ();
gimp_base_compat_enums_init ();
enums_initialized = TRUE;
}

5
libgimpbase/gimpbase-private.c
View File

@ -27,7 +27,6 @@
#include "gimpbase-private.h"
#include "gimpcompatenums.h"
#include "gimputils.h"
GimpUnitVtable _gimp_unit_vtable = { NULL, };
@ -45,13 +44,13 @@ gimp_base_init (GimpUnitVtable *vtable)
_gimp_unit_vtable = *vtable;
gimp_base_compat_enum_init ();
gimp_base_compat_enums_init ();
gimp_base_initialized = TRUE;
}
void
gimp_base_compat_enum_init (void)
gimp_base_compat_enums_init (void)
{
static gboolean gimp_base_compat_initialized = FALSE;
GQuark quark;

3
libgimpbase/gimpbase-private.h
View File

@ -61,7 +61,8 @@ extern GimpUnitVtable _gimp_unit_vtable;
G_BEGIN_DECLS
void gimp_base_init (GimpUnitVtable *vtable);
void gimp_base_init (GimpUnitVtable *vtable);
void gimp_base_compat_enums_init (void);
G_END_DECLS

2
libgimpbase/gimpbase.def
View File

@ -2,7 +2,7 @@ EXPORTS
gimp_add_mask_type_compat_get_type
gimp_add_mask_type_get_type
gimp_any_to_utf8
gimp_base_compat_enum_init
gimp_base_compat_enums_init
gimp_base_init
gimp_blend_mode_compat_get_type
gimp_blend_mode_get_type

2
libgimpbase/gimputils.h
View File

@ -70,8 +70,6 @@ const gchar * gimp_flags_value_get_desc (GFlagsClass *flags_class,
GFlagsValue *flags_value);
const gchar * gimp_flags_value_get_help (GFlagsClass *flags_class,
GFlagsValue *flags_value);
void gimp_base_compat_enum_init (void);
G_END_DECLS

2
tools/pdbgen/enumcode.pl
View File

@ -201,7 +201,7 @@ gimp_enums_init (void)
g_type_set_qdata (GIMP_TYPE_LAYER_MODE, quark,
(gpointer) gimp_layer_mode_effects_get_type ());
gimp_base_compat_enum_init ();
gimp_base_compat_enums_init ();
enums_initialized = TRUE;
}