From 9cec74e9a1ed36fbc706dafb7f47a70e58382f1b Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Wed, 15 Jun 2005 09:26:01 +0000 Subject: [PATCH] deprecated. Changed implementation to simply call 2005-06-15 Michael Natterer * libgimpmodule/gimpmodule.[ch] (gimp_module_register_enum): deprecated. Changed implementation to simply call g_type_module_register_enum(). * modules/cdisplay_colorblind.c * modules/cdisplay_proof.c: use g_type_module_register_enum() instead. --- ChangeLog | 9 +++++++++ libgimpmodule/gimpmodule.c | 16 ++-------------- libgimpmodule/gimpmodule.h | 4 ++-- modules/cdisplay_colorblind.c | 4 ++-- modules/cdisplay_proof.c | 4 ++-- 5 files changed, 17 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e75bbf702..202ed76134 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-06-15 Michael Natterer + + * libgimpmodule/gimpmodule.[ch] (gimp_module_register_enum): + deprecated. Changed implementation to simply call + g_type_module_register_enum(). + + * modules/cdisplay_colorblind.c + * modules/cdisplay_proof.c: use g_type_module_register_enum() instead. + 2005-06-14 Sven Neumann * app/core/gimpimage.c (gimp_image_raise_layer) diff --git a/libgimpmodule/gimpmodule.c b/libgimpmodule/gimpmodule.c index 1009a5de04..4fa062e50a 100644 --- a/libgimpmodule/gimpmodule.c +++ b/libgimpmodule/gimpmodule.c @@ -441,9 +441,7 @@ gimp_module_state_name (GimpModuleState state) * @name: * @const_static_values: * - * Registers an enum similar to g_enum_register_static() but for - * modules. This function should actually live in GLib but since - * there's no such API, it is provided here. + * This function is deprecated! Use g_type_module_register_enum() instead. * * Return value: a new enum #GType **/ @@ -452,17 +450,7 @@ gimp_module_register_enum (GTypeModule *module, const gchar *name, const GEnumValue *const_static_values) { - GTypeInfo enum_type_info = { 0, }; - - g_return_val_if_fail (G_IS_TYPE_MODULE (module), 0); - g_return_val_if_fail (name != NULL, 0); - g_return_val_if_fail (const_static_values != NULL, 0); - - g_enum_complete_type_info (G_TYPE_ENUM, - &enum_type_info, const_static_values); - - return g_type_module_register_type (G_TYPE_MODULE (module), - G_TYPE_ENUM, name, &enum_type_info, 0); + return g_type_module_register_enum (module, name, const_static_values); } diff --git a/libgimpmodule/gimpmodule.h b/libgimpmodule/gimpmodule.h index 87804762db..9167dfa061 100644 --- a/libgimpmodule/gimpmodule.h +++ b/libgimpmodule/gimpmodule.h @@ -135,11 +135,11 @@ void gimp_module_set_load_inhibit (GimpModule *module, const gchar * gimp_module_state_name (GimpModuleState state); -/* supplement for missing GTypeModule API */ - +#ifndef GIMP_DISABLE_DEPRECATED GType gimp_module_register_enum (GTypeModule *module, const gchar *name, const GEnumValue *const_static_values); +#endif /* GIMP_DISABLE_DEPRECATED */ /* GimpModuleInfo functions */ diff --git a/modules/cdisplay_colorblind.c b/modules/cdisplay_colorblind.c index 2b98f06d19..b4389b7a31 100644 --- a/modules/cdisplay_colorblind.c +++ b/modules/cdisplay_colorblind.c @@ -260,8 +260,8 @@ cdisplay_colorblind_deficiency_get_type (GTypeModule *module) if (! cdisplay_colorblind_deficiency_type) { cdisplay_colorblind_deficiency_type = - gimp_module_register_enum (module, - "CDisplayColorblindDeficiency", enum_values); + g_type_module_register_enum (module, "CDisplayColorblindDeficiency", + enum_values); gimp_enum_set_value_descriptions (cdisplay_colorblind_deficiency_type, enum_descs); diff --git a/modules/cdisplay_proof.c b/modules/cdisplay_proof.c index 17d9b138b1..a865279781 100644 --- a/modules/cdisplay_proof.c +++ b/modules/cdisplay_proof.c @@ -183,8 +183,8 @@ cdisplay_proof_intent_get_type (GTypeModule *module) if (! cdisplay_proof_intent_type) { cdisplay_proof_intent_type = - gimp_module_register_enum (module, - "CDisplayProofIntent", enum_values); + g_type_module_register_enum (module, "CDisplayProofIntent", + enum_values); gimp_enum_set_value_descriptions (cdisplay_proof_intent_type, enum_descs);