diff --git a/ChangeLog b/ChangeLog index 51857c35be..9ea1304f68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2006-11-24 Simon Budig + + * libgimpmodule/gimpmodule.[ch]: put the module prototypes into a + proper place. + + * modules/cdisplay_colorblind.c + * modules/cdisplay_gamma.c + * modules/cdisplay_highcontrast.c + * modules/cdisplay_lcms.c + * modules/cdisplay_proof.c + * modules/colorsel_cmyk.c + * modules/colorsel_cmyk_lcms.c + * modules/colorsel_triangle.c + * modules/colorsel_water.c + * modules/controller_linux_input.c + * modules/controller_midi.c: reverted. + 2006-11-24 Kevin Cozens * plug-ins/script-fu/scripts/script-fu-compat.init: Fixed cut and diff --git a/libgimpmodule/gimpmodule.c b/libgimpmodule/gimpmodule.c index 8069236c6c..2e6fab31a2 100644 --- a/libgimpmodule/gimpmodule.c +++ b/libgimpmodule/gimpmodule.c @@ -28,6 +28,7 @@ #include "libgimpbase/gimpbase.h" +#undef GIMP_DISABLE_DEPRECATED #include "gimpmodule.h" #include "libgimp/libgimp-intl.h" diff --git a/libgimpmodule/gimpmodule.h b/libgimpmodule/gimpmodule.h index cb5a546c7b..6da7b67e57 100644 --- a/libgimpmodule/gimpmodule.h +++ b/libgimpmodule/gimpmodule.h @@ -71,6 +71,10 @@ struct _GimpModuleInfo typedef const GimpModuleInfo * (* GimpModuleQueryFunc) (GTypeModule *module); typedef gboolean (* GimpModuleRegisterFunc) (GTypeModule *module); +/* GimpModules have to implement these */ +G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); +G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); + #define GIMP_TYPE_MODULE (gimp_module_get_type ()) #define GIMP_MODULE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_MODULE, GimpModule)) diff --git a/modules/cdisplay_colorblind.c b/modules/cdisplay_colorblind.c index ece520660c..e2c54d2314 100644 --- a/modules/cdisplay_colorblind.c +++ b/modules/cdisplay_colorblind.c @@ -113,9 +113,6 @@ enum }; -G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); -G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); - static GType cdisplay_colorblind_get_type (GTypeModule *module); static void cdisplay_colorblind_class_init (CdisplayColorblindClass *klass); static void cdisplay_colorblind_init (CdisplayColorblind *colorblind); diff --git a/modules/cdisplay_gamma.c b/modules/cdisplay_gamma.c index ffc62c78d6..f831f68ea8 100644 --- a/modules/cdisplay_gamma.c +++ b/modules/cdisplay_gamma.c @@ -62,9 +62,6 @@ enum }; -G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); -G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); - static GType cdisplay_gamma_get_type (GTypeModule *module); static void cdisplay_gamma_class_init (CdisplayGammaClass *klass); diff --git a/modules/cdisplay_highcontrast.c b/modules/cdisplay_highcontrast.c index fdc2455839..8467d4cd17 100644 --- a/modules/cdisplay_highcontrast.c +++ b/modules/cdisplay_highcontrast.c @@ -62,9 +62,6 @@ enum }; -G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); -G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); - static GType cdisplay_contrast_get_type (GTypeModule *module); static void cdisplay_contrast_class_init (CdisplayContrastClass *klass); diff --git a/modules/cdisplay_lcms.c b/modules/cdisplay_lcms.c index aebf7981e6..230b94e40b 100644 --- a/modules/cdisplay_lcms.c +++ b/modules/cdisplay_lcms.c @@ -67,9 +67,6 @@ enum }; -G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); -G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); - static GType cdisplay_lcms_get_type (GTypeModule *module); static void cdisplay_lcms_class_init (CdisplayLcmsClass *klass); static void cdisplay_lcms_init (CdisplayLcms *lcms); diff --git a/modules/cdisplay_proof.c b/modules/cdisplay_proof.c index 95b5bd671b..9535df2d36 100644 --- a/modules/cdisplay_proof.c +++ b/modules/cdisplay_proof.c @@ -71,9 +71,6 @@ enum }; -G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); -G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); - static GType cdisplay_proof_get_type (GTypeModule *module); static void cdisplay_proof_class_init (CdisplayProofClass *klass); static void cdisplay_proof_init (CdisplayProof *proof); diff --git a/modules/colorsel_cmyk.c b/modules/colorsel_cmyk.c index 33224e8b55..0cc75337f2 100644 --- a/modules/colorsel_cmyk.c +++ b/modules/colorsel_cmyk.c @@ -54,9 +54,6 @@ struct _ColorselCmykClass }; -G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); -G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); - static GType colorsel_cmyk_get_type (GTypeModule *module); static void colorsel_cmyk_class_init (ColorselCmykClass *klass); static void colorsel_cmyk_init (ColorselCmyk *cmyk); diff --git a/modules/colorsel_cmyk_lcms.c b/modules/colorsel_cmyk_lcms.c index cbebd35cec..24b85823ac 100644 --- a/modules/colorsel_cmyk_lcms.c +++ b/modules/colorsel_cmyk_lcms.c @@ -69,9 +69,6 @@ struct _ColorselCmykClass }; -G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); -G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); - static GType colorsel_cmyk_get_type (GTypeModule *module); static void colorsel_cmyk_class_init (ColorselCmykClass *klass); static void colorsel_cmyk_init (ColorselCmyk *cmyk); diff --git a/modules/colorsel_triangle.c b/modules/colorsel_triangle.c index 714d51e012..803d969494 100644 --- a/modules/colorsel_triangle.c +++ b/modules/colorsel_triangle.c @@ -70,9 +70,6 @@ struct _ColorselTriangleClass }; -G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); -G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); - static GType colorsel_triangle_get_type (GTypeModule *module); static void colorsel_triangle_class_init (ColorselTriangleClass *klass); static void colorsel_triangle_init (ColorselTriangle *triangle); diff --git a/modules/colorsel_water.c b/modules/colorsel_water.c index 004ac862a4..b950355441 100644 --- a/modules/colorsel_water.c +++ b/modules/colorsel_water.c @@ -59,9 +59,6 @@ struct _ColorselWaterClass }; -G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); -G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); - static GType colorsel_water_get_type (GTypeModule *module); static void colorsel_water_class_init (ColorselWaterClass *klass); static void colorsel_water_init (ColorselWater *water); diff --git a/modules/controller_linux_input.c b/modules/controller_linux_input.c index 55a21e1048..9f8041f973 100644 --- a/modules/controller_linux_input.c +++ b/modules/controller_linux_input.c @@ -123,9 +123,6 @@ struct _ControllerLinuxInputClass }; -G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); -G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); - GType linux_input_get_type (GTypeModule *module); static void linux_input_class_init (ControllerLinuxInputClass *klass); static void linux_input_dispose (GObject *object); diff --git a/modules/controller_midi.c b/modules/controller_midi.c index 84fe51904c..1d5b204c5e 100644 --- a/modules/controller_midi.c +++ b/modules/controller_midi.c @@ -105,9 +105,6 @@ struct _ControllerMidiClass }; -G_MODULE_EXPORT const GimpModuleInfo * gimp_module_query (GTypeModule *module); -G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module); - GType midi_get_type (GTypeModule *module); static void midi_class_init (ControllerMidiClass *klass);