diff --git a/ChangeLog b/ChangeLog index 1fa8fb9476..02c7ffa304 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,69 @@ +2000-05-27 Michael Natterer + + Libgimp cleanup part II (with a little help from Yosh + who moved the CVS files). + + * libgimp/Makefile.am + * libgimp/gimpchannel_pdb.c + * libgimp/gimpdisplay_pdb.c + * libgimp/gimpdrawable_pdb.c + * libgimp/gimpgradient_pdb.c + * libgimp/gimphelp_pdb.c + * libgimp/gimpimage_pdb.c + * libgimp/gimplayer_pdb.c + * libgimp/gimppalette_pdb.c + * libgimp/gimpparasite_pdb.c + * libgimp/gimpselection_pdb.c + * libgimp/gimpunit_pdb.c: new names of all files which contain + PDB wrappers. + + * modules/Makefile.am + * libgimp/gimpcolordisplay.h + * libgimp/gimpcolorselector.h + * modules/gimpmodregister.[ch]: renamed. + + * libgimp/gimpparasiteF.h + * libgimp/gimpparasiteP.h: removed because gimp.h had to include + the private header anyway. + + * app/color_notebook.c + * app/color_select.c + * app/gdisplay_color.[ch] + * app/gdisplay_color_ui.c + * app/gimpbrushpipe.c + * app/gimpdrawable.[ch] + * app/gimpimage.c + * app/gimpimage.h + * app/gimpparasite.[ch] + * app/gimprc.c + * app/image_new.c + * app/layer.c + * app/parasite_cmds.c + * app/parasitelist.[ch] + * app/plug_in.c + * app/procedural_db.c + * app/undo.c + * app/xcf.c + * libgimp/gimp.[ch] + * libgimp/gimpcolordisplay.h + * libgimp/gimpparasite.[ch] + * modules/cdisplay_gamma.c + * modules/cdisplay_highcontrast.c + * modules/colorsel_gtk.c + * modules/colorsel_triangle.c + * modules/colorsel_water.c + * plug-ins/FractalExplorer/Dialogs.c + * plug-ins/FractalExplorer/Events.c + * plug-ins/Lighting/lighting_apply.c + * plug-ins/Lighting/lighting_shade.c + * plug-ins/MapObject/mapobject_image.c + * plug-ins/common/gpb.c + * plug-ins/common/psp.c + * plug-ins/sel2path/sel2path.c + * po-libgimp/POTFILES.in + * tools/pdbgen/pdb.pl + * tools/pdbgen/pdb/parasite.pdb: changed includes accordingly. + Fri May 26 23:14:14 BST 2000 Andy Thomas * plug-ins/common/illusion.c diff --git a/app/actions/plug-in-commands.c b/app/actions/plug-in-commands.c index 976dd4df0d..3a989d1dae 100644 --- a/app/actions/plug-in-commands.c +++ b/app/actions/plug-in-commands.c @@ -94,8 +94,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimpprotocol.h" #include "libgimp/gimpwire.h" -#include "libgimp/parasite.h" -#include "libgimp/parasiteP.h" /* ick */ +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/color_notebook.c b/app/color_notebook.c index 42d2b5b701..7b6e68fa1a 100644 --- a/app/color_notebook.c +++ b/app/color_notebook.c @@ -27,13 +27,14 @@ #include #include -/*#include "appenv.h"*/ #include "color_notebook.h" #include "gimpui.h" -#include "libgimp/color_selector.h" +#include "libgimp/gimpcolorselector.h" + #include "libgimp/gimpintl.h" + static void color_notebook_ok_callback (GtkWidget *widget, gpointer data); static void color_notebook_cancel_callback (GtkWidget *widget, diff --git a/app/color_select.c b/app/color_select.c index 62ec9f1f12..1bfc7a04d3 100644 --- a/app/color_select.c +++ b/app/color_select.c @@ -31,7 +31,7 @@ #include "session.h" #include "color_area.h" /* for color_area_draw_rect */ -#include "libgimp/color_selector.h" +#include "libgimp/gimpcolorselector.h" #include "libgimp/gimpintl.h" diff --git a/app/core/gimp-parasites.c b/app/core/gimp-parasites.c index 517abaa90e..389ffd3f05 100644 --- a/app/core/gimp-parasites.c +++ b/app/core/gimp-parasites.c @@ -28,9 +28,10 @@ #include "gimpparasite.h" #include "gimprc.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpenv.h" + static ParasiteList *parasites = NULL; void diff --git a/app/core/gimp-parasites.h b/app/core/gimp-parasites.h index 18f0e83c02..9cf21a7d8b 100644 --- a/app/core/gimp-parasites.h +++ b/app/core/gimp-parasites.h @@ -17,7 +17,7 @@ #ifndef __APP_GIMP_PARASITE_H__ #define __APP_GIMP_PARASITE_H__ -#include "libgimp/parasiteF.h" +#include "libgimp/gimpparasite.h" void gimp_init_parasites (void); diff --git a/app/core/gimpbrushpipe-load.c b/app/core/gimpbrushpipe-load.c index 20c8a879ca..691876da3c 100644 --- a/app/core/gimpbrushpipe-load.c +++ b/app/core/gimpbrushpipe-load.c @@ -36,10 +36,11 @@ #include "gimprc.h" #include "libgimp/gimpmath.h" -#include "libgimp/parasiteio.h" +#include "libgimp/gimpparasiteio.h" #include "libgimp/gimpintl.h" + static GimpBrushClass *gimp_brush_class; static GimpBrushPixmapClass *gimp_brush_pixmap_class; diff --git a/app/core/gimpbrushpipe.c b/app/core/gimpbrushpipe.c index 20c8a879ca..691876da3c 100644 --- a/app/core/gimpbrushpipe.c +++ b/app/core/gimpbrushpipe.c @@ -36,10 +36,11 @@ #include "gimprc.h" #include "libgimp/gimpmath.h" -#include "libgimp/parasiteio.h" +#include "libgimp/gimpparasiteio.h" #include "libgimp/gimpintl.h" + static GimpBrushClass *gimp_brush_class; static GimpBrushPixmapClass *gimp_brush_pixmap_class; diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c index fa483383e0..f22c7e9d80 100644 --- a/app/core/gimpdrawable.c +++ b/app/core/gimpdrawable.c @@ -29,7 +29,7 @@ #include "undo.h" #include "libgimp/gimpmath.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/core/gimpdrawable.h b/app/core/gimpdrawable.h index 145a704421..21a88e8220 100644 --- a/app/core/gimpdrawable.h +++ b/app/core/gimpdrawable.h @@ -25,7 +25,8 @@ #include "temp_buf.h" #include "gimpimageF.h" -#include +#include "libgimp/gimpparasite.h" + #define GIMP_TYPE_DRAWABLE (gimp_drawable_get_type ()) #define GIMP_DRAWABLE(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_DRAWABLE, GimpDrawable)) diff --git a/app/core/gimpimage-guides.c b/app/core/gimpimage-guides.c index 88126a81cb..64717d42da 100644 --- a/app/core/gimpimage-guides.c +++ b/app/core/gimpimage-guides.c @@ -41,7 +41,7 @@ #include "libgimp/gimpcolorspace.h" #include "libgimp/gimplimits.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/core/gimpimage-guides.h b/app/core/gimpimage-guides.h index 4980e54793..d5161d7be1 100644 --- a/app/core/gimpimage-guides.h +++ b/app/core/gimpimage-guides.h @@ -25,13 +25,14 @@ #include "drawable.h" #include "channel.h" #include "layer.h" -#include -#include #include "plug_in.h" #include "temp_buf.h" #include "tile_manager.h" #include "path.h" +#include "libgimp/gimpparasite.h" +#include "libgimp/gimpunit.h" + #define GIMP_TYPE_IMAGE gimp_image_get_type() #define GIMP_IMAGE(obj) GTK_CHECK_CAST (obj, GIMP_TYPE_IMAGE, GimpImage) diff --git a/app/core/gimpimage-merge.c b/app/core/gimpimage-merge.c index 88126a81cb..64717d42da 100644 --- a/app/core/gimpimage-merge.c +++ b/app/core/gimpimage-merge.c @@ -41,7 +41,7 @@ #include "libgimp/gimpcolorspace.h" #include "libgimp/gimplimits.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/core/gimpimage-merge.h b/app/core/gimpimage-merge.h index 4980e54793..d5161d7be1 100644 --- a/app/core/gimpimage-merge.h +++ b/app/core/gimpimage-merge.h @@ -25,13 +25,14 @@ #include "drawable.h" #include "channel.h" #include "layer.h" -#include -#include #include "plug_in.h" #include "temp_buf.h" #include "tile_manager.h" #include "path.h" +#include "libgimp/gimpparasite.h" +#include "libgimp/gimpunit.h" + #define GIMP_TYPE_IMAGE gimp_image_get_type() #define GIMP_IMAGE(obj) GTK_CHECK_CAST (obj, GIMP_TYPE_IMAGE, GimpImage) diff --git a/app/core/gimpimage-projection.c b/app/core/gimpimage-projection.c index 88126a81cb..64717d42da 100644 --- a/app/core/gimpimage-projection.c +++ b/app/core/gimpimage-projection.c @@ -41,7 +41,7 @@ #include "libgimp/gimpcolorspace.h" #include "libgimp/gimplimits.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/core/gimpimage-projection.h b/app/core/gimpimage-projection.h index 4980e54793..d5161d7be1 100644 --- a/app/core/gimpimage-projection.h +++ b/app/core/gimpimage-projection.h @@ -25,13 +25,14 @@ #include "drawable.h" #include "channel.h" #include "layer.h" -#include -#include #include "plug_in.h" #include "temp_buf.h" #include "tile_manager.h" #include "path.h" +#include "libgimp/gimpparasite.h" +#include "libgimp/gimpunit.h" + #define GIMP_TYPE_IMAGE gimp_image_get_type() #define GIMP_IMAGE(obj) GTK_CHECK_CAST (obj, GIMP_TYPE_IMAGE, GimpImage) diff --git a/app/core/gimpimage-resize.c b/app/core/gimpimage-resize.c index 88126a81cb..64717d42da 100644 --- a/app/core/gimpimage-resize.c +++ b/app/core/gimpimage-resize.c @@ -41,7 +41,7 @@ #include "libgimp/gimpcolorspace.h" #include "libgimp/gimplimits.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/core/gimpimage-resize.h b/app/core/gimpimage-resize.h index 4980e54793..d5161d7be1 100644 --- a/app/core/gimpimage-resize.h +++ b/app/core/gimpimage-resize.h @@ -25,13 +25,14 @@ #include "drawable.h" #include "channel.h" #include "layer.h" -#include -#include #include "plug_in.h" #include "temp_buf.h" #include "tile_manager.h" #include "path.h" +#include "libgimp/gimpparasite.h" +#include "libgimp/gimpunit.h" + #define GIMP_TYPE_IMAGE gimp_image_get_type() #define GIMP_IMAGE(obj) GTK_CHECK_CAST (obj, GIMP_TYPE_IMAGE, GimpImage) diff --git a/app/core/gimpimage-scale.c b/app/core/gimpimage-scale.c index 88126a81cb..64717d42da 100644 --- a/app/core/gimpimage-scale.c +++ b/app/core/gimpimage-scale.c @@ -41,7 +41,7 @@ #include "libgimp/gimpcolorspace.h" #include "libgimp/gimplimits.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/core/gimpimage-scale.h b/app/core/gimpimage-scale.h index 4980e54793..d5161d7be1 100644 --- a/app/core/gimpimage-scale.h +++ b/app/core/gimpimage-scale.h @@ -25,13 +25,14 @@ #include "drawable.h" #include "channel.h" #include "layer.h" -#include -#include #include "plug_in.h" #include "temp_buf.h" #include "tile_manager.h" #include "path.h" +#include "libgimp/gimpparasite.h" +#include "libgimp/gimpunit.h" + #define GIMP_TYPE_IMAGE gimp_image_get_type() #define GIMP_IMAGE(obj) GTK_CHECK_CAST (obj, GIMP_TYPE_IMAGE, GimpImage) diff --git a/app/core/gimpimage-undo-push.c b/app/core/gimpimage-undo-push.c index c9d08ccd50..c0d1d6a3da 100644 --- a/app/core/gimpimage-undo-push.c +++ b/app/core/gimpimage-undo-push.c @@ -45,7 +45,7 @@ #include "tile_manager_pvt.h" #include "tile.h" /* ick. */ -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c index 88126a81cb..64717d42da 100644 --- a/app/core/gimpimage.c +++ b/app/core/gimpimage.c @@ -41,7 +41,7 @@ #include "libgimp/gimpcolorspace.h" #include "libgimp/gimplimits.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/core/gimpimage.h b/app/core/gimpimage.h index 4980e54793..d5161d7be1 100644 --- a/app/core/gimpimage.h +++ b/app/core/gimpimage.h @@ -25,13 +25,14 @@ #include "drawable.h" #include "channel.h" #include "layer.h" -#include -#include #include "plug_in.h" #include "temp_buf.h" #include "tile_manager.h" #include "path.h" +#include "libgimp/gimpparasite.h" +#include "libgimp/gimpunit.h" + #define GIMP_TYPE_IMAGE gimp_image_get_type() #define GIMP_IMAGE(obj) GTK_CHECK_CAST (obj, GIMP_TYPE_IMAGE, GimpImage) diff --git a/app/core/gimplayer.c b/app/core/gimplayer.c index 7cd1ed3ef1..0159cec60d 100644 --- a/app/core/gimplayer.c +++ b/app/core/gimplayer.c @@ -40,12 +40,13 @@ #include "tile.h" /* ick. */ #include "libgimp/gimpmath.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" -enum { +enum +{ REMOVED, LAST_SIGNAL }; diff --git a/app/core/gimpparasite.c b/app/core/gimpparasite.c index 517abaa90e..389ffd3f05 100644 --- a/app/core/gimpparasite.c +++ b/app/core/gimpparasite.c @@ -28,9 +28,10 @@ #include "gimpparasite.h" #include "gimprc.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpenv.h" + static ParasiteList *parasites = NULL; void diff --git a/app/core/gimpparasite.h b/app/core/gimpparasite.h index 18f0e83c02..9cf21a7d8b 100644 --- a/app/core/gimpparasite.h +++ b/app/core/gimpparasite.h @@ -17,7 +17,7 @@ #ifndef __APP_GIMP_PARASITE_H__ #define __APP_GIMP_PARASITE_H__ -#include "libgimp/parasiteF.h" +#include "libgimp/gimpparasite.h" void gimp_init_parasites (void); diff --git a/app/core/gimpparasitelist.c b/app/core/gimpparasitelist.c index 7498773f01..a22e154c09 100644 --- a/app/core/gimpparasitelist.c +++ b/app/core/gimpparasitelist.c @@ -21,8 +21,7 @@ #include "gimpsignal.h" #include "parasitelistP.h" -#include "libgimp/parasite.h" -#include "libgimp/parasiteP.h" +#include "libgimp/gimpparasite.h" enum diff --git a/app/core/gimpparasitelist.h b/app/core/gimpparasitelist.h index bc32cad778..1bc8452e20 100644 --- a/app/core/gimpparasitelist.h +++ b/app/core/gimpparasitelist.h @@ -23,7 +23,7 @@ #include "parasitelistF.h" #include "gimpobject.h" -#include "libgimp/parasiteF.h" +#include "libgimp/gimpparasite.h" #define GIMP_TYPE_PARASITE_LIST (parasite_list_get_type ()) diff --git a/app/core/gimpprojection-construct.c b/app/core/gimpprojection-construct.c index 88126a81cb..64717d42da 100644 --- a/app/core/gimpprojection-construct.c +++ b/app/core/gimpprojection-construct.c @@ -41,7 +41,7 @@ #include "libgimp/gimpcolorspace.h" #include "libgimp/gimplimits.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/core/gimpprojection-construct.h b/app/core/gimpprojection-construct.h index 4980e54793..d5161d7be1 100644 --- a/app/core/gimpprojection-construct.h +++ b/app/core/gimpprojection-construct.h @@ -25,13 +25,14 @@ #include "drawable.h" #include "channel.h" #include "layer.h" -#include -#include #include "plug_in.h" #include "temp_buf.h" #include "tile_manager.h" #include "path.h" +#include "libgimp/gimpparasite.h" +#include "libgimp/gimpunit.h" + #define GIMP_TYPE_IMAGE gimp_image_get_type() #define GIMP_IMAGE(obj) GTK_CHECK_CAST (obj, GIMP_TYPE_IMAGE, GimpImage) diff --git a/app/dialogs/color-dialog.c b/app/dialogs/color-dialog.c index 42d2b5b701..7b6e68fa1a 100644 --- a/app/dialogs/color-dialog.c +++ b/app/dialogs/color-dialog.c @@ -27,13 +27,14 @@ #include #include -/*#include "appenv.h"*/ #include "color_notebook.h" #include "gimpui.h" -#include "libgimp/color_selector.h" +#include "libgimp/gimpcolorselector.h" + #include "libgimp/gimpintl.h" + static void color_notebook_ok_callback (GtkWidget *widget, gpointer data); static void color_notebook_cancel_callback (GtkWidget *widget, diff --git a/app/display/gimpdisplayshell-filter-dialog.c b/app/display/gimpdisplayshell-filter-dialog.c index 5aac8e405e..a9a10633e5 100644 --- a/app/display/gimpdisplayshell-filter-dialog.c +++ b/app/display/gimpdisplayshell-filter-dialog.c @@ -27,7 +27,7 @@ #include "gimpimageP.h" #include "gimpui.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/display/gimpdisplayshell-filter.c b/app/display/gimpdisplayshell-filter.c index 2e2eb441b6..5db01d1ebb 100644 --- a/app/display/gimpdisplayshell-filter.c +++ b/app/display/gimpdisplayshell-filter.c @@ -26,14 +26,15 @@ #include "gimpimageP.h" #include "gimpui.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include typedef struct _ColorDisplayInfo ColorDisplayInfo; -struct _ColorDisplayInfo { - char *name; +struct _ColorDisplayInfo + { + gchar *name; GimpColorDisplayMethods methods; GSList *refs; }; @@ -47,7 +48,7 @@ static void gdisplay_color_detach_real (GDisplay *gdisp, ColorDisplayNode *node, gboolean unref); static gint node_name_compare (ColorDisplayNode *node, - const char *name); + const gchar *name); void color_display_init (void) @@ -55,7 +56,7 @@ color_display_init (void) } G_MODULE_EXPORT gboolean -gimp_color_display_register (const char *name, +gimp_color_display_register (const gchar *name, GimpColorDisplayMethods *methods) { ColorDisplayInfo *info; @@ -81,7 +82,7 @@ gimp_color_display_register (const char *name, } G_MODULE_EXPORT gboolean -gimp_color_display_unregister (const char *name) +gimp_color_display_unregister (const gchar *name) { ColorDisplayInfo *info; GDisplay *gdisp; @@ -147,8 +148,8 @@ color_display_foreach_real (gpointer key, } ColorDisplayNode * -gdisplay_color_attach (GDisplay *gdisp, - const char *name) +gdisplay_color_attach (GDisplay *gdisp, + const gchar *name) { ColorDisplayInfo *info; ColorDisplayNode *node; diff --git a/app/display/gimpdisplayshell-filter.h b/app/display/gimpdisplayshell-filter.h index 2cbe34ccc1..944adc2101 100644 --- a/app/display/gimpdisplayshell-filter.h +++ b/app/display/gimpdisplayshell-filter.h @@ -18,9 +18,11 @@ #ifndef __GDISPLAY_COLOR_H__ #define __GDISPLAY_COLOR_H__ -#include "libgimp/color_display.h" #include "gdisplayF.h" +#include "libgimp/gimpcolordisplay.h" + + typedef struct _ColorDisplayNode ColorDisplayNode; struct _ColorDisplayNode { diff --git a/app/gdisplay_color.c b/app/gdisplay_color.c index 2e2eb441b6..5db01d1ebb 100644 --- a/app/gdisplay_color.c +++ b/app/gdisplay_color.c @@ -26,14 +26,15 @@ #include "gimpimageP.h" #include "gimpui.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include typedef struct _ColorDisplayInfo ColorDisplayInfo; -struct _ColorDisplayInfo { - char *name; +struct _ColorDisplayInfo + { + gchar *name; GimpColorDisplayMethods methods; GSList *refs; }; @@ -47,7 +48,7 @@ static void gdisplay_color_detach_real (GDisplay *gdisp, ColorDisplayNode *node, gboolean unref); static gint node_name_compare (ColorDisplayNode *node, - const char *name); + const gchar *name); void color_display_init (void) @@ -55,7 +56,7 @@ color_display_init (void) } G_MODULE_EXPORT gboolean -gimp_color_display_register (const char *name, +gimp_color_display_register (const gchar *name, GimpColorDisplayMethods *methods) { ColorDisplayInfo *info; @@ -81,7 +82,7 @@ gimp_color_display_register (const char *name, } G_MODULE_EXPORT gboolean -gimp_color_display_unregister (const char *name) +gimp_color_display_unregister (const gchar *name) { ColorDisplayInfo *info; GDisplay *gdisp; @@ -147,8 +148,8 @@ color_display_foreach_real (gpointer key, } ColorDisplayNode * -gdisplay_color_attach (GDisplay *gdisp, - const char *name) +gdisplay_color_attach (GDisplay *gdisp, + const gchar *name) { ColorDisplayInfo *info; ColorDisplayNode *node; diff --git a/app/gdisplay_color.h b/app/gdisplay_color.h index 2cbe34ccc1..944adc2101 100644 --- a/app/gdisplay_color.h +++ b/app/gdisplay_color.h @@ -18,9 +18,11 @@ #ifndef __GDISPLAY_COLOR_H__ #define __GDISPLAY_COLOR_H__ -#include "libgimp/color_display.h" #include "gdisplayF.h" +#include "libgimp/gimpcolordisplay.h" + + typedef struct _ColorDisplayNode ColorDisplayNode; struct _ColorDisplayNode { diff --git a/app/gdisplay_color_ui.c b/app/gdisplay_color_ui.c index 5aac8e405e..a9a10633e5 100644 --- a/app/gdisplay_color_ui.c +++ b/app/gdisplay_color_ui.c @@ -27,7 +27,7 @@ #include "gimpimageP.h" #include "gimpui.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/gimpbrushpipe.c b/app/gimpbrushpipe.c index 20c8a879ca..691876da3c 100644 --- a/app/gimpbrushpipe.c +++ b/app/gimpbrushpipe.c @@ -36,10 +36,11 @@ #include "gimprc.h" #include "libgimp/gimpmath.h" -#include "libgimp/parasiteio.h" +#include "libgimp/gimpparasiteio.h" #include "libgimp/gimpintl.h" + static GimpBrushClass *gimp_brush_class; static GimpBrushPixmapClass *gimp_brush_pixmap_class; diff --git a/app/gimpdrawable.c b/app/gimpdrawable.c index fa483383e0..f22c7e9d80 100644 --- a/app/gimpdrawable.c +++ b/app/gimpdrawable.c @@ -29,7 +29,7 @@ #include "undo.h" #include "libgimp/gimpmath.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/gimpdrawable.h b/app/gimpdrawable.h index 145a704421..21a88e8220 100644 --- a/app/gimpdrawable.h +++ b/app/gimpdrawable.h @@ -25,7 +25,8 @@ #include "temp_buf.h" #include "gimpimageF.h" -#include +#include "libgimp/gimpparasite.h" + #define GIMP_TYPE_DRAWABLE (gimp_drawable_get_type ()) #define GIMP_DRAWABLE(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_DRAWABLE, GimpDrawable)) diff --git a/app/gimpimage.c b/app/gimpimage.c index 88126a81cb..64717d42da 100644 --- a/app/gimpimage.c +++ b/app/gimpimage.c @@ -41,7 +41,7 @@ #include "libgimp/gimpcolorspace.h" #include "libgimp/gimplimits.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/gimpimage.h b/app/gimpimage.h index 4980e54793..d5161d7be1 100644 --- a/app/gimpimage.h +++ b/app/gimpimage.h @@ -25,13 +25,14 @@ #include "drawable.h" #include "channel.h" #include "layer.h" -#include -#include #include "plug_in.h" #include "temp_buf.h" #include "tile_manager.h" #include "path.h" +#include "libgimp/gimpparasite.h" +#include "libgimp/gimpunit.h" + #define GIMP_TYPE_IMAGE gimp_image_get_type() #define GIMP_IMAGE(obj) GTK_CHECK_CAST (obj, GIMP_TYPE_IMAGE, GimpImage) diff --git a/app/gimplayer.c b/app/gimplayer.c index 7cd1ed3ef1..0159cec60d 100644 --- a/app/gimplayer.c +++ b/app/gimplayer.c @@ -40,12 +40,13 @@ #include "tile.h" /* ick. */ #include "libgimp/gimpmath.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" -enum { +enum +{ REMOVED, LAST_SIGNAL }; diff --git a/app/gimpparasite.c b/app/gimpparasite.c index 517abaa90e..389ffd3f05 100644 --- a/app/gimpparasite.c +++ b/app/gimpparasite.c @@ -28,9 +28,10 @@ #include "gimpparasite.h" #include "gimprc.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpenv.h" + static ParasiteList *parasites = NULL; void diff --git a/app/gimpparasite.h b/app/gimpparasite.h index 18f0e83c02..9cf21a7d8b 100644 --- a/app/gimpparasite.h +++ b/app/gimpparasite.h @@ -17,7 +17,7 @@ #ifndef __APP_GIMP_PARASITE_H__ #define __APP_GIMP_PARASITE_H__ -#include "libgimp/parasiteF.h" +#include "libgimp/gimpparasite.h" void gimp_init_parasites (void); diff --git a/app/gimprc.c b/app/gimprc.c index 6d912574fe..22796f5c91 100644 --- a/app/gimprc.c +++ b/app/gimprc.c @@ -48,7 +48,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimputils.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/gui/color-notebook.c b/app/gui/color-notebook.c index 42d2b5b701..7b6e68fa1a 100644 --- a/app/gui/color-notebook.c +++ b/app/gui/color-notebook.c @@ -27,13 +27,14 @@ #include #include -/*#include "appenv.h"*/ #include "color_notebook.h" #include "gimpui.h" -#include "libgimp/color_selector.h" +#include "libgimp/gimpcolorselector.h" + #include "libgimp/gimpintl.h" + static void color_notebook_ok_callback (GtkWidget *widget, gpointer data); static void color_notebook_cancel_callback (GtkWidget *widget, diff --git a/app/gui/color-select.c b/app/gui/color-select.c index 62ec9f1f12..1bfc7a04d3 100644 --- a/app/gui/color-select.c +++ b/app/gui/color-select.c @@ -31,7 +31,7 @@ #include "session.h" #include "color_area.h" /* for color_area_draw_rect */ -#include "libgimp/color_selector.h" +#include "libgimp/gimpcolorselector.h" #include "libgimp/gimpintl.h" diff --git a/app/gui/plug-in-commands.c b/app/gui/plug-in-commands.c index 976dd4df0d..3a989d1dae 100644 --- a/app/gui/plug-in-commands.c +++ b/app/gui/plug-in-commands.c @@ -94,8 +94,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimpprotocol.h" #include "libgimp/gimpwire.h" -#include "libgimp/parasite.h" -#include "libgimp/parasiteP.h" /* ick */ +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/gui/plug-in-menus.c b/app/gui/plug-in-menus.c index 976dd4df0d..3a989d1dae 100644 --- a/app/gui/plug-in-menus.c +++ b/app/gui/plug-in-menus.c @@ -94,8 +94,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimpprotocol.h" #include "libgimp/gimpwire.h" -#include "libgimp/parasite.h" -#include "libgimp/parasiteP.h" /* ick */ +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/image_new.c b/app/image_new.c index 6604f468a6..7b1c8a7a2c 100644 --- a/app/image_new.c +++ b/app/image_new.c @@ -27,11 +27,13 @@ #include "gimpcontext.h" #include "gimage.h" +#include "libgimp/gimpparasite.h" + #include "libgimp/gimpintl.h" -#include "libgimp/parasite.h" #include "pixmaps/wilber2.xpm" + static GList *image_base_type_names = NULL; static GList *fill_type_names = NULL; static GimpImageNewValues last_values; @@ -43,8 +45,9 @@ static void image_new_init (void) { static gboolean image_new_inited = FALSE; + GimpImageBaseTypeName *new_type; - GimpFillTypeName *new_fill_type; + GimpFillTypeName *new_fill_type; if (image_new_inited) return; @@ -94,7 +97,7 @@ image_new_init (void) last_values.fill_type = BACKGROUND_FILL; } -GList* +GList * image_new_get_image_base_type_names (void) { image_new_init (); @@ -102,7 +105,7 @@ image_new_get_image_base_type_names (void) return image_base_type_names; } -GList* +GList * image_new_get_fill_type_names (void) { image_new_init (); diff --git a/app/layer.c b/app/layer.c index 7cd1ed3ef1..0159cec60d 100644 --- a/app/layer.c +++ b/app/layer.c @@ -40,12 +40,13 @@ #include "tile.h" /* ick. */ #include "libgimp/gimpmath.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" -enum { +enum +{ REMOVED, LAST_SIGNAL }; diff --git a/app/menus/plug-in-menus.c b/app/menus/plug-in-menus.c index 976dd4df0d..3a989d1dae 100644 --- a/app/menus/plug-in-menus.c +++ b/app/menus/plug-in-menus.c @@ -94,8 +94,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimpprotocol.h" #include "libgimp/gimpwire.h" -#include "libgimp/parasite.h" -#include "libgimp/parasiteP.h" /* ick */ +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/parasite_cmds.c b/app/parasite_cmds.c index dac556dbc6..5697a893e8 100644 --- a/app/parasite_cmds.c +++ b/app/parasite_cmds.c @@ -25,7 +25,7 @@ #include "gimpimage.h" #include "gimpparasite.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" static ProcRecord parasite_new_proc; static ProcRecord parasite_find_proc; diff --git a/app/parasitelist.c b/app/parasitelist.c index 7498773f01..a22e154c09 100644 --- a/app/parasitelist.c +++ b/app/parasitelist.c @@ -21,8 +21,7 @@ #include "gimpsignal.h" #include "parasitelistP.h" -#include "libgimp/parasite.h" -#include "libgimp/parasiteP.h" +#include "libgimp/gimpparasite.h" enum diff --git a/app/parasitelist.h b/app/parasitelist.h index bc32cad778..1bc8452e20 100644 --- a/app/parasitelist.h +++ b/app/parasitelist.h @@ -23,7 +23,7 @@ #include "parasitelistF.h" #include "gimpobject.h" -#include "libgimp/parasiteF.h" +#include "libgimp/gimpparasite.h" #define GIMP_TYPE_PARASITE_LIST (parasite_list_get_type ()) diff --git a/app/plug-in/gimpplugin-message.c b/app/plug-in/gimpplugin-message.c index 976dd4df0d..3a989d1dae 100644 --- a/app/plug-in/gimpplugin-message.c +++ b/app/plug-in/gimpplugin-message.c @@ -94,8 +94,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimpprotocol.h" #include "libgimp/gimpwire.h" -#include "libgimp/parasite.h" -#include "libgimp/parasiteP.h" /* ick */ +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/plug-in/gimpplugin-progress.c b/app/plug-in/gimpplugin-progress.c index 976dd4df0d..3a989d1dae 100644 --- a/app/plug-in/gimpplugin-progress.c +++ b/app/plug-in/gimpplugin-progress.c @@ -94,8 +94,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimpprotocol.h" #include "libgimp/gimpwire.h" -#include "libgimp/parasite.h" -#include "libgimp/parasiteP.h" /* ick */ +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/plug-in/gimpplugin.c b/app/plug-in/gimpplugin.c index 976dd4df0d..3a989d1dae 100644 --- a/app/plug-in/gimpplugin.c +++ b/app/plug-in/gimpplugin.c @@ -94,8 +94,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimpprotocol.h" #include "libgimp/gimpwire.h" -#include "libgimp/parasite.h" -#include "libgimp/parasiteP.h" /* ick */ +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/plug-in/gimppluginmanager-call.c b/app/plug-in/gimppluginmanager-call.c index 976dd4df0d..3a989d1dae 100644 --- a/app/plug-in/gimppluginmanager-call.c +++ b/app/plug-in/gimppluginmanager-call.c @@ -94,8 +94,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimpprotocol.h" #include "libgimp/gimpwire.h" -#include "libgimp/parasite.h" -#include "libgimp/parasiteP.h" /* ick */ +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/plug-in/gimppluginmanager-run.c b/app/plug-in/gimppluginmanager-run.c index 976dd4df0d..3a989d1dae 100644 --- a/app/plug-in/gimppluginmanager-run.c +++ b/app/plug-in/gimppluginmanager-run.c @@ -94,8 +94,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimpprotocol.h" #include "libgimp/gimpwire.h" -#include "libgimp/parasite.h" -#include "libgimp/parasiteP.h" /* ick */ +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/plug-in/gimppluginmanager.c b/app/plug-in/gimppluginmanager.c index 976dd4df0d..3a989d1dae 100644 --- a/app/plug-in/gimppluginmanager.c +++ b/app/plug-in/gimppluginmanager.c @@ -94,8 +94,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimpprotocol.h" #include "libgimp/gimpwire.h" -#include "libgimp/parasite.h" -#include "libgimp/parasiteP.h" /* ick */ +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/plug-in/gimppluginshm.c b/app/plug-in/gimppluginshm.c index 976dd4df0d..3a989d1dae 100644 --- a/app/plug-in/gimppluginshm.c +++ b/app/plug-in/gimppluginshm.c @@ -94,8 +94,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimpprotocol.h" #include "libgimp/gimpwire.h" -#include "libgimp/parasite.h" -#include "libgimp/parasiteP.h" /* ick */ +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/plug-in/plug-in-def.c b/app/plug-in/plug-in-def.c index 976dd4df0d..3a989d1dae 100644 --- a/app/plug-in/plug-in-def.c +++ b/app/plug-in/plug-in-def.c @@ -94,8 +94,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimpprotocol.h" #include "libgimp/gimpwire.h" -#include "libgimp/parasite.h" -#include "libgimp/parasiteP.h" /* ick */ +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/plug-in/plug-in-message.c b/app/plug-in/plug-in-message.c index 976dd4df0d..3a989d1dae 100644 --- a/app/plug-in/plug-in-message.c +++ b/app/plug-in/plug-in-message.c @@ -94,8 +94,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimpprotocol.h" #include "libgimp/gimpwire.h" -#include "libgimp/parasite.h" -#include "libgimp/parasiteP.h" /* ick */ +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/plug-in/plug-in-params.c b/app/plug-in/plug-in-params.c index 976dd4df0d..3a989d1dae 100644 --- a/app/plug-in/plug-in-params.c +++ b/app/plug-in/plug-in-params.c @@ -94,8 +94,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimpprotocol.h" #include "libgimp/gimpwire.h" -#include "libgimp/parasite.h" -#include "libgimp/parasiteP.h" /* ick */ +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/plug-in/plug-in-progress.c b/app/plug-in/plug-in-progress.c index 976dd4df0d..3a989d1dae 100644 --- a/app/plug-in/plug-in-progress.c +++ b/app/plug-in/plug-in-progress.c @@ -94,8 +94,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimpprotocol.h" #include "libgimp/gimpwire.h" -#include "libgimp/parasite.h" -#include "libgimp/parasiteP.h" /* ick */ +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/plug-in/plug-in-run.c b/app/plug-in/plug-in-run.c index 976dd4df0d..3a989d1dae 100644 --- a/app/plug-in/plug-in-run.c +++ b/app/plug-in/plug-in-run.c @@ -94,8 +94,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimpprotocol.h" #include "libgimp/gimpwire.h" -#include "libgimp/parasite.h" -#include "libgimp/parasiteP.h" /* ick */ +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/plug-in/plug-in-shm.c b/app/plug-in/plug-in-shm.c index 976dd4df0d..3a989d1dae 100644 --- a/app/plug-in/plug-in-shm.c +++ b/app/plug-in/plug-in-shm.c @@ -94,8 +94,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimpprotocol.h" #include "libgimp/gimpwire.h" -#include "libgimp/parasite.h" -#include "libgimp/parasiteP.h" /* ick */ +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/plug-in/plug-in.c b/app/plug-in/plug-in.c index 976dd4df0d..3a989d1dae 100644 --- a/app/plug-in/plug-in.c +++ b/app/plug-in/plug-in.c @@ -94,8 +94,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimpprotocol.h" #include "libgimp/gimpwire.h" -#include "libgimp/parasite.h" -#include "libgimp/parasiteP.h" /* ick */ +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/plug-in/plug-ins.c b/app/plug-in/plug-ins.c index 976dd4df0d..3a989d1dae 100644 --- a/app/plug-in/plug-ins.c +++ b/app/plug-in/plug-ins.c @@ -94,8 +94,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimpprotocol.h" #include "libgimp/gimpwire.h" -#include "libgimp/parasite.h" -#include "libgimp/parasiteP.h" /* ick */ +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/plug_in.c b/app/plug_in.c index 976dd4df0d..3a989d1dae 100644 --- a/app/plug_in.c +++ b/app/plug_in.c @@ -94,8 +94,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimpprotocol.h" #include "libgimp/gimpwire.h" -#include "libgimp/parasite.h" -#include "libgimp/parasiteP.h" /* ick */ +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/procedural_db.c b/app/procedural_db.c index 74218c1401..9a7be3bce8 100644 --- a/app/procedural_db.c +++ b/app/procedural_db.c @@ -25,7 +25,7 @@ #include "plug_in.h" #include "procedural_db.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/undo.c b/app/undo.c index c9d08ccd50..c0d1d6a3da 100644 --- a/app/undo.c +++ b/app/undo.c @@ -45,7 +45,7 @@ #include "tile_manager_pvt.h" #include "tile.h" /* ick. */ -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/widgets/gimpcolordialog.c b/app/widgets/gimpcolordialog.c index 42d2b5b701..7b6e68fa1a 100644 --- a/app/widgets/gimpcolordialog.c +++ b/app/widgets/gimpcolordialog.c @@ -27,13 +27,14 @@ #include #include -/*#include "appenv.h"*/ #include "color_notebook.h" #include "gimpui.h" -#include "libgimp/color_selector.h" +#include "libgimp/gimpcolorselector.h" + #include "libgimp/gimpintl.h" + static void color_notebook_ok_callback (GtkWidget *widget, gpointer data); static void color_notebook_cancel_callback (GtkWidget *widget, diff --git a/app/widgets/gimpcolordisplayeditor.c b/app/widgets/gimpcolordisplayeditor.c index 5aac8e405e..a9a10633e5 100644 --- a/app/widgets/gimpcolordisplayeditor.c +++ b/app/widgets/gimpcolordisplayeditor.c @@ -27,7 +27,7 @@ #include "gimpimageP.h" #include "gimpui.h" -#include "libgimp/parasite.h" +#include "libgimp/gimpparasite.h" #include "libgimp/gimpintl.h" diff --git a/app/xcf.c b/app/xcf.c index c3d359735e..2e8838f493 100644 --- a/app/xcf.c +++ b/app/xcf.c @@ -54,8 +54,7 @@ #include #include -#include -#include +#include #include "libgimp/gimpintl.h" diff --git a/app/xcf/xcf.c b/app/xcf/xcf.c index c3d359735e..2e8838f493 100644 --- a/app/xcf/xcf.c +++ b/app/xcf/xcf.c @@ -54,8 +54,7 @@ #include #include -#include -#include +#include #include "libgimp/gimpintl.h" diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am index 71c2f3437b..fe764d7d84 100644 --- a/libgimp/Makefile.am +++ b/libgimp/Makefile.am @@ -63,8 +63,6 @@ libgimpi_a_SOURCES = \ gimpwire.h \ gimpparasite.c \ gimpparasite.h \ - gimpparasiteF.h \ - gimpparasiteP.h \ gimpparasiteio.c \ gimpparasiteio.h @@ -94,6 +92,10 @@ libgimp_la_SOURCES = \ gimpmatrix.h \ gimppalette_pdb.c \ gimpparasite_pdb.c \ + gimpparasite.c \ + gimpparasite.h \ + gimpparasiteio.c \ + gimpparasiteio.h \ gimppixelrgn.c \ gimpprotocol.c \ gimpprotocol.h \ @@ -108,12 +110,6 @@ libgimp_la_SOURCES = \ gimpvector.h \ gimpwire.c \ gimpwire.h \ - parasite.c \ - parasite.h \ - parasiteF.h \ - parasiteP.h \ - parasiteio.c \ - parasiteio.h \ stdplugins-intl.h \ libgimp-intl.h @@ -137,11 +133,11 @@ libgimpui_la_SOURCES = \ gimpwidgets.c gimpinclude_HEADERS = \ - color_display.h \ - color_selector.h \ gimp.h \ gimpchainbutton.h \ gimpcolorbutton.h \ + gimpcolordisplay.h \ + gimpcolorselector.h \ gimpcolorspace.h \ gimpcompat.h \ gimpdialog.h \ @@ -156,6 +152,8 @@ gimpinclude_HEADERS = \ gimpmatrix.h \ gimpmenu.h \ gimpmodule.h \ + gimpparasite.h \ + gimpparasiteio.h \ gimppatheditor.h \ gimppixmap.h \ gimpquerybox.h \ @@ -167,11 +165,7 @@ gimpinclude_HEADERS = \ gimputils.h \ gimpvector.h \ gimpwidgets.h \ - gimpintl.h \ - parasite.h \ - parasiteF.h \ - parasiteP.h \ - parasiteio.h + gimpintl.h libgimp_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ diff --git a/libgimp/gimp.c b/libgimp/gimp.c index 871321d2c8..17fbb9dfab 100644 --- a/libgimp/gimp.c +++ b/libgimp/gimp.c @@ -53,7 +53,6 @@ #include #endif -#include "parasiteP.h" #include "gimpenv.h" #ifdef HAVE_IPC_H diff --git a/libgimp/gimp.h b/libgimp/gimp.h index 365d9621c7..c0ccbc42ab 100644 --- a/libgimp/gimp.h +++ b/libgimp/gimp.h @@ -22,19 +22,18 @@ #include -#include "libgimp/gimpenums.h" -#include "libgimp/gimpcolorspace.h" -#include "libgimp/gimpfeatures.h" -#include "libgimp/gimpenv.h" -#include "libgimp/gimplimits.h" -#include "libgimp/gimpmath.h" -#include "libgimp/gimpparasite.h" -#include "libgimp/gimpparasiteP.h" -#include "libgimp/gimpunit.h" -#include "libgimp/gimputils.h" -#include "libgimp/gimpvector.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "libgimp/gimpcompat.h" /* to be removed in 1.3 */ +#include /* to be removed in 1.3 */ #ifdef G_OS_WIN32 # include /* For _-argc and __argv */ @@ -95,47 +94,47 @@ struct _GPlugInInfo struct _GTile { - guint ewidth; /* the effective width of the tile */ - guint eheight; /* the effective height of the tile */ - guint bpp; /* the bytes per pixel (1, 2, 3 or 4 ) */ - guint tile_num; /* the number of this tile within the drawable */ - guint16 ref_count; /* reference count for the tile */ - guint dirty : 1; /* is the tile dirty? has it been modified? */ - guint shadow: 1; /* is this a shadow tile */ - guchar *data; /* the pixel data for the tile */ + guint ewidth; /* the effective width of the tile */ + guint eheight; /* the effective height of the tile */ + guint bpp; /* the bytes per pixel (1, 2, 3 or 4 ) */ + guint tile_num; /* the number of this tile within the drawable */ + guint16 ref_count; /* reference count for the tile */ + guint dirty : 1; /* is the tile dirty? has it been modified? */ + guint shadow: 1; /* is this a shadow tile */ + guchar *data; /* the pixel data for the tile */ GDrawable *drawable; /* the drawable this tile came from */ }; struct _GDrawable { - gint32 id; /* drawable ID */ - guint width; /* width of drawble */ - guint height; /* height of drawble */ - guint bpp; /* bytes per pixel of drawable */ - guint ntile_rows; /* # of tile rows */ - guint ntile_cols; /* # of tile columns */ - GTile *tiles; /* the normal tiles */ - GTile *shadow_tiles; /* the shadow tiles */ + gint32 id; /* drawable ID */ + guint width; /* width of drawble */ + guint height; /* height of drawble */ + guint bpp; /* bytes per pixel of drawable */ + guint ntile_rows; /* # of tile rows */ + guint ntile_cols; /* # of tile columns */ + GTile *tiles; /* the normal tiles */ + GTile *shadow_tiles; /* the shadow tiles */ }; struct _GPixelRgn { - guchar *data; /* pointer to region data */ - GDrawable *drawable; /* pointer to drawable */ - guint bpp; /* bytes per pixel */ - guint rowstride; /* bytes per pixel row */ - guint x, y; /* origin */ - guint w, h; /* width and height of region */ - guint dirty : 1; /* will this region be dirtied? */ - guint shadow : 1; /* will this region use the shadow or normal tiles */ - guint process_count; /* used internally */ + guchar *data; /* pointer to region data */ + GDrawable *drawable; /* pointer to drawable */ + guint bpp; /* bytes per pixel */ + guint rowstride; /* bytes per pixel row */ + guint x, y; /* origin */ + guint w, h; /* width and height of region */ + guint dirty : 1; /* will this region be dirtied? */ + guint shadow : 1; /* will this region use the shadow or normal tiles */ + guint process_count; /* used internally */ }; struct _GParamDef { - GParamType type; - gchar *name; - gchar *description; + GParamType type; + gchar *name; + gchar *description; }; struct _GParamColor diff --git a/libgimp/gimpcolordisplay.h b/libgimp/gimpcolordisplay.h index 5d59c79dd0..3d33830e60 100644 --- a/libgimp/gimpcolordisplay.h +++ b/libgimp/gimpcolordisplay.h @@ -22,7 +22,8 @@ #include #include -#include +#include "gimpparasite.h" + typedef void (* GimpColorDisplayInit) (void); typedef gpointer (* GimpColorDisplayNew) (gint type); diff --git a/libgimp/gimpparasite.c b/libgimp/gimpparasite.c index ab71972247..e42566e05e 100644 --- a/libgimp/gimpparasite.c +++ b/libgimp/gimpparasite.c @@ -19,11 +19,8 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ - #include "config.h" -#include "parasiteP.h" -#include "parasite.h" #include #ifdef HAVE_UNISTD_H #include @@ -35,6 +32,9 @@ #include /* For _getpid() */ #endif +#include "gimpparasite.h" + + #ifdef DEBUG static void gimp_parasite_print (GimpParasite *parasite) diff --git a/libgimp/gimpparasite.h b/libgimp/gimpparasite.h index dc536cf55c..ccaf5c7aa0 100644 --- a/libgimp/gimpparasite.h +++ b/libgimp/gimpparasite.h @@ -19,15 +19,9 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ - #ifndef __GIMP_PARASITE_H__ #define __GIMP_PARASITE_H__ -#include -#include - -#include "libgimp/gimpparasiteF.h" - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -43,6 +37,19 @@ extern "C" { #define GIMP_PARASITE_GRANDPARENT_PERSISTENT (GIMP_PARASITE_PERSISTENT << 16) #define GIMP_PARASITE_GRANDPARENT_UNDOABLE (GIMP_PARASITE_UNDOABLE << 16) + +typedef struct _GimpParasite GimpParasite; + +struct _GimpParasite +{ + gchar *name; /* The name of the parasite. USE A UNIQUE PREFIX! */ + guint32 flags; /* save Parasite in XCF file, etc. */ + guint32 size; /* amount of data */ + gpointer data; /* a pointer to the data. plugin is * + * responsible for tracking byte order */ +}; + + GimpParasite * gimp_parasite_new (const gchar *name, guint32 flags, guint32 size, diff --git a/libgimp/gimpparasiteF.h b/libgimp/gimpparasiteF.h deleted file mode 100644 index 397a57052f..0000000000 --- a/libgimp/gimpparasiteF.h +++ /dev/null @@ -1,27 +0,0 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball - * - * gimpparasiteF.h - * Copyright (C) 1998 Jay Cox - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ -#ifndef __GIMP_PARASITE_F_H__ -#define __GIMP_PARASITE_F_H__ - -typedef struct _GimpParasite GimpParasite; - -#endif /* __GIMP_PARASITE_F_H__ */ diff --git a/libgimp/gimpparasiteP.h b/libgimp/gimpparasiteP.h deleted file mode 100644 index 5109994dae..0000000000 --- a/libgimp/gimpparasiteP.h +++ /dev/null @@ -1,44 +0,0 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball - * - * gimpparasiteP.h - * Copyright (C) 1998 Jay Cox - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ -#ifndef __GIMP_PARASITE_P_H__ -#define __GIMP_PARASITE_P_H__ - -#include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -struct _GimpParasite -{ - gchar *name; /* The name of the parasite. USE A UNIQUE PREFIX! */ - guint32 flags; /* save Parasite in XCF file, etc. */ - guint32 size; /* amount of data */ - gpointer data; /* a pointer to the data. plugin is * - * responsible for tracking byte order */ -}; - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __GIMP_PARASITE_P_H__ */ diff --git a/libgimp/gimpparasiteio.c b/libgimp/gimpparasiteio.c index 7d94663bb3..ad777e24d6 100644 --- a/libgimp/gimpparasiteio.c +++ b/libgimp/gimpparasiteio.c @@ -33,7 +33,7 @@ #include -#include "parasiteio.h" +#include "gimpparasiteio.h" void diff --git a/libgimp/gimpprotocol.c b/libgimp/gimpprotocol.c index 566b910677..b75d3f5106 100644 --- a/libgimp/gimpprotocol.c +++ b/libgimp/gimpprotocol.c @@ -18,11 +18,12 @@ */ #include +#include + #include "gimpenums.h" +#include "gimpparasite.h" #include "gimpprotocol.h" #include "gimpwire.h" -#include "parasite.h" -#include "parasiteP.h" static void _gp_quit_read (GIOChannel *channel, diff --git a/libgimp/gimpui.h b/libgimp/gimpui.h index 501dec60db..a6d7fa9904 100644 --- a/libgimp/gimpui.h +++ b/libgimp/gimpui.h @@ -21,19 +21,19 @@ #include -#include "gimpchainbutton.h" -#include "gimpcolorbutton.h" -#include "gimpdialog.h" -#include "gimpexport.h" -#include "gimpfileselection.h" -#include "gimphelpui.h" -#include "gimpmenu.h" -#include "gimppatheditor.h" -#include "gimppixmap.h" -#include "gimpquerybox.h" -#include "gimpsizeentry.h" -#include "gimpunitmenu.h" -#include "gimpwidgets.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include void gimp_ui_init (gchar *prog_name, gboolean preview); diff --git a/libgimpbase/gimpparasite.c b/libgimpbase/gimpparasite.c index ab71972247..e42566e05e 100644 --- a/libgimpbase/gimpparasite.c +++ b/libgimpbase/gimpparasite.c @@ -19,11 +19,8 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ - #include "config.h" -#include "parasiteP.h" -#include "parasite.h" #include #ifdef HAVE_UNISTD_H #include @@ -35,6 +32,9 @@ #include /* For _getpid() */ #endif +#include "gimpparasite.h" + + #ifdef DEBUG static void gimp_parasite_print (GimpParasite *parasite) diff --git a/libgimpbase/gimpparasite.h b/libgimpbase/gimpparasite.h index dc536cf55c..ccaf5c7aa0 100644 --- a/libgimpbase/gimpparasite.h +++ b/libgimpbase/gimpparasite.h @@ -19,15 +19,9 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ - #ifndef __GIMP_PARASITE_H__ #define __GIMP_PARASITE_H__ -#include -#include - -#include "libgimp/gimpparasiteF.h" - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -43,6 +37,19 @@ extern "C" { #define GIMP_PARASITE_GRANDPARENT_PERSISTENT (GIMP_PARASITE_PERSISTENT << 16) #define GIMP_PARASITE_GRANDPARENT_UNDOABLE (GIMP_PARASITE_UNDOABLE << 16) + +typedef struct _GimpParasite GimpParasite; + +struct _GimpParasite +{ + gchar *name; /* The name of the parasite. USE A UNIQUE PREFIX! */ + guint32 flags; /* save Parasite in XCF file, etc. */ + guint32 size; /* amount of data */ + gpointer data; /* a pointer to the data. plugin is * + * responsible for tracking byte order */ +}; + + GimpParasite * gimp_parasite_new (const gchar *name, guint32 flags, guint32 size, diff --git a/libgimpbase/gimpparasiteio.c b/libgimpbase/gimpparasiteio.c index 7d94663bb3..ad777e24d6 100644 --- a/libgimpbase/gimpparasiteio.c +++ b/libgimpbase/gimpparasiteio.c @@ -33,7 +33,7 @@ #include -#include "parasiteio.h" +#include "gimpparasiteio.h" void diff --git a/libgimpbase/gimpprotocol.c b/libgimpbase/gimpprotocol.c index 566b910677..b75d3f5106 100644 --- a/libgimpbase/gimpprotocol.c +++ b/libgimpbase/gimpprotocol.c @@ -18,11 +18,12 @@ */ #include +#include + #include "gimpenums.h" +#include "gimpparasite.h" #include "gimpprotocol.h" #include "gimpwire.h" -#include "parasite.h" -#include "parasiteP.h" static void _gp_quit_read (GIOChannel *channel, diff --git a/libgimpwidgets/gimpcolorselect.c b/libgimpwidgets/gimpcolorselect.c index 62ec9f1f12..1bfc7a04d3 100644 --- a/libgimpwidgets/gimpcolorselect.c +++ b/libgimpwidgets/gimpcolorselect.c @@ -31,7 +31,7 @@ #include "session.h" #include "color_area.h" /* for color_area_draw_rect */ -#include "libgimp/color_selector.h" +#include "libgimp/gimpcolorselector.h" #include "libgimp/gimpintl.h" diff --git a/modules/Makefile.am b/modules/Makefile.am index 76942a2143..8b8c98fc37 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -6,23 +6,23 @@ CPPFLAGS = \ -DMODULE_COMPILATION INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/intl \ - $(GTK_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ + $(GTK_CFLAGS) \ -I$(includedir) EXTRA_DIST = \ makefile.cygwin \ makefile.msc \ module.def \ - modregister.c \ - modregister.h + gimpmodregister.c \ + gimpmodregister.h libexec_LTLIBRARIES = \ - libcolorsel_gtk.la \ - libcolorsel_triangle.la \ - libcolorsel_water.la \ - libcdisplay_gamma.la \ + libcolorsel_gtk.la \ + libcolorsel_triangle.la \ + libcolorsel_water.la \ + libcdisplay_gamma.la \ libcdisplay_highcontrast.la libcolorsel_gtk_la_SOURCES = colorsel_gtk.c diff --git a/modules/cdisplay_gamma.c b/modules/cdisplay_gamma.c index c51d21f004..bd1e829741 100644 --- a/modules/cdisplay_gamma.c +++ b/modules/cdisplay_gamma.c @@ -21,15 +21,15 @@ #include -#include -#include -#include -#include -#include - #include "app/dialog_handler.h" -#include "modregister.h" +#include "gimpmodregister.h" + +#include +#include +#include +#include +#include #include "libgimp/gimpintl.h" diff --git a/modules/cdisplay_highcontrast.c b/modules/cdisplay_highcontrast.c index c0c8c4373a..1f5f8fff15 100644 --- a/modules/cdisplay_highcontrast.c +++ b/modules/cdisplay_highcontrast.c @@ -21,15 +21,15 @@ #include -#include -#include -#include -#include -#include - #include "app/dialog_handler.h" -#include "modregister.h" +#include "gimpmodregister.h" + +#include +#include +#include +#include +#include #include "libgimp/gimpintl.h" diff --git a/modules/colorsel_gtk.c b/modules/colorsel_gtk.c index 8bcc8fb0d5..3d23978ca8 100644 --- a/modules/colorsel_gtk.c +++ b/modules/colorsel_gtk.c @@ -20,11 +20,16 @@ #include "config.h" #include + #include -#include -#include -#include -#include "modregister.h" + +#include "gimpmodregister.h" + +#include "libgimp/gimpcolorselector.h" +#include "libgimp/gimpmodule.h" + +#include "libgimp/gimpintl.h" + /* prototypes */ static GtkWidget * colorsel_gtk_new (int, int, int, diff --git a/modules/colorsel_triangle.c b/modules/colorsel_triangle.c index eb6d2a1535..8e53e242e1 100644 --- a/modules/colorsel_triangle.c +++ b/modules/colorsel_triangle.c @@ -27,13 +27,14 @@ #include #include -#include +#include "gimpmodregister.h" + +#include #include #include -#include "modregister.h" +#include "libgimp/gimpintl.h" -#include /* prototypes */ static GtkWidget * colorsel_triangle_new (int, int, int, diff --git a/modules/colorsel_water.c b/modules/colorsel_water.c index 2050fc16c3..4a17be63a1 100644 --- a/modules/colorsel_water.c +++ b/modules/colorsel_water.c @@ -25,11 +25,11 @@ #include -#include +#include #include #include -#include "modregister.h" +#include "gimpmodregister.h" #include diff --git a/modules/modregister.c b/modules/modregister.c deleted file mode 100644 index 5a72a7fa87..0000000000 --- a/modules/modregister.c +++ /dev/null @@ -1,130 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * - */ -#ifdef __EMX__ - -#include "config.h" - -#include -#include -#include - -#include -#include -#include -#include -#include "modregister.h" - -struct main_funcs_struc *gimp_main_funcs = NULL; - -gpointer get_main_func(gchar *name) -{ - struct main_funcs_struc *x; - if (gimp_main_funcs == NULL) - return NULL; - for (x = gimp_main_funcs; x->name; x++) - { - if (!strcmp(x->name, name)) - return (gpointer) x->func; - } -} - -GimpColorSelectorID -mod_color_selector_register (const char *name, - const char *help_page, - GimpColorSelectorMethods *methods) -{ - GimpColorSelectorID id; - color_reg_func reg_func; - - reg_func = (color_reg_func) get_main_func("gimp_color_selector_register"); - if (!reg_func) - return 0; - id = (*reg_func) (name, help_page, methods); - return (id); -} - -G_MODULE_EXPORT gboolean -mod_color_display_register (const char *name, - GimpColorDisplayMethods *methods) -{ - gboolean retval; - display_reg_func reg_func; - - reg_func = (display_reg_func) get_main_func("gimp_color_display_register"); - if (!reg_func) - return 0; - retval = (*reg_func) (name, methods); - return (retval); - -} - -gboolean -mod_color_selector_unregister (GimpColorSelectorID id, - void (*callback)(void *data), - void *data) -{ - color_unreg_func unreg_func; - gboolean status; - - unreg_func = (color_unreg_func) get_main_func("gimp_color_selector_unregister"); - if (unreg_func) - { - status = (*unreg_func) (id, callback, data); - } - else - status = FALSE; - return (status); -} - -G_MODULE_EXPORT gboolean -mod_color_display_unregister (const char *name) -{ - display_unreg_func unreg_func; - gboolean status; - - unreg_func = (display_unreg_func) get_main_func("gimp_color_display_unregister"); - if (unreg_func) - { - status = (*unreg_func) (name); - } - else - status = FALSE; - return (status); -} - -void mod_dialog_register (GtkWidget *dialog) -{ - dialog_reg_func reg_func; - - reg_func = (dialog_reg_func) get_main_func("dialog_register"); - if (!reg_func) - return; - (*reg_func) (dialog); -} - -void mod_dialog_unregister (GtkWidget *dialog) -{ - dialog_reg_func reg_func; - - reg_func = (dialog_reg_func) get_main_func("dialog_unregister"); - if (!reg_func) - return; - (*reg_func) (dialog); -} - -#endif diff --git a/modules/modregister.h b/modules/modregister.h deleted file mode 100644 index c05c7361a5..0000000000 --- a/modules/modregister.h +++ /dev/null @@ -1,69 +0,0 @@ -/* The GIMP -- an image manipulation program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ -#ifndef __MODREGISTER_H__ -#define __MODREGISTER_H__ - - -#ifdef __EMX__ - -#include -#include - -struct main_funcs_struc { - gchar *name; - void (*func)(); -}; - -typedef GimpColorSelectorID (*color_reg_func)(const char *, - const char *, - GimpColorSelectorMethods *); -typedef G_MODULE_EXPORT gboolean (*display_reg_func) - (const char *,GimpColorDisplayMethods *); - -typedef gboolean (*color_unreg_func) (GimpColorSelectorID, - void (*)(void *), - void *); -typedef G_MODULE_EXPORT gboolean (*display_unreg_func) (const char *name); - -typedef void (*dialog_reg_func) (GtkWidget *dialog); - -void mod_dialog_register (GtkWidget *dialog); -void mod_dialog_unregister (GtkWidget *dialog); -#define dialog_register mod_dialog_register -#define dialog_unregister mod_dialog_unregister - -GimpColorSelectorID -mod_color_selector_register (const char *name, - const char *help_page, - GimpColorSelectorMethods *methods); -gboolean -mod_color_selector_unregister (GimpColorSelectorID id, - void (*callback)(void *data), - void *data); - -G_MODULE_EXPORT gboolean -mod_color_display_register (const char *name, - GimpColorDisplayMethods *methods); - -G_MODULE_EXPORT gboolean -mod_color_display_unregister (const char *name); - -#endif - - -#endif /* __MODREGISTER_H__ */ diff --git a/plug-ins/FractalExplorer/Dialogs.c b/plug-ins/FractalExplorer/Dialogs.c index 80e659f3fb..0707dce608 100644 --- a/plug-ins/FractalExplorer/Dialogs.c +++ b/plug-ins/FractalExplorer/Dialogs.c @@ -1,9 +1,10 @@ #include "config.h" -#include -#include +#include #include #include +#include +#include #include diff --git a/plug-ins/FractalExplorer/Events.c b/plug-ins/FractalExplorer/Events.c index 89b5394f19..309fe31471 100644 --- a/plug-ins/FractalExplorer/Events.c +++ b/plug-ins/FractalExplorer/Events.c @@ -1,3 +1,5 @@ +#include + #include "FractalExplorer.h" #include "Events.h" #include "Dialogs.h" diff --git a/plug-ins/Lighting/lighting_apply.c b/plug-ins/Lighting/lighting_apply.c index 1f7bc616c9..1f7ef126f8 100644 --- a/plug-ins/Lighting/lighting_apply.c +++ b/plug-ins/Lighting/lighting_apply.c @@ -2,6 +2,8 @@ /* Apply mapping and shading on the whole input image */ /******************************************************/ +#include + #include #include diff --git a/plug-ins/Lighting/lighting_shade.c b/plug-ins/Lighting/lighting_shade.c index 7dd527dc8e..e3b0d25f7a 100644 --- a/plug-ins/Lighting/lighting_shade.c +++ b/plug-ins/Lighting/lighting_shade.c @@ -2,6 +2,8 @@ /* Shading stuff */ /*****************/ +#include + #include #include diff --git a/plug-ins/MapObject/mapobject_image.c b/plug-ins/MapObject/mapobject_image.c index 1986c6ac08..4047dfc346 100644 --- a/plug-ins/MapObject/mapobject_image.c +++ b/plug-ins/MapObject/mapobject_image.c @@ -5,6 +5,8 @@ /* mapobject_preview.c and mapobject_apply.c */ /*********************************************************/ +#include + #include #include diff --git a/plug-ins/common/gpb.c b/plug-ins/common/gpb.c index 9fee6f96e1..c5c9d60722 100644 --- a/plug-ins/common/gpb.c +++ b/plug-ins/common/gpb.c @@ -34,7 +34,7 @@ #include #include -#include +#include #include "app/brush_header.h" #include "app/pattern_header.h" diff --git a/plug-ins/common/psp.c b/plug-ins/common/psp.c index 397b256948..4e468c6582 100644 --- a/plug-ins/common/psp.c +++ b/plug-ins/common/psp.c @@ -50,7 +50,7 @@ #include #include -#include +#include #include "libgimp/stdplugins-intl.h" diff --git a/plug-ins/sel2path/sel2path.c b/plug-ins/sel2path/sel2path.c index 10ecae3c12..5107cd9fd6 100644 --- a/plug-ins/sel2path/sel2path.c +++ b/plug-ins/sel2path/sel2path.c @@ -36,9 +36,11 @@ #include #include -#include "gtk/gtk.h" -#include "libgimp/gimp.h" -#include "libgimp/stdplugins-intl.h" +#include + +#include +#include + #include "global.h" #include "types.h" #include "pxl-outline.h" @@ -46,6 +48,9 @@ #include "spline.h" #include "sel2path.h" +#include "libgimp/stdplugins-intl.h" + + #define MID_POINT 127 /***** Magic numbers *****/ diff --git a/po-libgimp/POTFILES.in b/po-libgimp/POTFILES.in index 528310d800..e29e0ecc9d 100644 --- a/po-libgimp/POTFILES.in +++ b/po-libgimp/POTFILES.in @@ -5,8 +5,7 @@ libgimp/gimpcolorbutton.c libgimp/gimpexport.c libgimp/gimpfileselection.c libgimp/gimpquerybox.c -libgimp/gimpunit.c libgimp/gimpunitmenu.c -libgimp/gimpunit.c +libgimp/gimpunit_pdb.c libgimp/gimpunitmenu.c -libgimp/gimpwidgets.c \ No newline at end of file +libgimp/gimpwidgets.c diff --git a/tools/pdbgen/pdb.pl b/tools/pdbgen/pdb.pl index 8e754716f4..f5d51335d0 100644 --- a/tools/pdbgen/pdb.pl +++ b/tools/pdbgen/pdb.pl @@ -70,7 +70,7 @@ package Gimp::CodeGen::pdb; id_ret_func => 'drawable_ID (GIMP_DRAWABLE ($var))' }, parasite => { name => 'PARASITE', type => 'GimpParasite *', - headers => [ qw("libgimp/parasite.h") ] }, + headers => [ qw("libgimp/gimpparasite.h") ] }, boundary => { name => 'BOUNDARY', type => 'gpointer ' }, # ??? FIXME path => { name => 'PATH' , type => 'gpointer ' }, # ??? FIXME diff --git a/tools/pdbgen/pdb/parasite.pdb b/tools/pdbgen/pdb/parasite.pdb index 35dff3614c..99831aeb9f 100644 --- a/tools/pdbgen/pdb/parasite.pdb +++ b/tools/pdbgen/pdb/parasite.pdb @@ -168,7 +168,7 @@ sub parasite_list { %invoke = ( code => 'parasites = gimp_parasite_list (&num_parasites);' ); } -@headers = qw("libgimp/parasite.h" "gimpparasite.h" "gimpdrawable.h" +@headers = qw("gimpparasite.h" "gimpdrawable.h" "gimpimage.h"); $extra{lib}->{protos} = <<'CODE';