Final (1.2) libgimp namespace cleanup part I:

2000-05-26  Michael Natterer  <mitch@gimp.org>

	Final (1.2) libgimp namespace cleanup part I:

	* app/gimpbrushpipe.c
	* app/gimpdrawable.[ch]
	* app/gimpimage.[ch]
	* app/gimpparasite.[ch]
	* app/gimprc.c
	* app/image_new.c
	* app/parasite_cmds.c
	* app/parasitelist.[ch]
	* app/parasitelistP.h
	* app/plug_in.c
	* app/undo.c
	* app/xcf.c
	* libgimp/color_display.h
	* libgimp/gimp.[ch]
	* libgimp/gimpdrawable.c
	* libgimp/gimpimage.c
	* libgimp/gimpparasite.c
	* libgimp/gimpprotocol.c
	* libgimp/parasite.[ch]
	* libgimp/parasiteF.h
	* libgimp/parasiteP.h
	* libgimp/parasiteio.[ch]
	* modules/cdisplay_gamma.c
	* modules/cdisplay_highcontrast.c
	* plug-ins/common/csource.c
	* plug-ins/common/gif.c
	* plug-ins/common/gpb.c
	* plug-ins/common/jpeg.c
	* plug-ins/common/psp.c
	* plug-ins/common/tiff.c
	* plug-ins/common/xbm.c
	* plug-ins/gap/gap_exchange_image.c
	* plug-ins/gdyntext/gdyntext.c
	* plug-ins/ifscompose/ifscompose.c
	* plug-ins/xjt/xjt.c: s/Parasite/GimpParasite/g,
	                      s/parasite_*/gimp_parasite_*/g

	* libgimp/gimpcompat.h: added the old names.

	* tools/pdbgen/pdb.pl
	* tools/pdbgen/pdb/parasite.pdb: dito and an ugly perl hack to work
	around a substitution clash. Perl gurus, feel free to fix it.

ChangeLog

@@ -1,3 +1,50 @@
+2000-05-26  Michael Natterer  <mitch@gimp.org>
+
+	Final (1.2) libgimp namespace cleanup part I:
+
+	* app/gimpbrushpipe.c
+	* app/gimpdrawable.[ch]
+	* app/gimpimage.[ch]
+	* app/gimpparasite.[ch]
+	* app/gimprc.c
+	* app/image_new.c
+	* app/parasite_cmds.c
+	* app/parasitelist.[ch]
+	* app/parasitelistP.h
+	* app/plug_in.c
+	* app/undo.c
+	* app/xcf.c
+	* libgimp/color_display.h
+	* libgimp/gimp.[ch]
+	* libgimp/gimpdrawable.c
+	* libgimp/gimpimage.c
+	* libgimp/gimpparasite.c
+	* libgimp/gimpprotocol.c
+	* libgimp/parasite.[ch]
+	* libgimp/parasiteF.h
+	* libgimp/parasiteP.h
+	* libgimp/parasiteio.[ch]
+	* modules/cdisplay_gamma.c
+	* modules/cdisplay_highcontrast.c
+	* plug-ins/common/csource.c
+	* plug-ins/common/gif.c
+	* plug-ins/common/gpb.c
+	* plug-ins/common/jpeg.c
+	* plug-ins/common/psp.c
+	* plug-ins/common/tiff.c
+	* plug-ins/common/xbm.c
+	* plug-ins/gap/gap_exchange_image.c
+	* plug-ins/gdyntext/gdyntext.c
+	* plug-ins/ifscompose/ifscompose.c
+	* plug-ins/xjt/xjt.c: s/Parasite/GimpParasite/g,
+	                      s/parasite_*/gimp_parasite_*/g
+
+	* libgimp/gimpcompat.h: added the old names.
+
+	* tools/pdbgen/pdb.pl
+	* tools/pdbgen/pdb/parasite.pdb: dito and an ugly perl hack to work
+	around a substitution clash. Perl gurus, feel free to fix it.
+
 Fri May 26 22:33:05 BST 2000 Andy Thomas <alt@gimp.org>
 
 	* plug-ins/common/wind.c

app/actions/plug-in-commands.c

@@ -3053,8 +3053,8 @@ plug_in_params_to_args (GPParam *params,
 	  break;
 	case PDB_PARASITE:
 	  if (full_copy)
-	    args[i].value.pdb_pointer = parasite_copy ((Parasite *)
-						&(params[i].data.d_parasite));
+	    args[i].value.pdb_pointer =
+	      gimp_parasite_copy ((GimpParasite *) &(params[i].data.d_parasite));
 	  else
 	    args[i].value.pdb_pointer = (void *)&(params[i].data.d_parasite);
 	  break;
@@ -3219,34 +3219,35 @@ plug_in_args_to_params (Argument *args,
 	case PDB_PARASITE:
 	  if (full_copy)
 	    {
-	      Parasite *tmp;
-	      tmp = parasite_copy (args[i].value.pdb_pointer);
+	      GimpParasite *tmp;
+	      tmp = gimp_parasite_copy (args[i].value.pdb_pointer);
 	      if (tmp == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
-	      {
-		memcpy (&params[i].data.d_parasite, tmp, sizeof(Parasite));
-		g_free(tmp);
-	      }
+		{
+		  memcpy (&params[i].data.d_parasite, tmp,
+			  sizeof (GimpParasite));
+		  g_free (tmp);
+		}
 	    }
 	  else
 	    {
 	      if (args[i].value.pdb_pointer == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
 		memcpy (&params[i].data.d_parasite,
-			(Parasite *)(args[i].value.pdb_pointer),
-			sizeof(Parasite));
+			(GimpParasite *) (args[i].value.pdb_pointer),
+			sizeof (GimpParasite));
 	    }
 	  break;
 	case PDB_STATUS:
@@ -3405,10 +3406,10 @@ plug_in_args_destroy (Argument *args,
 	  break;
 	case PDB_PARASITE:
 	  if (full_destroy)
-	  {
-	    parasite_free ((Parasite *)(args[i].value.pdb_pointer));
-	    args[i].value.pdb_pointer = NULL;
-	  }
+	    {
+	      gimp_parasite_free ((GimpParasite *) (args[i].value.pdb_pointer));
+	      args[i].value.pdb_pointer = NULL;
+	    }
 	  break;
 	case PDB_STATUS:
 	  break;
@@ -3424,7 +3425,7 @@ gint
 plug_in_image_types_parse (gchar *image_types)
 {
   gchar *type_spec = image_types;
-  gint types = 0;
+  gint   types = 0;
 
   /* 
    *  If the plug_in registers with image_type == NULL or "", return 0

app/core/gimp-parasites.c

@@ -34,7 +34,7 @@
 static ParasiteList *parasites = NULL;
 
 void 
-gimp_init_parasites()
+gimp_init_parasites (void)
 {
   g_return_if_fail (parasites == NULL);
   parasites = parasite_list_new ();
@@ -42,55 +42,57 @@ gimp_init_parasites()
 }
 
 void
-gimp_parasite_attach (Parasite *p)
+gimp_parasite_attach (GimpParasite *p)
 {
   parasite_list_add (parasites, p);
 }
 
 void
-gimp_parasite_detach (const char *name)
+gimp_parasite_detach (const gchar *name)
 {
   parasite_list_remove (parasites, name);
 }
 
-Parasite *
-gimp_parasite_find (const char *name)
+GimpParasite *
+gimp_parasite_find (const gchar *name)
 {
   return parasite_list_find (parasites, name);
 }
 
 static void 
-list_func (char       *key, 
-	   Parasite   *p, 
-	   char     ***cur)
+list_func (gchar          *key,
+	   GimpParasite   *p,
+	   gchar        ***cur)
 {
   *(*cur)++ = (char *) g_strdup (key);
 }
 
-char **
+gchar **
 gimp_parasite_list (gint *count)
 {
-  gchar **list, **cur;
+  gchar **list;
+  gchar **cur;
 
   *count = parasite_list_length (parasites);
-  cur = list = (char **) g_malloc (sizeof (char *) * *count);
+  cur = list = g_new (gchar *, *count);
 
-  parasite_list_foreach (parasites, (GHFunc)list_func, &cur);
+  parasite_list_foreach (parasites, (GHFunc) list_func, &cur);
   
   return list;
 }
 
 static void 
-save_func (char     *key, 
-	   Parasite *p, 
-	   FILE     *fp)
+save_func (gchar        *key,
+	   GimpParasite *p,
+	   FILE         *fp)
 {
-  if (parasite_is_persistent (p))
+  if (gimp_parasite_is_persistent (p))
     {
-      gchar *s;
-      guint32 l;
+      gchar   *s;
+      guint32  l;
 
-      fprintf (fp, "(parasite \"%s\" %lu \"", parasite_name (p), parasite_flags (p));
+      fprintf (fp, "(parasite \"%s\" %lu \"",
+	       gimp_parasite_name (p), gimp_parasite_flags (p));
 
       /*
        * the current methodology is: never move the parasiterc from one
@@ -99,7 +101,7 @@ save_func (char     *key,
        * characters as \xHH sequences altogether.
        */
 
-      for (s = (gchar *)parasite_data (p), l = parasite_data_size (p);
+      for (s = (gchar *) gimp_parasite_data (p), l = gimp_parasite_data_size (p);
            l;
            l--, s++)
         {
@@ -123,8 +125,8 @@ save_func (char     *key,
 void
 gimp_parasiterc_save (void)
 {
-  char *filename;
-  FILE *fp;
+  gchar *filename;
+  FILE  *fp;
 
   filename = gimp_personal_rc_file ("#parasiterc.tmp~");
 
@@ -137,7 +139,7 @@ gimp_parasiterc_save (void)
 	   "# GIMP parasiterc\n"
 	   "# This file will be entirely rewritten every time you "
 	   "quit the gimp.\n\n");
-  
+
   parasite_list_foreach (parasites, (GHFunc)save_func, fp);
 
   fclose (fp);
@@ -149,22 +151,22 @@ gimp_parasiterc_save (void)
 	  gimp_personal_rc_file ("parasiterc.bak"));
 #endif
 
-  if (rename(gimp_personal_rc_file ("#parasiterc.tmp~"),
-	     gimp_personal_rc_file ("parasiterc")) != 0)
+  if (rename (gimp_personal_rc_file ("#parasiterc.tmp~"),
+	      gimp_personal_rc_file ("parasiterc")) != 0)
     {
 #if defined(G_OS_WIN32) || defined(__EMX__)
       /* Rename the old parasiterc back */
       rename (gimp_personal_rc_file ("parasiterc.bak"),
 	      gimp_personal_rc_file ("parasiterc"));
 #endif
-      unlink(gimp_personal_rc_file ("#parasiterc.tmp~"));
+      unlink (gimp_personal_rc_file ("#parasiterc.tmp~"));
     }
 }
 
 void
 gimp_parasiterc_load (void)
 {
-  char *filename;
+  gchar *filename;
 
   filename = gimp_personal_rc_file ("parasiterc");
   app_init_update_status (NULL, filename, -1);

app/core/gimp-parasites.h

@@ -14,18 +14,20 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-
-#ifndef __GIMP_PARASITE_H__
-#define __GIMP_PARASITE_H__
+#ifndef __APP_GIMP_PARASITE_H__
+#define __APP_GIMP_PARASITE_H__
 
 #include "libgimp/parasiteF.h"
 
-void       gimp_init_parasites  (void);
-void       gimp_parasite_attach (Parasite *p);
-void       gimp_parasite_detach (const gchar *name);
-Parasite * gimp_parasite_find   (const gchar *name);
-gchar **   gimp_parasite_list   (gint *count);
-void       gimp_parasiterc_save (void);
-void       gimp_parasiterc_load (void);
+void            gimp_init_parasites  (void);
 
-#endif  /*  __GIMP_PARASITE_H__  */
+void            gimp_parasite_attach (GimpParasite *parasite);
+void            gimp_parasite_detach (const gchar  *name);
+
+GimpParasite  * gimp_parasite_find   (const gchar  *name);
+gchar        ** gimp_parasite_list   (gint         *count);
+
+void            gimp_parasiterc_save (void);
+void            gimp_parasiterc_load (void);
+
+#endif  /*  __APP_GIMP_PARASITE_H__  */

app/core/gimpbrushpipe-load.c

@@ -268,9 +268,9 @@ gimp_brush_pipe_get_type (void)
 GimpBrushPipe *
 gimp_brush_pipe_load (gchar *filename)
 {
-  GimpBrushPipe *pipe;
-  GPattern      *pattern;
-  PixPipeParams  params;
+  GimpBrushPipe     *pipe;
+  GPattern          *pattern;
+  GimpPixPipeParams  params;
   FILE  *fp;
   gchar  buf[1024];
   gchar *name;
@@ -316,8 +316,8 @@ gimp_brush_pipe_load (gchar *filename)
 
   if (*paramstring)
     {
-      pixpipeparams_init (&params);
-      pixpipeparams_parse (paramstring, &params);
+      gimp_pixpipe_params_init (&params);
+      gimp_pixpipe_params_parse (paramstring, &params);
       pipe->dimension = params.dim;
       pipe->rank      = g_new (gint, pipe->dimension);
       pipe->select    = g_new (PipeSelectModes, pipe->dimension);

app/core/gimpbrushpipe.c

@@ -268,9 +268,9 @@ gimp_brush_pipe_get_type (void)
 GimpBrushPipe *
 gimp_brush_pipe_load (gchar *filename)
 {
-  GimpBrushPipe *pipe;
-  GPattern      *pattern;
-  PixPipeParams  params;
+  GimpBrushPipe     *pipe;
+  GPattern          *pattern;
+  GimpPixPipeParams  params;
   FILE  *fp;
   gchar  buf[1024];
   gchar *name;
@@ -316,8 +316,8 @@ gimp_brush_pipe_load (gchar *filename)
 
   if (*paramstring)
     {
-      pixpipeparams_init (&params);
-      pixpipeparams_parse (paramstring, &params);
+      gimp_pixpipe_params_init (&params);
+      gimp_pixpipe_params_parse (paramstring, &params);
       pipe->dimension = params.dim;
       pipe->rank      = g_new (gint, pipe->dimension);
       pipe->select    = g_new (PipeSelectModes, pipe->dimension);

app/core/gimpdrawable.c

@@ -15,9 +15,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
+#include "config.h"
+
 #include <stdlib.h>
-#include <math.h>
 #include <string.h>
+
 #include "gimpdrawableP.h"
 #include "gimpsignal.h"
 #include "gimage.h"
@@ -26,11 +28,14 @@
 #include "parasitelist.h"
 #include "undo.h"
 
-#include "config.h"
+#include "libgimp/gimpmath.h"
 #include "libgimp/parasite.h"
+
 #include "libgimp/gimpintl.h"
 
-enum {
+
+enum
+{
   INVALIDATE_PREVIEW,
   LAST_SIGNAL
 };
@@ -48,12 +53,12 @@ GtkType
 gimp_drawable_get_type (void)
 {
   static GtkType type;
-  GIMP_TYPE_INIT(type,
-		 GimpDrawable,
-		 GimpDrawableClass,
-		 gimp_drawable_init,
-		 gimp_drawable_class_init,
-		 GIMP_TYPE_OBJECT);
+  GIMP_TYPE_INIT (type,
+		  GimpDrawable,
+		  GimpDrawableClass,
+		  gimp_drawable_init,
+		  gimp_drawable_class_init,
+		  GIMP_TYPE_OBJECT);
   return type;
 }
 
@@ -440,7 +445,7 @@ gimp_drawable_get_color_at (GimpDrawable *drawable,
   return dest;
 }
 
-Parasite *
+GimpParasite *
 gimp_drawable_parasite_find (const GimpDrawable *drawable,
 			     const gchar        *name)
 {
@@ -450,9 +455,9 @@ gimp_drawable_parasite_find (const GimpDrawable *drawable,
 }
 
 static void
-list_func (gchar      *key,
-	   Parasite   *p,
-	   gchar    ***cur)
+list_func (gchar          *key,
+	   GimpParasite   *p,
+	   gchar        ***cur)
 {
   *(*cur)++ = (gchar *) g_strdup (key);
 }
@@ -476,38 +481,38 @@ gimp_drawable_parasite_list (GimpDrawable *drawable,
 
 void
 gimp_drawable_parasite_attach (GimpDrawable *drawable,
-			       Parasite     *parasite)
+			       GimpParasite *parasite)
 {
   g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
 
   /* only set the dirty bit manually if we can be saved and the new
      parasite differs from the current one and we arn't undoable */
-  if (parasite_is_undoable (parasite))
+  if (gimp_parasite_is_undoable (parasite))
     {
       /* do a group in case we have attach_parent set */
       undo_push_group_start (drawable->gimage, PARASITE_ATTACH_UNDO);
 
       undo_push_drawable_parasite (drawable->gimage, drawable, parasite);
     }
-  else if (parasite_is_persistent (parasite) &&
-	   !parasite_compare (parasite,
-			      gimp_drawable_parasite_find
-				(drawable, parasite_name (parasite))))
+  else if (gimp_parasite_is_persistent (parasite) &&
+	   !gimp_parasite_compare (parasite,
+				   gimp_drawable_parasite_find
+				   (drawable, gimp_parasite_name (parasite))))
     undo_push_cantundo (drawable->gimage, _("parasite attach to drawable"));
 
   parasite_list_add (drawable->parasites, parasite);
-  if (parasite_has_flag (parasite, PARASITE_ATTACH_PARENT))
+  if (gimp_parasite_has_flag (parasite, GIMP_PARASITE_ATTACH_PARENT))
     {
       parasite_shift_parent (parasite);
       gimp_image_parasite_attach (drawable->gimage, parasite);
     }
-  else if (parasite_has_flag (parasite, PARASITE_ATTACH_GRANDPARENT))
+  else if (gimp_parasite_has_flag (parasite, GIMP_PARASITE_ATTACH_GRANDPARENT))
     {
       parasite_shift_parent (parasite);
       parasite_shift_parent (parasite);
       gimp_parasite_attach (parasite);
     }
-  if (parasite_is_undoable (parasite))
+  if (gimp_parasite_is_undoable (parasite))
     {
       undo_push_group_end (drawable->gimage);
     }
@@ -517,17 +522,17 @@ void
 gimp_drawable_parasite_detach (GimpDrawable *drawable,
 			       const gchar  *parasite)
 {
-  Parasite *p;
+  GimpParasite *p;
 
   g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
 
   if (!(p = parasite_list_find (drawable->parasites, parasite)))
     return;
 
-  if (parasite_is_undoable (p))
+  if (gimp_parasite_is_undoable (p))
     undo_push_drawable_parasite_remove (drawable->gimage, drawable,
-					parasite_name (p));
-  else if (parasite_is_persistent (p))
+					gimp_parasite_name (p));
+  else if (gimp_parasite_is_persistent (p))
     undo_push_cantundo (drawable->gimage, _("detach parasite from drawable"));
 
   parasite_list_remove (drawable->parasites, parasite);

app/core/gimpdrawable.h

@@ -69,10 +69,11 @@ void 		 gimp_drawable_set_name	          (GimpDrawable *, gchar *);
 guchar *         gimp_drawable_get_color_at       (GimpDrawable *,
 						   gint x, gint y);
 
-void             gimp_drawable_parasite_attach    (GimpDrawable *, Parasite *);
+void             gimp_drawable_parasite_attach    (GimpDrawable *,
+						   GimpParasite *);
 void             gimp_drawable_parasite_detach    (GimpDrawable *,
 						   const gchar *);
-Parasite *       gimp_drawable_parasite_find      (const GimpDrawable *,
+GimpParasite *   gimp_drawable_parasite_find      (const GimpDrawable *,
 						   const gchar *);
 gchar **         gimp_drawable_parasite_list      (GimpDrawable *drawable,
                                                    gint *count);

app/core/gimpimage-guides.c

@@ -191,7 +191,7 @@ gimp_image_init (GimpImage *gimage)
   gimage->comp_preview_valid[1] = FALSE;
   gimage->comp_preview_valid[2] = FALSE;
   gimage->comp_preview          = NULL;
-  gimage->parasites             = parasite_list_new();
+  gimage->parasites             = parasite_list_new ();
   gimage->xresolution           = default_xresolution;
   gimage->yresolution           = default_yresolution;
   gimage->unit                  = default_units;
@@ -1133,7 +1133,7 @@ gimp_image_delete_guide (GimpImage *gimage,
 }
 
 
-Parasite *
+GimpParasite *
 gimp_image_parasite_find (const GimpImage *gimage, 
 			  const gchar     *name)
 {
@@ -1143,9 +1143,9 @@ gimp_image_parasite_find (const GimpImage *gimage,
 }
 
 static void
-list_func (gchar      *key, 
-	   Parasite   *p, 
-	   gchar    ***cur)
+list_func (gchar          *key, 
+	   GimpParasite   *p, 
+	   gchar        ***cur)
 {
   *(*cur)++ = (gchar *) g_strdup (key);
 }
@@ -1167,24 +1167,24 @@ gimp_image_parasite_list (GimpImage *gimage,
 }
 
 void
-gimp_image_parasite_attach (GimpImage *gimage, 
-			    Parasite  *parasite)
+gimp_image_parasite_attach (GimpImage    *gimage, 
+			    GimpParasite *parasite)
 {
   g_return_if_fail (GIMP_IS_IMAGE (gimage));
 
   /* only set the dirty bit manually if we can be saved and the new
      parasite differs from the current one and we aren't undoable */
-  if (parasite_is_undoable (parasite))
+  if (gimp_parasite_is_undoable (parasite))
     undo_push_image_parasite (gimage, parasite);
-  if (parasite_is_persistent (parasite)
-      && !parasite_compare (parasite,
-			    gimp_image_parasite_find (gimage,
-						      parasite_name (parasite))))
+  if (gimp_parasite_is_persistent (parasite) &&
+      !gimp_parasite_compare (parasite,
+			      gimp_image_parasite_find (gimage,
+							gimp_parasite_name (parasite))))
     undo_push_cantundo (gimage, _("attach parasite to image"));
 
   parasite_list_add (gimage->parasites, parasite);
 
-  if (parasite_has_flag (parasite, PARASITE_ATTACH_PARENT))
+  if (gimp_parasite_has_flag (parasite, GIMP_PARASITE_ATTACH_PARENT))
     {
       parasite_shift_parent (parasite);
       gimp_parasite_attach (parasite);
@@ -1195,16 +1195,16 @@ void
 gimp_image_parasite_detach (GimpImage   *gimage, 
 			    const gchar *parasite)
 {
-  Parasite *p;
+  GimpParasite *p;
 
   g_return_if_fail (GIMP_IS_IMAGE (gimage));
 
-  if (!(p = parasite_list_find(gimage->parasites, parasite)))
+  if (!(p = parasite_list_find (gimage->parasites, parasite)))
     return;
 
-  if (parasite_is_undoable (p))
-    undo_push_image_parasite_remove (gimage, parasite_name (p));
-  else if (parasite_is_persistent (p))
+  if (gimp_parasite_is_undoable (p))
+    undo_push_image_parasite_remove (gimage, gimp_parasite_name (p));
+  else if (gimp_parasite_is_persistent (p))
     undo_push_cantundo (gimage, _("detach parasite from image"));
 
   parasite_list_remove (gimage->parasites, parasite);
@@ -2792,9 +2792,8 @@ gimp_image_merge_layers (GimpImage *gimage,
 
   /* Copy the tattoo and parasites of the bottom layer to the new layer */
   layer_set_tattoo(merge_layer, layer_get_tattoo(layer));
-  GIMP_DRAWABLE(merge_layer)->parasites 
-    = parasite_list_copy(GIMP_DRAWABLE(layer)->parasites);
-
+  GIMP_DRAWABLE(merge_layer)->parasites =
+    parasite_list_copy (GIMP_DRAWABLE(layer)->parasites);
 
   while (reverse_list)
     {

app/core/gimpimage-guides.h

@@ -160,11 +160,12 @@ void            gimp_image_add_guide              (GimpImage *, Guide *);
 void            gimp_image_remove_guide           (GimpImage *, Guide *);
 void            gimp_image_delete_guide           (GimpImage *, Guide *);
 
-Parasite *      gimp_image_parasite_find          (const GimpImage *,
+GimpParasite *  gimp_image_parasite_find          (const GimpImage *,
 						   const gchar *name);
 gchar **        gimp_image_parasite_list          (GimpImage *gimage,
                                                    gint *count);
-void            gimp_image_parasite_attach        (GimpImage *, Parasite *);
+void            gimp_image_parasite_attach        (GimpImage *,
+						   GimpParasite *);
 void            gimp_image_parasite_detach        (GimpImage *, const gchar *);
 
 Tattoo          gimp_image_get_new_tattoo         (GimpImage *);

app/core/gimpimage-merge.c

@@ -191,7 +191,7 @@ gimp_image_init (GimpImage *gimage)
   gimage->comp_preview_valid[1] = FALSE;
   gimage->comp_preview_valid[2] = FALSE;
   gimage->comp_preview          = NULL;
-  gimage->parasites             = parasite_list_new();
+  gimage->parasites             = parasite_list_new ();
   gimage->xresolution           = default_xresolution;
   gimage->yresolution           = default_yresolution;
   gimage->unit                  = default_units;
@@ -1133,7 +1133,7 @@ gimp_image_delete_guide (GimpImage *gimage,
 }
 
 
-Parasite *
+GimpParasite *
 gimp_image_parasite_find (const GimpImage *gimage, 
 			  const gchar     *name)
 {
@@ -1143,9 +1143,9 @@ gimp_image_parasite_find (const GimpImage *gimage,
 }
 
 static void
-list_func (gchar      *key, 
-	   Parasite   *p, 
-	   gchar    ***cur)
+list_func (gchar          *key, 
+	   GimpParasite   *p, 
+	   gchar        ***cur)
 {
   *(*cur)++ = (gchar *) g_strdup (key);
 }
@@ -1167,24 +1167,24 @@ gimp_image_parasite_list (GimpImage *gimage,
 }
 
 void
-gimp_image_parasite_attach (GimpImage *gimage, 
-			    Parasite  *parasite)
+gimp_image_parasite_attach (GimpImage    *gimage, 
+			    GimpParasite *parasite)
 {
   g_return_if_fail (GIMP_IS_IMAGE (gimage));
 
   /* only set the dirty bit manually if we can be saved and the new
      parasite differs from the current one and we aren't undoable */
-  if (parasite_is_undoable (parasite))
+  if (gimp_parasite_is_undoable (parasite))
     undo_push_image_parasite (gimage, parasite);
-  if (parasite_is_persistent (parasite)
-      && !parasite_compare (parasite,
-			    gimp_image_parasite_find (gimage,
-						      parasite_name (parasite))))
+  if (gimp_parasite_is_persistent (parasite) &&
+      !gimp_parasite_compare (parasite,
+			      gimp_image_parasite_find (gimage,
+							gimp_parasite_name (parasite))))
     undo_push_cantundo (gimage, _("attach parasite to image"));
 
   parasite_list_add (gimage->parasites, parasite);
 
-  if (parasite_has_flag (parasite, PARASITE_ATTACH_PARENT))
+  if (gimp_parasite_has_flag (parasite, GIMP_PARASITE_ATTACH_PARENT))
     {
       parasite_shift_parent (parasite);
       gimp_parasite_attach (parasite);
@@ -1195,16 +1195,16 @@ void
 gimp_image_parasite_detach (GimpImage   *gimage, 
 			    const gchar *parasite)
 {
-  Parasite *p;
+  GimpParasite *p;
 
   g_return_if_fail (GIMP_IS_IMAGE (gimage));
 
-  if (!(p = parasite_list_find(gimage->parasites, parasite)))
+  if (!(p = parasite_list_find (gimage->parasites, parasite)))
     return;
 
-  if (parasite_is_undoable (p))
-    undo_push_image_parasite_remove (gimage, parasite_name (p));
-  else if (parasite_is_persistent (p))
+  if (gimp_parasite_is_undoable (p))
+    undo_push_image_parasite_remove (gimage, gimp_parasite_name (p));
+  else if (gimp_parasite_is_persistent (p))
     undo_push_cantundo (gimage, _("detach parasite from image"));
 
   parasite_list_remove (gimage->parasites, parasite);
@@ -2792,9 +2792,8 @@ gimp_image_merge_layers (GimpImage *gimage,
 
   /* Copy the tattoo and parasites of the bottom layer to the new layer */
   layer_set_tattoo(merge_layer, layer_get_tattoo(layer));
-  GIMP_DRAWABLE(merge_layer)->parasites 
-    = parasite_list_copy(GIMP_DRAWABLE(layer)->parasites);
-
+  GIMP_DRAWABLE(merge_layer)->parasites =
+    parasite_list_copy (GIMP_DRAWABLE(layer)->parasites);
 
   while (reverse_list)
     {

app/core/gimpimage-merge.h

@@ -160,11 +160,12 @@ void            gimp_image_add_guide              (GimpImage *, Guide *);
 void            gimp_image_remove_guide           (GimpImage *, Guide *);
 void            gimp_image_delete_guide           (GimpImage *, Guide *);
 
-Parasite *      gimp_image_parasite_find          (const GimpImage *,
+GimpParasite *  gimp_image_parasite_find          (const GimpImage *,
 						   const gchar *name);
 gchar **        gimp_image_parasite_list          (GimpImage *gimage,
                                                    gint *count);
-void            gimp_image_parasite_attach        (GimpImage *, Parasite *);
+void            gimp_image_parasite_attach        (GimpImage *,
+						   GimpParasite *);
 void            gimp_image_parasite_detach        (GimpImage *, const gchar *);
 
 Tattoo          gimp_image_get_new_tattoo         (GimpImage *);

app/core/gimpimage-projection.c

@@ -191,7 +191,7 @@ gimp_image_init (GimpImage *gimage)
   gimage->comp_preview_valid[1] = FALSE;
   gimage->comp_preview_valid[2] = FALSE;
   gimage->comp_preview          = NULL;
-  gimage->parasites             = parasite_list_new();
+  gimage->parasites             = parasite_list_new ();
   gimage->xresolution           = default_xresolution;
   gimage->yresolution           = default_yresolution;
   gimage->unit                  = default_units;
@@ -1133,7 +1133,7 @@ gimp_image_delete_guide (GimpImage *gimage,
 }
 
 
-Parasite *
+GimpParasite *
 gimp_image_parasite_find (const GimpImage *gimage, 
 			  const gchar     *name)
 {
@@ -1143,9 +1143,9 @@ gimp_image_parasite_find (const GimpImage *gimage,
 }
 
 static void
-list_func (gchar      *key, 
-	   Parasite   *p, 
-	   gchar    ***cur)
+list_func (gchar          *key, 
+	   GimpParasite   *p, 
+	   gchar        ***cur)
 {
   *(*cur)++ = (gchar *) g_strdup (key);
 }
@@ -1167,24 +1167,24 @@ gimp_image_parasite_list (GimpImage *gimage,
 }
 
 void
-gimp_image_parasite_attach (GimpImage *gimage, 
-			    Parasite  *parasite)
+gimp_image_parasite_attach (GimpImage    *gimage, 
+			    GimpParasite *parasite)
 {
   g_return_if_fail (GIMP_IS_IMAGE (gimage));
 
   /* only set the dirty bit manually if we can be saved and the new
      parasite differs from the current one and we aren't undoable */
-  if (parasite_is_undoable (parasite))
+  if (gimp_parasite_is_undoable (parasite))
     undo_push_image_parasite (gimage, parasite);
-  if (parasite_is_persistent (parasite)
-      && !parasite_compare (parasite,
-			    gimp_image_parasite_find (gimage,
-						      parasite_name (parasite))))
+  if (gimp_parasite_is_persistent (parasite) &&
+      !gimp_parasite_compare (parasite,
+			      gimp_image_parasite_find (gimage,
+							gimp_parasite_name (parasite))))
     undo_push_cantundo (gimage, _("attach parasite to image"));
 
   parasite_list_add (gimage->parasites, parasite);
 
-  if (parasite_has_flag (parasite, PARASITE_ATTACH_PARENT))
+  if (gimp_parasite_has_flag (parasite, GIMP_PARASITE_ATTACH_PARENT))
     {
       parasite_shift_parent (parasite);
       gimp_parasite_attach (parasite);
@@ -1195,16 +1195,16 @@ void
 gimp_image_parasite_detach (GimpImage   *gimage, 
 			    const gchar *parasite)
 {
-  Parasite *p;
+  GimpParasite *p;
 
   g_return_if_fail (GIMP_IS_IMAGE (gimage));
 
-  if (!(p = parasite_list_find(gimage->parasites, parasite)))
+  if (!(p = parasite_list_find (gimage->parasites, parasite)))
     return;
 
-  if (parasite_is_undoable (p))
-    undo_push_image_parasite_remove (gimage, parasite_name (p));
-  else if (parasite_is_persistent (p))
+  if (gimp_parasite_is_undoable (p))
+    undo_push_image_parasite_remove (gimage, gimp_parasite_name (p));
+  else if (gimp_parasite_is_persistent (p))
     undo_push_cantundo (gimage, _("detach parasite from image"));
 
   parasite_list_remove (gimage->parasites, parasite);
@@ -2792,9 +2792,8 @@ gimp_image_merge_layers (GimpImage *gimage,
 
   /* Copy the tattoo and parasites of the bottom layer to the new layer */
   layer_set_tattoo(merge_layer, layer_get_tattoo(layer));
-  GIMP_DRAWABLE(merge_layer)->parasites 
-    = parasite_list_copy(GIMP_DRAWABLE(layer)->parasites);
-
+  GIMP_DRAWABLE(merge_layer)->parasites =
+    parasite_list_copy (GIMP_DRAWABLE(layer)->parasites);
 
   while (reverse_list)
     {

app/core/gimpimage-projection.h

@@ -160,11 +160,12 @@ void            gimp_image_add_guide              (GimpImage *, Guide *);
 void            gimp_image_remove_guide           (GimpImage *, Guide *);
 void            gimp_image_delete_guide           (GimpImage *, Guide *);
 
-Parasite *      gimp_image_parasite_find          (const GimpImage *,
+GimpParasite *  gimp_image_parasite_find          (const GimpImage *,
 						   const gchar *name);
 gchar **        gimp_image_parasite_list          (GimpImage *gimage,
                                                    gint *count);
-void            gimp_image_parasite_attach        (GimpImage *, Parasite *);
+void            gimp_image_parasite_attach        (GimpImage *,
+						   GimpParasite *);
 void            gimp_image_parasite_detach        (GimpImage *, const gchar *);
 
 Tattoo          gimp_image_get_new_tattoo         (GimpImage *);

app/core/gimpimage-resize.c

@@ -191,7 +191,7 @@ gimp_image_init (GimpImage *gimage)
   gimage->comp_preview_valid[1] = FALSE;
   gimage->comp_preview_valid[2] = FALSE;
   gimage->comp_preview          = NULL;
-  gimage->parasites             = parasite_list_new();
+  gimage->parasites             = parasite_list_new ();
   gimage->xresolution           = default_xresolution;
   gimage->yresolution           = default_yresolution;
   gimage->unit                  = default_units;
@@ -1133,7 +1133,7 @@ gimp_image_delete_guide (GimpImage *gimage,
 }
 
 
-Parasite *
+GimpParasite *
 gimp_image_parasite_find (const GimpImage *gimage, 
 			  const gchar     *name)
 {
@@ -1143,9 +1143,9 @@ gimp_image_parasite_find (const GimpImage *gimage,
 }
 
 static void
-list_func (gchar      *key, 
-	   Parasite   *p, 
-	   gchar    ***cur)
+list_func (gchar          *key, 
+	   GimpParasite   *p, 
+	   gchar        ***cur)
 {
   *(*cur)++ = (gchar *) g_strdup (key);
 }
@@ -1167,24 +1167,24 @@ gimp_image_parasite_list (GimpImage *gimage,
 }
 
 void
-gimp_image_parasite_attach (GimpImage *gimage, 
-			    Parasite  *parasite)
+gimp_image_parasite_attach (GimpImage    *gimage, 
+			    GimpParasite *parasite)
 {
   g_return_if_fail (GIMP_IS_IMAGE (gimage));
 
   /* only set the dirty bit manually if we can be saved and the new
      parasite differs from the current one and we aren't undoable */
-  if (parasite_is_undoable (parasite))
+  if (gimp_parasite_is_undoable (parasite))
     undo_push_image_parasite (gimage, parasite);
-  if (parasite_is_persistent (parasite)
-      && !parasite_compare (parasite,
-			    gimp_image_parasite_find (gimage,
-						      parasite_name (parasite))))
+  if (gimp_parasite_is_persistent (parasite) &&
+      !gimp_parasite_compare (parasite,
+			      gimp_image_parasite_find (gimage,
+							gimp_parasite_name (parasite))))
     undo_push_cantundo (gimage, _("attach parasite to image"));
 
   parasite_list_add (gimage->parasites, parasite);
 
-  if (parasite_has_flag (parasite, PARASITE_ATTACH_PARENT))
+  if (gimp_parasite_has_flag (parasite, GIMP_PARASITE_ATTACH_PARENT))
     {
       parasite_shift_parent (parasite);
       gimp_parasite_attach (parasite);
@@ -1195,16 +1195,16 @@ void
 gimp_image_parasite_detach (GimpImage   *gimage, 
 			    const gchar *parasite)
 {
-  Parasite *p;
+  GimpParasite *p;
 
   g_return_if_fail (GIMP_IS_IMAGE (gimage));
 
-  if (!(p = parasite_list_find(gimage->parasites, parasite)))
+  if (!(p = parasite_list_find (gimage->parasites, parasite)))
     return;
 
-  if (parasite_is_undoable (p))
-    undo_push_image_parasite_remove (gimage, parasite_name (p));
-  else if (parasite_is_persistent (p))
+  if (gimp_parasite_is_undoable (p))
+    undo_push_image_parasite_remove (gimage, gimp_parasite_name (p));
+  else if (gimp_parasite_is_persistent (p))
     undo_push_cantundo (gimage, _("detach parasite from image"));
 
   parasite_list_remove (gimage->parasites, parasite);
@@ -2792,9 +2792,8 @@ gimp_image_merge_layers (GimpImage *gimage,
 
   /* Copy the tattoo and parasites of the bottom layer to the new layer */
   layer_set_tattoo(merge_layer, layer_get_tattoo(layer));
-  GIMP_DRAWABLE(merge_layer)->parasites 
-    = parasite_list_copy(GIMP_DRAWABLE(layer)->parasites);
-
+  GIMP_DRAWABLE(merge_layer)->parasites =
+    parasite_list_copy (GIMP_DRAWABLE(layer)->parasites);
 
   while (reverse_list)
     {

app/core/gimpimage-resize.h

@@ -160,11 +160,12 @@ void            gimp_image_add_guide              (GimpImage *, Guide *);
 void            gimp_image_remove_guide           (GimpImage *, Guide *);
 void            gimp_image_delete_guide           (GimpImage *, Guide *);
 
-Parasite *      gimp_image_parasite_find          (const GimpImage *,
+GimpParasite *  gimp_image_parasite_find          (const GimpImage *,
 						   const gchar *name);
 gchar **        gimp_image_parasite_list          (GimpImage *gimage,
                                                    gint *count);
-void            gimp_image_parasite_attach        (GimpImage *, Parasite *);
+void            gimp_image_parasite_attach        (GimpImage *,
+						   GimpParasite *);
 void            gimp_image_parasite_detach        (GimpImage *, const gchar *);
 
 Tattoo          gimp_image_get_new_tattoo         (GimpImage *);

app/core/gimpimage-scale.c

@@ -191,7 +191,7 @@ gimp_image_init (GimpImage *gimage)
   gimage->comp_preview_valid[1] = FALSE;
   gimage->comp_preview_valid[2] = FALSE;
   gimage->comp_preview          = NULL;
-  gimage->parasites             = parasite_list_new();
+  gimage->parasites             = parasite_list_new ();
   gimage->xresolution           = default_xresolution;
   gimage->yresolution           = default_yresolution;
   gimage->unit                  = default_units;
@@ -1133,7 +1133,7 @@ gimp_image_delete_guide (GimpImage *gimage,
 }
 
 
-Parasite *
+GimpParasite *
 gimp_image_parasite_find (const GimpImage *gimage, 
 			  const gchar     *name)
 {
@@ -1143,9 +1143,9 @@ gimp_image_parasite_find (const GimpImage *gimage,
 }
 
 static void
-list_func (gchar      *key, 
-	   Parasite   *p, 
-	   gchar    ***cur)
+list_func (gchar          *key, 
+	   GimpParasite   *p, 
+	   gchar        ***cur)
 {
   *(*cur)++ = (gchar *) g_strdup (key);
 }
@@ -1167,24 +1167,24 @@ gimp_image_parasite_list (GimpImage *gimage,
 }
 
 void
-gimp_image_parasite_attach (GimpImage *gimage, 
-			    Parasite  *parasite)
+gimp_image_parasite_attach (GimpImage    *gimage, 
+			    GimpParasite *parasite)
 {
   g_return_if_fail (GIMP_IS_IMAGE (gimage));
 
   /* only set the dirty bit manually if we can be saved and the new
      parasite differs from the current one and we aren't undoable */
-  if (parasite_is_undoable (parasite))
+  if (gimp_parasite_is_undoable (parasite))
     undo_push_image_parasite (gimage, parasite);
-  if (parasite_is_persistent (parasite)
-      && !parasite_compare (parasite,
-			    gimp_image_parasite_find (gimage,
-						      parasite_name (parasite))))
+  if (gimp_parasite_is_persistent (parasite) &&
+      !gimp_parasite_compare (parasite,
+			      gimp_image_parasite_find (gimage,
+							gimp_parasite_name (parasite))))
     undo_push_cantundo (gimage, _("attach parasite to image"));
 
   parasite_list_add (gimage->parasites, parasite);
 
-  if (parasite_has_flag (parasite, PARASITE_ATTACH_PARENT))
+  if (gimp_parasite_has_flag (parasite, GIMP_PARASITE_ATTACH_PARENT))
     {
       parasite_shift_parent (parasite);
       gimp_parasite_attach (parasite);
@@ -1195,16 +1195,16 @@ void
 gimp_image_parasite_detach (GimpImage   *gimage, 
 			    const gchar *parasite)
 {
-  Parasite *p;
+  GimpParasite *p;
 
   g_return_if_fail (GIMP_IS_IMAGE (gimage));
 
-  if (!(p = parasite_list_find(gimage->parasites, parasite)))
+  if (!(p = parasite_list_find (gimage->parasites, parasite)))
     return;
 
-  if (parasite_is_undoable (p))
-    undo_push_image_parasite_remove (gimage, parasite_name (p));
-  else if (parasite_is_persistent (p))
+  if (gimp_parasite_is_undoable (p))
+    undo_push_image_parasite_remove (gimage, gimp_parasite_name (p));
+  else if (gimp_parasite_is_persistent (p))
     undo_push_cantundo (gimage, _("detach parasite from image"));
 
   parasite_list_remove (gimage->parasites, parasite);
@@ -2792,9 +2792,8 @@ gimp_image_merge_layers (GimpImage *gimage,
 
   /* Copy the tattoo and parasites of the bottom layer to the new layer */
   layer_set_tattoo(merge_layer, layer_get_tattoo(layer));
-  GIMP_DRAWABLE(merge_layer)->parasites 
-    = parasite_list_copy(GIMP_DRAWABLE(layer)->parasites);
-
+  GIMP_DRAWABLE(merge_layer)->parasites =
+    parasite_list_copy (GIMP_DRAWABLE(layer)->parasites);
 
   while (reverse_list)
     {

app/core/gimpimage-scale.h

@@ -160,11 +160,12 @@ void            gimp_image_add_guide              (GimpImage *, Guide *);
 void            gimp_image_remove_guide           (GimpImage *, Guide *);
 void            gimp_image_delete_guide           (GimpImage *, Guide *);
 
-Parasite *      gimp_image_parasite_find          (const GimpImage *,
+GimpParasite *  gimp_image_parasite_find          (const GimpImage *,
 						   const gchar *name);
 gchar **        gimp_image_parasite_list          (GimpImage *gimage,
                                                    gint *count);
-void            gimp_image_parasite_attach        (GimpImage *, Parasite *);
+void            gimp_image_parasite_attach        (GimpImage *,
+						   GimpParasite *);
 void            gimp_image_parasite_detach        (GimpImage *, const gchar *);
 
 Tattoo          gimp_image_get_new_tattoo         (GimpImage *);

app/core/gimpimage.c

@@ -191,7 +191,7 @@ gimp_image_init (GimpImage *gimage)
   gimage->comp_preview_valid[1] = FALSE;
   gimage->comp_preview_valid[2] = FALSE;
   gimage->comp_preview          = NULL;
-  gimage->parasites             = parasite_list_new();
+  gimage->parasites             = parasite_list_new ();
   gimage->xresolution           = default_xresolution;
   gimage->yresolution           = default_yresolution;
   gimage->unit                  = default_units;
@@ -1133,7 +1133,7 @@ gimp_image_delete_guide (GimpImage *gimage,
 }
 
 
-Parasite *
+GimpParasite *
 gimp_image_parasite_find (const GimpImage *gimage, 
 			  const gchar     *name)
 {
@@ -1143,9 +1143,9 @@ gimp_image_parasite_find (const GimpImage *gimage,
 }
 
 static void
-list_func (gchar      *key, 
-	   Parasite   *p, 
-	   gchar    ***cur)
+list_func (gchar          *key, 
+	   GimpParasite   *p, 
+	   gchar        ***cur)
 {
   *(*cur)++ = (gchar *) g_strdup (key);
 }
@@ -1167,24 +1167,24 @@ gimp_image_parasite_list (GimpImage *gimage,
 }
 
 void
-gimp_image_parasite_attach (GimpImage *gimage, 
-			    Parasite  *parasite)
+gimp_image_parasite_attach (GimpImage    *gimage, 
+			    GimpParasite *parasite)
 {
   g_return_if_fail (GIMP_IS_IMAGE (gimage));
 
   /* only set the dirty bit manually if we can be saved and the new
      parasite differs from the current one and we aren't undoable */
-  if (parasite_is_undoable (parasite))
+  if (gimp_parasite_is_undoable (parasite))
     undo_push_image_parasite (gimage, parasite);
-  if (parasite_is_persistent (parasite)
-      && !parasite_compare (parasite,
-			    gimp_image_parasite_find (gimage,
-						      parasite_name (parasite))))
+  if (gimp_parasite_is_persistent (parasite) &&
+      !gimp_parasite_compare (parasite,
+			      gimp_image_parasite_find (gimage,
+							gimp_parasite_name (parasite))))
     undo_push_cantundo (gimage, _("attach parasite to image"));
 
   parasite_list_add (gimage->parasites, parasite);
 
-  if (parasite_has_flag (parasite, PARASITE_ATTACH_PARENT))
+  if (gimp_parasite_has_flag (parasite, GIMP_PARASITE_ATTACH_PARENT))
     {
       parasite_shift_parent (parasite);
       gimp_parasite_attach (parasite);
@@ -1195,16 +1195,16 @@ void
 gimp_image_parasite_detach (GimpImage   *gimage, 
 			    const gchar *parasite)
 {
-  Parasite *p;
+  GimpParasite *p;
 
   g_return_if_fail (GIMP_IS_IMAGE (gimage));
 
-  if (!(p = parasite_list_find(gimage->parasites, parasite)))
+  if (!(p = parasite_list_find (gimage->parasites, parasite)))
     return;
 
-  if (parasite_is_undoable (p))
-    undo_push_image_parasite_remove (gimage, parasite_name (p));
-  else if (parasite_is_persistent (p))
+  if (gimp_parasite_is_undoable (p))
+    undo_push_image_parasite_remove (gimage, gimp_parasite_name (p));
+  else if (gimp_parasite_is_persistent (p))
     undo_push_cantundo (gimage, _("detach parasite from image"));
 
   parasite_list_remove (gimage->parasites, parasite);
@@ -2792,9 +2792,8 @@ gimp_image_merge_layers (GimpImage *gimage,
 
   /* Copy the tattoo and parasites of the bottom layer to the new layer */
   layer_set_tattoo(merge_layer, layer_get_tattoo(layer));
-  GIMP_DRAWABLE(merge_layer)->parasites 
-    = parasite_list_copy(GIMP_DRAWABLE(layer)->parasites);
-
+  GIMP_DRAWABLE(merge_layer)->parasites =
+    parasite_list_copy (GIMP_DRAWABLE(layer)->parasites);
 
   while (reverse_list)
     {

app/core/gimpimage.h

@@ -160,11 +160,12 @@ void            gimp_image_add_guide              (GimpImage *, Guide *);
 void            gimp_image_remove_guide           (GimpImage *, Guide *);
 void            gimp_image_delete_guide           (GimpImage *, Guide *);
 
-Parasite *      gimp_image_parasite_find          (const GimpImage *,
+GimpParasite *  gimp_image_parasite_find          (const GimpImage *,
 						   const gchar *name);
 gchar **        gimp_image_parasite_list          (GimpImage *gimage,
                                                    gint *count);
-void            gimp_image_parasite_attach        (GimpImage *, Parasite *);
+void            gimp_image_parasite_attach        (GimpImage *,
+						   GimpParasite *);
 void            gimp_image_parasite_detach        (GimpImage *, const gchar *);
 
 Tattoo          gimp_image_get_new_tattoo         (GimpImage *);

app/core/gimpparasite.c

@@ -34,7 +34,7 @@
 static ParasiteList *parasites = NULL;
 
 void 
-gimp_init_parasites()
+gimp_init_parasites (void)
 {
   g_return_if_fail (parasites == NULL);
   parasites = parasite_list_new ();
@@ -42,55 +42,57 @@ gimp_init_parasites()
 }
 
 void
-gimp_parasite_attach (Parasite *p)
+gimp_parasite_attach (GimpParasite *p)
 {
   parasite_list_add (parasites, p);
 }
 
 void
-gimp_parasite_detach (const char *name)
+gimp_parasite_detach (const gchar *name)
 {
   parasite_list_remove (parasites, name);
 }
 
-Parasite *
-gimp_parasite_find (const char *name)
+GimpParasite *
+gimp_parasite_find (const gchar *name)
 {
   return parasite_list_find (parasites, name);
 }
 
 static void 
-list_func (char       *key, 
-	   Parasite   *p, 
-	   char     ***cur)
+list_func (gchar          *key,
+	   GimpParasite   *p,
+	   gchar        ***cur)
 {
   *(*cur)++ = (char *) g_strdup (key);
 }
 
-char **
+gchar **
 gimp_parasite_list (gint *count)
 {
-  gchar **list, **cur;
+  gchar **list;
+  gchar **cur;
 
   *count = parasite_list_length (parasites);
-  cur = list = (char **) g_malloc (sizeof (char *) * *count);
+  cur = list = g_new (gchar *, *count);
 
-  parasite_list_foreach (parasites, (GHFunc)list_func, &cur);
+  parasite_list_foreach (parasites, (GHFunc) list_func, &cur);
   
   return list;
 }
 
 static void 
-save_func (char     *key, 
-	   Parasite *p, 
-	   FILE     *fp)
+save_func (gchar        *key,
+	   GimpParasite *p,
+	   FILE         *fp)
 {
-  if (parasite_is_persistent (p))
+  if (gimp_parasite_is_persistent (p))
     {
-      gchar *s;
-      guint32 l;
+      gchar   *s;
+      guint32  l;
 
-      fprintf (fp, "(parasite \"%s\" %lu \"", parasite_name (p), parasite_flags (p));
+      fprintf (fp, "(parasite \"%s\" %lu \"",
+	       gimp_parasite_name (p), gimp_parasite_flags (p));
 
       /*
        * the current methodology is: never move the parasiterc from one
@@ -99,7 +101,7 @@ save_func (char     *key,
        * characters as \xHH sequences altogether.
        */
 
-      for (s = (gchar *)parasite_data (p), l = parasite_data_size (p);
+      for (s = (gchar *) gimp_parasite_data (p), l = gimp_parasite_data_size (p);
            l;
            l--, s++)
         {
@@ -123,8 +125,8 @@ save_func (char     *key,
 void
 gimp_parasiterc_save (void)
 {
-  char *filename;
-  FILE *fp;
+  gchar *filename;
+  FILE  *fp;
 
   filename = gimp_personal_rc_file ("#parasiterc.tmp~");
 
@@ -137,7 +139,7 @@ gimp_parasiterc_save (void)
 	   "# GIMP parasiterc\n"
 	   "# This file will be entirely rewritten every time you "
 	   "quit the gimp.\n\n");
-  
+
   parasite_list_foreach (parasites, (GHFunc)save_func, fp);
 
   fclose (fp);
@@ -149,22 +151,22 @@ gimp_parasiterc_save (void)
 	  gimp_personal_rc_file ("parasiterc.bak"));
 #endif
 
-  if (rename(gimp_personal_rc_file ("#parasiterc.tmp~"),
-	     gimp_personal_rc_file ("parasiterc")) != 0)
+  if (rename (gimp_personal_rc_file ("#parasiterc.tmp~"),
+	      gimp_personal_rc_file ("parasiterc")) != 0)
     {
 #if defined(G_OS_WIN32) || defined(__EMX__)
       /* Rename the old parasiterc back */
       rename (gimp_personal_rc_file ("parasiterc.bak"),
 	      gimp_personal_rc_file ("parasiterc"));
 #endif
-      unlink(gimp_personal_rc_file ("#parasiterc.tmp~"));
+      unlink (gimp_personal_rc_file ("#parasiterc.tmp~"));
     }
 }
 
 void
 gimp_parasiterc_load (void)
 {
-  char *filename;
+  gchar *filename;
 
   filename = gimp_personal_rc_file ("parasiterc");
   app_init_update_status (NULL, filename, -1);

app/core/gimpparasite.h

@@ -14,18 +14,20 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-
-#ifndef __GIMP_PARASITE_H__
-#define __GIMP_PARASITE_H__
+#ifndef __APP_GIMP_PARASITE_H__
+#define __APP_GIMP_PARASITE_H__
 
 #include "libgimp/parasiteF.h"
 
-void       gimp_init_parasites  (void);
-void       gimp_parasite_attach (Parasite *p);
-void       gimp_parasite_detach (const gchar *name);
-Parasite * gimp_parasite_find   (const gchar *name);
-gchar **   gimp_parasite_list   (gint *count);
-void       gimp_parasiterc_save (void);
-void       gimp_parasiterc_load (void);
+void            gimp_init_parasites  (void);
 
-#endif  /*  __GIMP_PARASITE_H__  */
+void            gimp_parasite_attach (GimpParasite *parasite);
+void            gimp_parasite_detach (const gchar  *name);
+
+GimpParasite  * gimp_parasite_find   (const gchar  *name);
+gchar        ** gimp_parasite_list   (gint         *count);
+
+void            gimp_parasiterc_save (void);
+void            gimp_parasiterc_load (void);
+
+#endif  /*  __APP_GIMP_PARASITE_H__  */

app/core/gimpparasitelist.c

@@ -14,16 +14,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-
 #include <string.h>
 
 #include "gimpobjectP.h"
 #include "gimpobject.h"
 #include "gimpsignal.h"
 #include "parasitelistP.h"
+
 #include "libgimp/parasite.h"
 #include "libgimp/parasiteP.h"
 
+
 enum
 {
   ADD,
@@ -33,21 +34,23 @@ enum
 
 static guint parasite_list_signals[LAST_SIGNAL];
 
-static void parasite_list_destroy    (GtkObject* list);
-static void parasite_list_init       (ParasiteList* list);
+static void parasite_list_destroy    (GtkObject         *list);
+static void parasite_list_init       (ParasiteList      *list);
 static void parasite_list_class_init (ParasiteListClass *klass);
-static int  free_a_parasite          (void *key, void *parasite, void *unused);
+static int  free_a_parasite          (void              *key,
+				      void              *parasite,
+				      void              *unused);
 
 static void
-parasite_list_init (ParasiteList* list)
+parasite_list_init (ParasiteList *list)
 {
-  list->table=NULL;
+  list->table = NULL;
 }
 
 static void
 parasite_list_class_init (ParasiteListClass *klass)
 {
-  GtkObjectClass *class = GTK_OBJECT_CLASS(klass);
+  GtkObjectClass *class = GTK_OBJECT_CLASS (klass);
   GtkType type = class->type;
 
   class->destroy = parasite_list_destroy;
@@ -56,6 +59,7 @@ parasite_list_class_init (ParasiteListClass *klass)
     gimp_signal_new ("add",    GTK_RUN_FIRST, type, 0, gimp_sigtype_pointer);
   parasite_list_signals[REMOVE] = 
     gimp_signal_new ("remove", GTK_RUN_FIRST, type, 0, gimp_sigtype_pointer);
+
   gtk_object_class_add_signals (class, parasite_list_signals, LAST_SIGNAL);
 }
 
@@ -82,7 +86,7 @@ parasite_list_get_type (void)
   return type;
 }
 
-ParasiteList*
+ParasiteList *
 parasite_list_new (void)
 {
   ParasiteList *list = gtk_type_new (GIMP_TYPE_PARASITE_LIST);
@@ -90,12 +94,12 @@ parasite_list_new (void)
   return list;
 }
 
-static int
+static gint
 free_a_parasite (void *key, 
 		 void *parasite, 
 		 void *unused)
 {
-  parasite_free ((Parasite *)parasite);
+  gimp_parasite_free ((GimpParasite *) parasite);
   return TRUE;
 }
 
@@ -107,7 +111,7 @@ parasite_list_destroy (GtkObject *obj)
   g_return_if_fail (obj != NULL);
   g_return_if_fail (GIMP_IS_PARASITE_LIST(obj));
 
-  list = (ParasiteList *)obj;
+  list = (ParasiteList *) obj;
 
   if (list->table)
     {
@@ -121,12 +125,13 @@ parasite_copy_one (void *key,
 		   void *p, 
 		   void *data)
 {
-  ParasiteList *list = (ParasiteList*)data;
-  Parasite *parasite = (Parasite*)p;
+  ParasiteList *list = (ParasiteList *) data;
+  GimpParasite *parasite = (GimpParasite *) p;
+
   parasite_list_add (list, parasite);
 }
 
-ParasiteList*
+ParasiteList *
 parasite_list_copy (const ParasiteList *list)
 {
   ParasiteList *newlist;
@@ -140,7 +145,7 @@ parasite_list_copy (const ParasiteList *list)
 
 void
 parasite_list_add (ParasiteList *list, 
-		   Parasite     *p)
+		   GimpParasite *p)
 {
   g_return_if_fail (list != NULL);
 
@@ -151,27 +156,27 @@ parasite_list_add (ParasiteList *list,
   g_return_if_fail (p->name != NULL);
 
   parasite_list_remove (list, p->name);
-  p = parasite_copy (p);
+  p = gimp_parasite_copy (p);
   g_hash_table_insert (list->table, p->name, p);
   gtk_signal_emit (GTK_OBJECT(list), parasite_list_signals[ADD], p);
 }
 
 void
 parasite_list_remove (ParasiteList *list, 
-		      const char   *name)
+		      const gchar  *name)
 {
-  Parasite *p;
+  GimpParasite *p;
 
   g_return_if_fail (list != NULL);
 
   if (list->table)
     {
-      p = parasite_list_find(list, name);
+      p = parasite_list_find (list, name);
       if (p)
 	{
 	  g_hash_table_remove (list->table, name);
-	  gtk_signal_emit (GTK_OBJECT(list), parasite_list_signals[REMOVE], p);
-	  parasite_free (p);
+	  gtk_signal_emit (GTK_OBJECT (list), parasite_list_signals[REMOVE], p);
+	  gimp_parasite_free (p);
 	}
     }
 }
@@ -187,25 +192,26 @@ parasite_list_length (ParasiteList *list)
 }
 
 static void 
-ppcount_func (char     *key, 
-	      Parasite *p, 
-	      int      *count)
+ppcount_func (gchar        *key, 
+	      GimpParasite *p, 
+	      gint         *count)
 {
-  if (parasite_is_persistent (p))
+  if (gimp_parasite_is_persistent (p))
     *count = *count + 1;
 }
 
 gint
 parasite_list_persistent_length (ParasiteList *list)
 {
-  int ppcount = 0;
+  gint ppcount = 0;
 
   g_return_val_if_fail (list != NULL, 0);
 
   if (!list->table)
     return 0;
 
-  parasite_list_foreach (list, (GHFunc)ppcount_func, &ppcount);
+  parasite_list_foreach (list, (GHFunc) ppcount_func, &ppcount);
+
   return ppcount;
 }
 
@@ -222,20 +228,20 @@ parasite_list_foreach (ParasiteList *list,
   g_hash_table_foreach (list->table, function, user_data);
 }
 
-Parasite *
+GimpParasite *
 parasite_list_find (ParasiteList *list, 
-		    const char   *name)
+		    const gchar  *name)
 {
   g_return_val_if_fail (list != NULL, NULL);
 
   if (list->table)
-    return (Parasite *)g_hash_table_lookup (list->table, name);
+    return (GimpParasite *) g_hash_table_lookup (list->table, name);
   else
     return NULL;
 }
 
 void
-parasite_shift_parent (Parasite *p)
+parasite_shift_parent (GimpParasite *p)
 {
   if (p == NULL)
     return;

app/core/gimpparasitelist.h

@@ -14,18 +14,20 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-
 #ifndef __PARASITE_LIST_H__
 #define __PARASITE_LIST_H__
 
 #include <glib.h>
 #include <stdio.h>
-#include "libgimp/parasiteF.h"
+
 #include "parasitelistF.h"
 #include "gimpobject.h"
 
-#define GIMP_TYPE_PARASITE_LIST  (parasite_list_get_type ())
-#define GIMP_PARASITE_LIST(obj)  (GIMP_CHECK_CAST ((obj), GIMP_TYPE_PARASITE_LIST, GimpParasiteList))
+#include "libgimp/parasiteF.h"
+
+
+#define GIMP_TYPE_PARASITE_LIST    (parasite_list_get_type ())
+#define GIMP_PARASITE_LIST(obj)    (GIMP_CHECK_CAST ((obj), GIMP_TYPE_PARASITE_LIST, GimpParasiteList))
 #define GIMP_IS_PARASITE_LIST(obj) (GIMP_CHECK_TYPE ((obj), GIMP_TYPE_PARASITE_LIST))
 
 /* Signals:
@@ -33,20 +35,24 @@
    remove
 */
 
-GtkType       parasite_list_get_type (void);
+GtkType        parasite_list_get_type (void);
 
 /* function declarations */
 
-ParasiteList *parasite_list_new      (void);
-ParasiteList *parasite_list_copy     (const ParasiteList *list);
-void          parasite_list_add      (ParasiteList *list, Parasite *p);
-void          parasite_list_remove   (ParasiteList *list, const char *name);
-gint          parasite_list_length   (ParasiteList *list);
-gint          parasite_list_persistent_length (ParasiteList *list);
-void          parasite_list_foreach  (ParasiteList *list, GHFunc function,
-				      gpointer user_data);
-Parasite     *parasite_list_find     (ParasiteList *list, const char *name);
+ParasiteList * parasite_list_new               (void);
+ParasiteList * parasite_list_copy              (const ParasiteList *list);
+void           parasite_list_add               (ParasiteList       *list,
+						GimpParasite       *parasite);
+void           parasite_list_remove            (ParasiteList       *list,
+						const gchar        *name);
+gint           parasite_list_length            (ParasiteList       *list);
+gint           parasite_list_persistent_length (ParasiteList       *list);
+void           parasite_list_foreach           (ParasiteList       *list,
+						GHFunc              function,
+						gpointer            user_data);
+GimpParasite * parasite_list_find              (ParasiteList       *list,
+						const gchar        *name);
 
-void          parasite_shift_parent  (Parasite *p);
+void           parasite_shift_parent           (GimpParasite       *parasite);
 
-#endif  /*  __GIMP_PARASITE_H__  */
+#endif  /*  __PARASITE_LIST_H__  */

app/core/gimpprojection-construct.c

@@ -191,7 +191,7 @@ gimp_image_init (GimpImage *gimage)
   gimage->comp_preview_valid[1] = FALSE;
   gimage->comp_preview_valid[2] = FALSE;
   gimage->comp_preview          = NULL;
-  gimage->parasites             = parasite_list_new();
+  gimage->parasites             = parasite_list_new ();
   gimage->xresolution           = default_xresolution;
   gimage->yresolution           = default_yresolution;
   gimage->unit                  = default_units;
@@ -1133,7 +1133,7 @@ gimp_image_delete_guide (GimpImage *gimage,
 }
 
 
-Parasite *
+GimpParasite *
 gimp_image_parasite_find (const GimpImage *gimage, 
 			  const gchar     *name)
 {
@@ -1143,9 +1143,9 @@ gimp_image_parasite_find (const GimpImage *gimage,
 }
 
 static void
-list_func (gchar      *key, 
-	   Parasite   *p, 
-	   gchar    ***cur)
+list_func (gchar          *key, 
+	   GimpParasite   *p, 
+	   gchar        ***cur)
 {
   *(*cur)++ = (gchar *) g_strdup (key);
 }
@@ -1167,24 +1167,24 @@ gimp_image_parasite_list (GimpImage *gimage,
 }
 
 void
-gimp_image_parasite_attach (GimpImage *gimage, 
-			    Parasite  *parasite)
+gimp_image_parasite_attach (GimpImage    *gimage, 
+			    GimpParasite *parasite)
 {
   g_return_if_fail (GIMP_IS_IMAGE (gimage));
 
   /* only set the dirty bit manually if we can be saved and the new
      parasite differs from the current one and we aren't undoable */
-  if (parasite_is_undoable (parasite))
+  if (gimp_parasite_is_undoable (parasite))
     undo_push_image_parasite (gimage, parasite);
-  if (parasite_is_persistent (parasite)
-      && !parasite_compare (parasite,
-			    gimp_image_parasite_find (gimage,
-						      parasite_name (parasite))))
+  if (gimp_parasite_is_persistent (parasite) &&
+      !gimp_parasite_compare (parasite,
+			      gimp_image_parasite_find (gimage,
+							gimp_parasite_name (parasite))))
     undo_push_cantundo (gimage, _("attach parasite to image"));
 
   parasite_list_add (gimage->parasites, parasite);
 
-  if (parasite_has_flag (parasite, PARASITE_ATTACH_PARENT))
+  if (gimp_parasite_has_flag (parasite, GIMP_PARASITE_ATTACH_PARENT))
     {
       parasite_shift_parent (parasite);
       gimp_parasite_attach (parasite);
@@ -1195,16 +1195,16 @@ void
 gimp_image_parasite_detach (GimpImage   *gimage, 
 			    const gchar *parasite)
 {
-  Parasite *p;
+  GimpParasite *p;
 
   g_return_if_fail (GIMP_IS_IMAGE (gimage));
 
-  if (!(p = parasite_list_find(gimage->parasites, parasite)))
+  if (!(p = parasite_list_find (gimage->parasites, parasite)))
     return;
 
-  if (parasite_is_undoable (p))
-    undo_push_image_parasite_remove (gimage, parasite_name (p));
-  else if (parasite_is_persistent (p))
+  if (gimp_parasite_is_undoable (p))
+    undo_push_image_parasite_remove (gimage, gimp_parasite_name (p));
+  else if (gimp_parasite_is_persistent (p))
     undo_push_cantundo (gimage, _("detach parasite from image"));
 
   parasite_list_remove (gimage->parasites, parasite);
@@ -2792,9 +2792,8 @@ gimp_image_merge_layers (GimpImage *gimage,
 
   /* Copy the tattoo and parasites of the bottom layer to the new layer */
   layer_set_tattoo(merge_layer, layer_get_tattoo(layer));
-  GIMP_DRAWABLE(merge_layer)->parasites 
-    = parasite_list_copy(GIMP_DRAWABLE(layer)->parasites);
-
+  GIMP_DRAWABLE(merge_layer)->parasites =
+    parasite_list_copy (GIMP_DRAWABLE(layer)->parasites);
 
   while (reverse_list)
     {

app/core/gimpprojection-construct.h

@@ -160,11 +160,12 @@ void            gimp_image_add_guide              (GimpImage *, Guide *);
 void            gimp_image_remove_guide           (GimpImage *, Guide *);
 void            gimp_image_delete_guide           (GimpImage *, Guide *);
 
-Parasite *      gimp_image_parasite_find          (const GimpImage *,
+GimpParasite *  gimp_image_parasite_find          (const GimpImage *,
 						   const gchar *name);
 gchar **        gimp_image_parasite_list          (GimpImage *gimage,
                                                    gint *count);
-void            gimp_image_parasite_attach        (GimpImage *, Parasite *);
+void            gimp_image_parasite_attach        (GimpImage *,
+						   GimpParasite *);
 void            gimp_image_parasite_detach        (GimpImage *, const gchar *);
 
 Tattoo          gimp_image_get_new_tattoo         (GimpImage *);

app/gimpbrushpipe.c

@@ -268,9 +268,9 @@ gimp_brush_pipe_get_type (void)
 GimpBrushPipe *
 gimp_brush_pipe_load (gchar *filename)
 {
-  GimpBrushPipe *pipe;
-  GPattern      *pattern;
-  PixPipeParams  params;
+  GimpBrushPipe     *pipe;
+  GPattern          *pattern;
+  GimpPixPipeParams  params;
   FILE  *fp;
   gchar  buf[1024];
   gchar *name;
@@ -316,8 +316,8 @@ gimp_brush_pipe_load (gchar *filename)
 
   if (*paramstring)
     {
-      pixpipeparams_init (&params);
-      pixpipeparams_parse (paramstring, &params);
+      gimp_pixpipe_params_init (&params);
+      gimp_pixpipe_params_parse (paramstring, &params);
       pipe->dimension = params.dim;
       pipe->rank      = g_new (gint, pipe->dimension);
       pipe->select    = g_new (PipeSelectModes, pipe->dimension);

app/gimpdrawable.c

@@ -15,9 +15,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
+#include "config.h"
+
 #include <stdlib.h>
-#include <math.h>
 #include <string.h>
+
 #include "gimpdrawableP.h"
 #include "gimpsignal.h"
 #include "gimage.h"
@@ -26,11 +28,14 @@
 #include "parasitelist.h"
 #include "undo.h"
 
-#include "config.h"
+#include "libgimp/gimpmath.h"
 #include "libgimp/parasite.h"
+
 #include "libgimp/gimpintl.h"
 
-enum {
+
+enum
+{
   INVALIDATE_PREVIEW,
   LAST_SIGNAL
 };
@@ -48,12 +53,12 @@ GtkType
 gimp_drawable_get_type (void)
 {
   static GtkType type;
-  GIMP_TYPE_INIT(type,
-		 GimpDrawable,
-		 GimpDrawableClass,
-		 gimp_drawable_init,
-		 gimp_drawable_class_init,
-		 GIMP_TYPE_OBJECT);
+  GIMP_TYPE_INIT (type,
+		  GimpDrawable,
+		  GimpDrawableClass,
+		  gimp_drawable_init,
+		  gimp_drawable_class_init,
+		  GIMP_TYPE_OBJECT);
   return type;
 }
 
@@ -440,7 +445,7 @@ gimp_drawable_get_color_at (GimpDrawable *drawable,
   return dest;
 }
 
-Parasite *
+GimpParasite *
 gimp_drawable_parasite_find (const GimpDrawable *drawable,
 			     const gchar        *name)
 {
@@ -450,9 +455,9 @@ gimp_drawable_parasite_find (const GimpDrawable *drawable,
 }
 
 static void
-list_func (gchar      *key,
-	   Parasite   *p,
-	   gchar    ***cur)
+list_func (gchar          *key,
+	   GimpParasite   *p,
+	   gchar        ***cur)
 {
   *(*cur)++ = (gchar *) g_strdup (key);
 }
@@ -476,38 +481,38 @@ gimp_drawable_parasite_list (GimpDrawable *drawable,
 
 void
 gimp_drawable_parasite_attach (GimpDrawable *drawable,
-			       Parasite     *parasite)
+			       GimpParasite *parasite)
 {
   g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
 
   /* only set the dirty bit manually if we can be saved and the new
      parasite differs from the current one and we arn't undoable */
-  if (parasite_is_undoable (parasite))
+  if (gimp_parasite_is_undoable (parasite))
     {
       /* do a group in case we have attach_parent set */
       undo_push_group_start (drawable->gimage, PARASITE_ATTACH_UNDO);
 
       undo_push_drawable_parasite (drawable->gimage, drawable, parasite);
     }
-  else if (parasite_is_persistent (parasite) &&
-	   !parasite_compare (parasite,
-			      gimp_drawable_parasite_find
-				(drawable, parasite_name (parasite))))
+  else if (gimp_parasite_is_persistent (parasite) &&
+	   !gimp_parasite_compare (parasite,
+				   gimp_drawable_parasite_find
+				   (drawable, gimp_parasite_name (parasite))))
     undo_push_cantundo (drawable->gimage, _("parasite attach to drawable"));
 
   parasite_list_add (drawable->parasites, parasite);
-  if (parasite_has_flag (parasite, PARASITE_ATTACH_PARENT))
+  if (gimp_parasite_has_flag (parasite, GIMP_PARASITE_ATTACH_PARENT))
     {
       parasite_shift_parent (parasite);
       gimp_image_parasite_attach (drawable->gimage, parasite);
     }
-  else if (parasite_has_flag (parasite, PARASITE_ATTACH_GRANDPARENT))
+  else if (gimp_parasite_has_flag (parasite, GIMP_PARASITE_ATTACH_GRANDPARENT))
     {
       parasite_shift_parent (parasite);
       parasite_shift_parent (parasite);
       gimp_parasite_attach (parasite);
     }
-  if (parasite_is_undoable (parasite))
+  if (gimp_parasite_is_undoable (parasite))
     {
       undo_push_group_end (drawable->gimage);
     }
@@ -517,17 +522,17 @@ void
 gimp_drawable_parasite_detach (GimpDrawable *drawable,
 			       const gchar  *parasite)
 {
-  Parasite *p;
+  GimpParasite *p;
 
   g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
 
   if (!(p = parasite_list_find (drawable->parasites, parasite)))
     return;
 
-  if (parasite_is_undoable (p))
+  if (gimp_parasite_is_undoable (p))
     undo_push_drawable_parasite_remove (drawable->gimage, drawable,
-					parasite_name (p));
-  else if (parasite_is_persistent (p))
+					gimp_parasite_name (p));
+  else if (gimp_parasite_is_persistent (p))
     undo_push_cantundo (drawable->gimage, _("detach parasite from drawable"));
 
   parasite_list_remove (drawable->parasites, parasite);

app/gimpdrawable.h

@@ -69,10 +69,11 @@ void 		 gimp_drawable_set_name	          (GimpDrawable *, gchar *);
 guchar *         gimp_drawable_get_color_at       (GimpDrawable *,
 						   gint x, gint y);
 
-void             gimp_drawable_parasite_attach    (GimpDrawable *, Parasite *);
+void             gimp_drawable_parasite_attach    (GimpDrawable *,
+						   GimpParasite *);
 void             gimp_drawable_parasite_detach    (GimpDrawable *,
 						   const gchar *);
-Parasite *       gimp_drawable_parasite_find      (const GimpDrawable *,
+GimpParasite *   gimp_drawable_parasite_find      (const GimpDrawable *,
 						   const gchar *);
 gchar **         gimp_drawable_parasite_list      (GimpDrawable *drawable,
                                                    gint *count);

app/gimpimage.c

@@ -191,7 +191,7 @@ gimp_image_init (GimpImage *gimage)
   gimage->comp_preview_valid[1] = FALSE;
   gimage->comp_preview_valid[2] = FALSE;
   gimage->comp_preview          = NULL;
-  gimage->parasites             = parasite_list_new();
+  gimage->parasites             = parasite_list_new ();
   gimage->xresolution           = default_xresolution;
   gimage->yresolution           = default_yresolution;
   gimage->unit                  = default_units;
@@ -1133,7 +1133,7 @@ gimp_image_delete_guide (GimpImage *gimage,
 }
 
 
-Parasite *
+GimpParasite *
 gimp_image_parasite_find (const GimpImage *gimage, 
 			  const gchar     *name)
 {
@@ -1143,9 +1143,9 @@ gimp_image_parasite_find (const GimpImage *gimage,
 }
 
 static void
-list_func (gchar      *key, 
-	   Parasite   *p, 
-	   gchar    ***cur)
+list_func (gchar          *key, 
+	   GimpParasite   *p, 
+	   gchar        ***cur)
 {
   *(*cur)++ = (gchar *) g_strdup (key);
 }
@@ -1167,24 +1167,24 @@ gimp_image_parasite_list (GimpImage *gimage,
 }
 
 void
-gimp_image_parasite_attach (GimpImage *gimage, 
-			    Parasite  *parasite)
+gimp_image_parasite_attach (GimpImage    *gimage, 
+			    GimpParasite *parasite)
 {
   g_return_if_fail (GIMP_IS_IMAGE (gimage));
 
   /* only set the dirty bit manually if we can be saved and the new
      parasite differs from the current one and we aren't undoable */
-  if (parasite_is_undoable (parasite))
+  if (gimp_parasite_is_undoable (parasite))
     undo_push_image_parasite (gimage, parasite);
-  if (parasite_is_persistent (parasite)
-      && !parasite_compare (parasite,
-			    gimp_image_parasite_find (gimage,
-						      parasite_name (parasite))))
+  if (gimp_parasite_is_persistent (parasite) &&
+      !gimp_parasite_compare (parasite,
+			      gimp_image_parasite_find (gimage,
+							gimp_parasite_name (parasite))))
     undo_push_cantundo (gimage, _("attach parasite to image"));
 
   parasite_list_add (gimage->parasites, parasite);
 
-  if (parasite_has_flag (parasite, PARASITE_ATTACH_PARENT))
+  if (gimp_parasite_has_flag (parasite, GIMP_PARASITE_ATTACH_PARENT))
     {
       parasite_shift_parent (parasite);
       gimp_parasite_attach (parasite);
@@ -1195,16 +1195,16 @@ void
 gimp_image_parasite_detach (GimpImage   *gimage, 
 			    const gchar *parasite)
 {
-  Parasite *p;
+  GimpParasite *p;
 
   g_return_if_fail (GIMP_IS_IMAGE (gimage));
 
-  if (!(p = parasite_list_find(gimage->parasites, parasite)))
+  if (!(p = parasite_list_find (gimage->parasites, parasite)))
     return;
 
-  if (parasite_is_undoable (p))
-    undo_push_image_parasite_remove (gimage, parasite_name (p));
-  else if (parasite_is_persistent (p))
+  if (gimp_parasite_is_undoable (p))
+    undo_push_image_parasite_remove (gimage, gimp_parasite_name (p));
+  else if (gimp_parasite_is_persistent (p))
     undo_push_cantundo (gimage, _("detach parasite from image"));
 
   parasite_list_remove (gimage->parasites, parasite);
@@ -2792,9 +2792,8 @@ gimp_image_merge_layers (GimpImage *gimage,
 
   /* Copy the tattoo and parasites of the bottom layer to the new layer */
   layer_set_tattoo(merge_layer, layer_get_tattoo(layer));
-  GIMP_DRAWABLE(merge_layer)->parasites 
-    = parasite_list_copy(GIMP_DRAWABLE(layer)->parasites);
-
+  GIMP_DRAWABLE(merge_layer)->parasites =
+    parasite_list_copy (GIMP_DRAWABLE(layer)->parasites);
 
   while (reverse_list)
     {

app/gimpimage.h

@@ -160,11 +160,12 @@ void            gimp_image_add_guide              (GimpImage *, Guide *);
 void            gimp_image_remove_guide           (GimpImage *, Guide *);
 void            gimp_image_delete_guide           (GimpImage *, Guide *);
 
-Parasite *      gimp_image_parasite_find          (const GimpImage *,
+GimpParasite *  gimp_image_parasite_find          (const GimpImage *,
 						   const gchar *name);
 gchar **        gimp_image_parasite_list          (GimpImage *gimage,
                                                    gint *count);
-void            gimp_image_parasite_attach        (GimpImage *, Parasite *);
+void            gimp_image_parasite_attach        (GimpImage *,
+						   GimpParasite *);
 void            gimp_image_parasite_detach        (GimpImage *, const gchar *);
 
 Tattoo          gimp_image_get_new_tattoo         (GimpImage *);

app/gimpparasite.c

@@ -34,7 +34,7 @@
 static ParasiteList *parasites = NULL;
 
 void 
-gimp_init_parasites()
+gimp_init_parasites (void)
 {
   g_return_if_fail (parasites == NULL);
   parasites = parasite_list_new ();
@@ -42,55 +42,57 @@ gimp_init_parasites()
 }
 
 void
-gimp_parasite_attach (Parasite *p)
+gimp_parasite_attach (GimpParasite *p)
 {
   parasite_list_add (parasites, p);
 }
 
 void
-gimp_parasite_detach (const char *name)
+gimp_parasite_detach (const gchar *name)
 {
   parasite_list_remove (parasites, name);
 }
 
-Parasite *
-gimp_parasite_find (const char *name)
+GimpParasite *
+gimp_parasite_find (const gchar *name)
 {
   return parasite_list_find (parasites, name);
 }
 
 static void 
-list_func (char       *key, 
-	   Parasite   *p, 
-	   char     ***cur)
+list_func (gchar          *key,
+	   GimpParasite   *p,
+	   gchar        ***cur)
 {
   *(*cur)++ = (char *) g_strdup (key);
 }
 
-char **
+gchar **
 gimp_parasite_list (gint *count)
 {
-  gchar **list, **cur;
+  gchar **list;
+  gchar **cur;
 
   *count = parasite_list_length (parasites);
-  cur = list = (char **) g_malloc (sizeof (char *) * *count);
+  cur = list = g_new (gchar *, *count);
 
-  parasite_list_foreach (parasites, (GHFunc)list_func, &cur);
+  parasite_list_foreach (parasites, (GHFunc) list_func, &cur);
   
   return list;
 }
 
 static void 
-save_func (char     *key, 
-	   Parasite *p, 
-	   FILE     *fp)
+save_func (gchar        *key,
+	   GimpParasite *p,
+	   FILE         *fp)
 {
-  if (parasite_is_persistent (p))
+  if (gimp_parasite_is_persistent (p))
     {
-      gchar *s;
-      guint32 l;
+      gchar   *s;
+      guint32  l;
 
-      fprintf (fp, "(parasite \"%s\" %lu \"", parasite_name (p), parasite_flags (p));
+      fprintf (fp, "(parasite \"%s\" %lu \"",
+	       gimp_parasite_name (p), gimp_parasite_flags (p));
 
       /*
        * the current methodology is: never move the parasiterc from one
@@ -99,7 +101,7 @@ save_func (char     *key,
        * characters as \xHH sequences altogether.
        */
 
-      for (s = (gchar *)parasite_data (p), l = parasite_data_size (p);
+      for (s = (gchar *) gimp_parasite_data (p), l = gimp_parasite_data_size (p);
            l;
            l--, s++)
         {
@@ -123,8 +125,8 @@ save_func (char     *key,
 void
 gimp_parasiterc_save (void)
 {
-  char *filename;
-  FILE *fp;
+  gchar *filename;
+  FILE  *fp;
 
   filename = gimp_personal_rc_file ("#parasiterc.tmp~");
 
@@ -137,7 +139,7 @@ gimp_parasiterc_save (void)
 	   "# GIMP parasiterc\n"
 	   "# This file will be entirely rewritten every time you "
 	   "quit the gimp.\n\n");
-  
+
   parasite_list_foreach (parasites, (GHFunc)save_func, fp);
 
   fclose (fp);
@@ -149,22 +151,22 @@ gimp_parasiterc_save (void)
 	  gimp_personal_rc_file ("parasiterc.bak"));
 #endif
 
-  if (rename(gimp_personal_rc_file ("#parasiterc.tmp~"),
-	     gimp_personal_rc_file ("parasiterc")) != 0)
+  if (rename (gimp_personal_rc_file ("#parasiterc.tmp~"),
+	      gimp_personal_rc_file ("parasiterc")) != 0)
     {
 #if defined(G_OS_WIN32) || defined(__EMX__)
       /* Rename the old parasiterc back */
       rename (gimp_personal_rc_file ("parasiterc.bak"),
 	      gimp_personal_rc_file ("parasiterc"));
 #endif
-      unlink(gimp_personal_rc_file ("#parasiterc.tmp~"));
+      unlink (gimp_personal_rc_file ("#parasiterc.tmp~"));
     }
 }
 
 void
 gimp_parasiterc_load (void)
 {
-  char *filename;
+  gchar *filename;
 
   filename = gimp_personal_rc_file ("parasiterc");
   app_init_update_status (NULL, filename, -1);

app/gimpparasite.h

@@ -14,18 +14,20 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-
-#ifndef __GIMP_PARASITE_H__
-#define __GIMP_PARASITE_H__
+#ifndef __APP_GIMP_PARASITE_H__
+#define __APP_GIMP_PARASITE_H__
 
 #include "libgimp/parasiteF.h"
 
-void       gimp_init_parasites  (void);
-void       gimp_parasite_attach (Parasite *p);
-void       gimp_parasite_detach (const gchar *name);
-Parasite * gimp_parasite_find   (const gchar *name);
-gchar **   gimp_parasite_list   (gint *count);
-void       gimp_parasiterc_save (void);
-void       gimp_parasiterc_load (void);
+void            gimp_init_parasites  (void);
 
-#endif  /*  __GIMP_PARASITE_H__  */
+void            gimp_parasite_attach (GimpParasite *parasite);
+void            gimp_parasite_detach (const gchar  *name);
+
+GimpParasite  * gimp_parasite_find   (const gchar  *name);
+gchar        ** gimp_parasite_list   (gint         *count);
+
+void            gimp_parasiterc_save (void);
+void            gimp_parasiterc_load (void);
+
+#endif  /*  __APP_GIMP_PARASITE_H__  */

app/gimprc.c

@@ -2438,7 +2438,7 @@ parse_parasite (gpointer val1p,
   gint res = ERROR;
   gchar *identifier = NULL;
   gulong flags = 0;
-  Parasite *parasite;
+  GimpParasite *parasite;
 
   token = get_next_token ();
   if (token != TOKEN_STRING)
@@ -2456,9 +2456,9 @@ parse_parasite (gpointer val1p,
   if (token != TOKEN_STRING)
     goto error;
 
-  parasite = parasite_new (identifier, flags, token_int, token_str);
+  parasite = gimp_parasite_new (identifier, flags, token_int, token_str);
   gimp_parasite_attach (parasite);  /* attaches a copy */
-  parasite_free (parasite);
+  gimp_parasite_free (parasite);
 
   token = get_next_token ();
   if (token != TOKEN_RIGHT_PAREN)

app/gui/plug-in-commands.c

@@ -3053,8 +3053,8 @@ plug_in_params_to_args (GPParam *params,
 	  break;
 	case PDB_PARASITE:
 	  if (full_copy)
-	    args[i].value.pdb_pointer = parasite_copy ((Parasite *)
-						&(params[i].data.d_parasite));
+	    args[i].value.pdb_pointer =
+	      gimp_parasite_copy ((GimpParasite *) &(params[i].data.d_parasite));
 	  else
 	    args[i].value.pdb_pointer = (void *)&(params[i].data.d_parasite);
 	  break;
@@ -3219,34 +3219,35 @@ plug_in_args_to_params (Argument *args,
 	case PDB_PARASITE:
 	  if (full_copy)
 	    {
-	      Parasite *tmp;
-	      tmp = parasite_copy (args[i].value.pdb_pointer);
+	      GimpParasite *tmp;
+	      tmp = gimp_parasite_copy (args[i].value.pdb_pointer);
 	      if (tmp == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
-	      {
-		memcpy (&params[i].data.d_parasite, tmp, sizeof(Parasite));
-		g_free(tmp);
-	      }
+		{
+		  memcpy (&params[i].data.d_parasite, tmp,
+			  sizeof (GimpParasite));
+		  g_free (tmp);
+		}
 	    }
 	  else
 	    {
 	      if (args[i].value.pdb_pointer == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
 		memcpy (&params[i].data.d_parasite,
-			(Parasite *)(args[i].value.pdb_pointer),
-			sizeof(Parasite));
+			(GimpParasite *) (args[i].value.pdb_pointer),
+			sizeof (GimpParasite));
 	    }
 	  break;
 	case PDB_STATUS:
@@ -3405,10 +3406,10 @@ plug_in_args_destroy (Argument *args,
 	  break;
 	case PDB_PARASITE:
 	  if (full_destroy)
-	  {
-	    parasite_free ((Parasite *)(args[i].value.pdb_pointer));
-	    args[i].value.pdb_pointer = NULL;
-	  }
+	    {
+	      gimp_parasite_free ((GimpParasite *) (args[i].value.pdb_pointer));
+	      args[i].value.pdb_pointer = NULL;
+	    }
 	  break;
 	case PDB_STATUS:
 	  break;
@@ -3424,7 +3425,7 @@ gint
 plug_in_image_types_parse (gchar *image_types)
 {
   gchar *type_spec = image_types;
-  gint types = 0;
+  gint   types = 0;
 
   /* 
    *  If the plug_in registers with image_type == NULL or "", return 0

app/gui/plug-in-menus.c

@@ -3053,8 +3053,8 @@ plug_in_params_to_args (GPParam *params,
 	  break;
 	case PDB_PARASITE:
 	  if (full_copy)
-	    args[i].value.pdb_pointer = parasite_copy ((Parasite *)
-						&(params[i].data.d_parasite));
+	    args[i].value.pdb_pointer =
+	      gimp_parasite_copy ((GimpParasite *) &(params[i].data.d_parasite));
 	  else
 	    args[i].value.pdb_pointer = (void *)&(params[i].data.d_parasite);
 	  break;
@@ -3219,34 +3219,35 @@ plug_in_args_to_params (Argument *args,
 	case PDB_PARASITE:
 	  if (full_copy)
 	    {
-	      Parasite *tmp;
-	      tmp = parasite_copy (args[i].value.pdb_pointer);
+	      GimpParasite *tmp;
+	      tmp = gimp_parasite_copy (args[i].value.pdb_pointer);
 	      if (tmp == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
-	      {
-		memcpy (&params[i].data.d_parasite, tmp, sizeof(Parasite));
-		g_free(tmp);
-	      }
+		{
+		  memcpy (&params[i].data.d_parasite, tmp,
+			  sizeof (GimpParasite));
+		  g_free (tmp);
+		}
 	    }
 	  else
 	    {
 	      if (args[i].value.pdb_pointer == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
 		memcpy (&params[i].data.d_parasite,
-			(Parasite *)(args[i].value.pdb_pointer),
-			sizeof(Parasite));
+			(GimpParasite *) (args[i].value.pdb_pointer),
+			sizeof (GimpParasite));
 	    }
 	  break;
 	case PDB_STATUS:
@@ -3405,10 +3406,10 @@ plug_in_args_destroy (Argument *args,
 	  break;
 	case PDB_PARASITE:
 	  if (full_destroy)
-	  {
-	    parasite_free ((Parasite *)(args[i].value.pdb_pointer));
-	    args[i].value.pdb_pointer = NULL;
-	  }
+	    {
+	      gimp_parasite_free ((GimpParasite *) (args[i].value.pdb_pointer));
+	      args[i].value.pdb_pointer = NULL;
+	    }
 	  break;
 	case PDB_STATUS:
 	  break;
@@ -3424,7 +3425,7 @@ gint
 plug_in_image_types_parse (gchar *image_types)
 {
   gchar *type_spec = image_types;
-  gint types = 0;
+  gint   types = 0;
 
   /* 
    *  If the plug_in registers with image_type == NULL or "", return 0

app/image_new.c

@@ -244,7 +244,7 @@ image_new_create_image (const GimpImageNewValues *values)
   GDisplay *display;
   Layer *layer;
   GimpImageType type;
-  Parasite *comment_parasite;
+  GimpParasite *comment_parasite;
   gint width, height;
 
   g_return_if_fail (values != NULL);
@@ -264,7 +264,7 @@ image_new_create_image (const GimpImageNewValues *values)
     default:
       type = RGB_GIMAGE; 
       break;
-    }  
+    }
 
   image = gimage_new (values->width, values->height, values->type);
   
@@ -273,18 +273,20 @@ image_new_create_image (const GimpImageNewValues *values)
 
   if (default_comment)
     {
-      comment_parasite = parasite_new ("gimp-comment", PARASITE_PERSISTENT,
-				       strlen (default_comment)+1,
-				       (gpointer) default_comment);
+      comment_parasite = gimp_parasite_new ("gimp-comment",
+					    GIMP_PARASITE_PERSISTENT,
+					    strlen (default_comment) + 1,
+					    (gpointer) default_comment);
       gimp_image_parasite_attach (image, comment_parasite);
-      parasite_free (comment_parasite);
+      gimp_parasite_free (comment_parasite);
     }
   
   /*  Make the background (or first) layer  */
   width = gimp_image_get_width (image);
-  height = gimp_image_get_height(image);
+  height = gimp_image_get_height (image);
   layer = layer_new (image, width, height,
-                     type, _("Background"), OPAQUE_OPACITY, NORMAL_MODE);
+                     type, _("Background"),
+		     OPAQUE_OPACITY, NORMAL_MODE);
  
   if (layer)
     {

app/menus/plug-in-menus.c

@@ -3053,8 +3053,8 @@ plug_in_params_to_args (GPParam *params,
 	  break;
 	case PDB_PARASITE:
 	  if (full_copy)
-	    args[i].value.pdb_pointer = parasite_copy ((Parasite *)
-						&(params[i].data.d_parasite));
+	    args[i].value.pdb_pointer =
+	      gimp_parasite_copy ((GimpParasite *) &(params[i].data.d_parasite));
 	  else
 	    args[i].value.pdb_pointer = (void *)&(params[i].data.d_parasite);
 	  break;
@@ -3219,34 +3219,35 @@ plug_in_args_to_params (Argument *args,
 	case PDB_PARASITE:
 	  if (full_copy)
 	    {
-	      Parasite *tmp;
-	      tmp = parasite_copy (args[i].value.pdb_pointer);
+	      GimpParasite *tmp;
+	      tmp = gimp_parasite_copy (args[i].value.pdb_pointer);
 	      if (tmp == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
-	      {
-		memcpy (&params[i].data.d_parasite, tmp, sizeof(Parasite));
-		g_free(tmp);
-	      }
+		{
+		  memcpy (&params[i].data.d_parasite, tmp,
+			  sizeof (GimpParasite));
+		  g_free (tmp);
+		}
 	    }
 	  else
 	    {
 	      if (args[i].value.pdb_pointer == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
 		memcpy (&params[i].data.d_parasite,
-			(Parasite *)(args[i].value.pdb_pointer),
-			sizeof(Parasite));
+			(GimpParasite *) (args[i].value.pdb_pointer),
+			sizeof (GimpParasite));
 	    }
 	  break;
 	case PDB_STATUS:
@@ -3405,10 +3406,10 @@ plug_in_args_destroy (Argument *args,
 	  break;
 	case PDB_PARASITE:
 	  if (full_destroy)
-	  {
-	    parasite_free ((Parasite *)(args[i].value.pdb_pointer));
-	    args[i].value.pdb_pointer = NULL;
-	  }
+	    {
+	      gimp_parasite_free ((GimpParasite *) (args[i].value.pdb_pointer));
+	      args[i].value.pdb_pointer = NULL;
+	    }
 	  break;
 	case PDB_STATUS:
 	  break;
@@ -3424,7 +3425,7 @@ gint
 plug_in_image_types_parse (gchar *image_types)
 {
   gchar *type_spec = image_types;
-  gint types = 0;
+  gint   types = 0;
 
   /* 
    *  If the plug_in registers with image_type == NULL or "", return 0

app/parasite_cmds.c

@@ -68,7 +68,7 @@ parasite_new_invoker (Argument *args)
   gint32 flags;
   gint32 size;
   gchar *data;
-  Parasite *parasite = NULL;
+  GimpParasite *parasite = NULL;
 
   name = (gchar *) args[0].value.pdb_pointer;
   if (name == NULL)
@@ -87,7 +87,7 @@ parasite_new_invoker (Argument *args)
       if (size > 0 && data == NULL)
 	success = FALSE;
       else
-	success = (parasite = parasite_new (name, flags, size, data)) != NULL;
+	success = (parasite = gimp_parasite_new (name, flags, size, data)) != NULL;
     }
 
   return_args = procedural_db_return_args (&parasite_new_proc, success);
@@ -153,7 +153,7 @@ parasite_find_invoker (Argument *args)
   gboolean success = TRUE;
   Argument *return_args;
   gchar *name;
-  Parasite *parasite = NULL;
+  GimpParasite *parasite = NULL;
 
   name = (gchar *) args[0].value.pdb_pointer;
   if (name == NULL)
@@ -161,7 +161,7 @@ parasite_find_invoker (Argument *args)
 
   if (success)
     {
-      parasite = parasite_copy (gimp_parasite_find (name));
+      parasite = gimp_parasite_copy (gimp_parasite_find (name));
       success = parasite != NULL;
     }
 
@@ -211,9 +211,9 @@ static Argument *
 parasite_attach_invoker (Argument *args)
 {
   gboolean success = TRUE;
-  Parasite *parasite;
+  GimpParasite *parasite;
 
-  parasite = (Parasite *) args[0].value.pdb_pointer;
+  parasite = (GimpParasite *) args[0].value.pdb_pointer;
   if (parasite == NULL)
     success = FALSE;
 
@@ -343,7 +343,7 @@ drawable_parasite_find_invoker (Argument *args)
   Argument *return_args;
   GimpDrawable *drawable;
   gchar *name;
-  Parasite *parasite = NULL;
+  GimpParasite *parasite = NULL;
 
   drawable = gimp_drawable_get_ID (args[0].value.pdb_int);
   if (drawable == NULL)
@@ -355,7 +355,7 @@ drawable_parasite_find_invoker (Argument *args)
 
   if (success)
     {
-      parasite = parasite_copy (gimp_drawable_parasite_find (drawable, name));
+      parasite = gimp_parasite_copy (gimp_drawable_parasite_find (drawable, name));
       success = parasite != NULL;
     }
 
@@ -411,13 +411,13 @@ drawable_parasite_attach_invoker (Argument *args)
 {
   gboolean success = TRUE;
   GimpDrawable *drawable;
-  Parasite *parasite;
+  GimpParasite *parasite;
 
   drawable = gimp_drawable_get_ID (args[0].value.pdb_int);
   if (drawable == NULL)
     success = FALSE;
 
-  parasite = (Parasite *) args[1].value.pdb_pointer;
+  parasite = (GimpParasite *) args[1].value.pdb_pointer;
   if (parasite == NULL)
     success = FALSE;
 
@@ -581,7 +581,7 @@ image_parasite_find_invoker (Argument *args)
   Argument *return_args;
   GimpImage *gimage;
   gchar *name;
-  Parasite *parasite = NULL;
+  GimpParasite *parasite = NULL;
 
   gimage = pdb_id_to_image (args[0].value.pdb_int);
   if (gimage == NULL)
@@ -593,7 +593,7 @@ image_parasite_find_invoker (Argument *args)
 
   if (success)
     {
-      parasite = parasite_copy (gimp_image_parasite_find (gimage, name));
+      parasite = gimp_parasite_copy (gimp_image_parasite_find (gimage, name));
       success = parasite != NULL;
     }
 
@@ -649,13 +649,13 @@ image_parasite_attach_invoker (Argument *args)
 {
   gboolean success = TRUE;
   GimpImage *gimage;
-  Parasite *parasite;
+  GimpParasite *parasite;
 
   gimage = pdb_id_to_image (args[0].value.pdb_int);
   if (gimage == NULL)
     success = FALSE;
 
-  parasite = (Parasite *) args[1].value.pdb_pointer;
+  parasite = (GimpParasite *) args[1].value.pdb_pointer;
   if (parasite == NULL)
     success = FALSE;
 

app/parasitelist.c

@@ -14,16 +14,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-
 #include <string.h>
 
 #include "gimpobjectP.h"
 #include "gimpobject.h"
 #include "gimpsignal.h"
 #include "parasitelistP.h"
+
 #include "libgimp/parasite.h"
 #include "libgimp/parasiteP.h"
 
+
 enum
 {
   ADD,
@@ -33,21 +34,23 @@ enum
 
 static guint parasite_list_signals[LAST_SIGNAL];
 
-static void parasite_list_destroy    (GtkObject* list);
-static void parasite_list_init       (ParasiteList* list);
+static void parasite_list_destroy    (GtkObject         *list);
+static void parasite_list_init       (ParasiteList      *list);
 static void parasite_list_class_init (ParasiteListClass *klass);
-static int  free_a_parasite          (void *key, void *parasite, void *unused);
+static int  free_a_parasite          (void              *key,
+				      void              *parasite,
+				      void              *unused);
 
 static void
-parasite_list_init (ParasiteList* list)
+parasite_list_init (ParasiteList *list)
 {
-  list->table=NULL;
+  list->table = NULL;
 }
 
 static void
 parasite_list_class_init (ParasiteListClass *klass)
 {
-  GtkObjectClass *class = GTK_OBJECT_CLASS(klass);
+  GtkObjectClass *class = GTK_OBJECT_CLASS (klass);
   GtkType type = class->type;
 
   class->destroy = parasite_list_destroy;
@@ -56,6 +59,7 @@ parasite_list_class_init (ParasiteListClass *klass)
     gimp_signal_new ("add",    GTK_RUN_FIRST, type, 0, gimp_sigtype_pointer);
   parasite_list_signals[REMOVE] = 
     gimp_signal_new ("remove", GTK_RUN_FIRST, type, 0, gimp_sigtype_pointer);
+
   gtk_object_class_add_signals (class, parasite_list_signals, LAST_SIGNAL);
 }
 
@@ -82,7 +86,7 @@ parasite_list_get_type (void)
   return type;
 }
 
-ParasiteList*
+ParasiteList *
 parasite_list_new (void)
 {
   ParasiteList *list = gtk_type_new (GIMP_TYPE_PARASITE_LIST);
@@ -90,12 +94,12 @@ parasite_list_new (void)
   return list;
 }
 
-static int
+static gint
 free_a_parasite (void *key, 
 		 void *parasite, 
 		 void *unused)
 {
-  parasite_free ((Parasite *)parasite);
+  gimp_parasite_free ((GimpParasite *) parasite);
   return TRUE;
 }
 
@@ -107,7 +111,7 @@ parasite_list_destroy (GtkObject *obj)
   g_return_if_fail (obj != NULL);
   g_return_if_fail (GIMP_IS_PARASITE_LIST(obj));
 
-  list = (ParasiteList *)obj;
+  list = (ParasiteList *) obj;
 
   if (list->table)
     {
@@ -121,12 +125,13 @@ parasite_copy_one (void *key,
 		   void *p, 
 		   void *data)
 {
-  ParasiteList *list = (ParasiteList*)data;
-  Parasite *parasite = (Parasite*)p;
+  ParasiteList *list = (ParasiteList *) data;
+  GimpParasite *parasite = (GimpParasite *) p;
+
   parasite_list_add (list, parasite);
 }
 
-ParasiteList*
+ParasiteList *
 parasite_list_copy (const ParasiteList *list)
 {
   ParasiteList *newlist;
@@ -140,7 +145,7 @@ parasite_list_copy (const ParasiteList *list)
 
 void
 parasite_list_add (ParasiteList *list, 
-		   Parasite     *p)
+		   GimpParasite *p)
 {
   g_return_if_fail (list != NULL);
 
@@ -151,27 +156,27 @@ parasite_list_add (ParasiteList *list,
   g_return_if_fail (p->name != NULL);
 
   parasite_list_remove (list, p->name);
-  p = parasite_copy (p);
+  p = gimp_parasite_copy (p);
   g_hash_table_insert (list->table, p->name, p);
   gtk_signal_emit (GTK_OBJECT(list), parasite_list_signals[ADD], p);
 }
 
 void
 parasite_list_remove (ParasiteList *list, 
-		      const char   *name)
+		      const gchar  *name)
 {
-  Parasite *p;
+  GimpParasite *p;
 
   g_return_if_fail (list != NULL);
 
   if (list->table)
     {
-      p = parasite_list_find(list, name);
+      p = parasite_list_find (list, name);
       if (p)
 	{
 	  g_hash_table_remove (list->table, name);
-	  gtk_signal_emit (GTK_OBJECT(list), parasite_list_signals[REMOVE], p);
-	  parasite_free (p);
+	  gtk_signal_emit (GTK_OBJECT (list), parasite_list_signals[REMOVE], p);
+	  gimp_parasite_free (p);
 	}
     }
 }
@@ -187,25 +192,26 @@ parasite_list_length (ParasiteList *list)
 }
 
 static void 
-ppcount_func (char     *key, 
-	      Parasite *p, 
-	      int      *count)
+ppcount_func (gchar        *key, 
+	      GimpParasite *p, 
+	      gint         *count)
 {
-  if (parasite_is_persistent (p))
+  if (gimp_parasite_is_persistent (p))
     *count = *count + 1;
 }
 
 gint
 parasite_list_persistent_length (ParasiteList *list)
 {
-  int ppcount = 0;
+  gint ppcount = 0;
 
   g_return_val_if_fail (list != NULL, 0);
 
   if (!list->table)
     return 0;
 
-  parasite_list_foreach (list, (GHFunc)ppcount_func, &ppcount);
+  parasite_list_foreach (list, (GHFunc) ppcount_func, &ppcount);
+
   return ppcount;
 }
 
@@ -222,20 +228,20 @@ parasite_list_foreach (ParasiteList *list,
   g_hash_table_foreach (list->table, function, user_data);
 }
 
-Parasite *
+GimpParasite *
 parasite_list_find (ParasiteList *list, 
-		    const char   *name)
+		    const gchar  *name)
 {
   g_return_val_if_fail (list != NULL, NULL);
 
   if (list->table)
-    return (Parasite *)g_hash_table_lookup (list->table, name);
+    return (GimpParasite *) g_hash_table_lookup (list->table, name);
   else
     return NULL;
 }
 
 void
-parasite_shift_parent (Parasite *p)
+parasite_shift_parent (GimpParasite *p)
 {
   if (p == NULL)
     return;

app/parasitelist.h

@@ -14,18 +14,20 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-
 #ifndef __PARASITE_LIST_H__
 #define __PARASITE_LIST_H__
 
 #include <glib.h>
 #include <stdio.h>
-#include "libgimp/parasiteF.h"
+
 #include "parasitelistF.h"
 #include "gimpobject.h"
 
-#define GIMP_TYPE_PARASITE_LIST  (parasite_list_get_type ())
-#define GIMP_PARASITE_LIST(obj)  (GIMP_CHECK_CAST ((obj), GIMP_TYPE_PARASITE_LIST, GimpParasiteList))
+#include "libgimp/parasiteF.h"
+
+
+#define GIMP_TYPE_PARASITE_LIST    (parasite_list_get_type ())
+#define GIMP_PARASITE_LIST(obj)    (GIMP_CHECK_CAST ((obj), GIMP_TYPE_PARASITE_LIST, GimpParasiteList))
 #define GIMP_IS_PARASITE_LIST(obj) (GIMP_CHECK_TYPE ((obj), GIMP_TYPE_PARASITE_LIST))
 
 /* Signals:
@@ -33,20 +35,24 @@
    remove
 */
 
-GtkType       parasite_list_get_type (void);
+GtkType        parasite_list_get_type (void);
 
 /* function declarations */
 
-ParasiteList *parasite_list_new      (void);
-ParasiteList *parasite_list_copy     (const ParasiteList *list);
-void          parasite_list_add      (ParasiteList *list, Parasite *p);
-void          parasite_list_remove   (ParasiteList *list, const char *name);
-gint          parasite_list_length   (ParasiteList *list);
-gint          parasite_list_persistent_length (ParasiteList *list);
-void          parasite_list_foreach  (ParasiteList *list, GHFunc function,
-				      gpointer user_data);
-Parasite     *parasite_list_find     (ParasiteList *list, const char *name);
+ParasiteList * parasite_list_new               (void);
+ParasiteList * parasite_list_copy              (const ParasiteList *list);
+void           parasite_list_add               (ParasiteList       *list,
+						GimpParasite       *parasite);
+void           parasite_list_remove            (ParasiteList       *list,
+						const gchar        *name);
+gint           parasite_list_length            (ParasiteList       *list);
+gint           parasite_list_persistent_length (ParasiteList       *list);
+void           parasite_list_foreach           (ParasiteList       *list,
+						GHFunc              function,
+						gpointer            user_data);
+GimpParasite * parasite_list_find              (ParasiteList       *list,
+						const gchar        *name);
 
-void          parasite_shift_parent  (Parasite *p);
+void           parasite_shift_parent           (GimpParasite       *parasite);
 
-#endif  /*  __GIMP_PARASITE_H__  */
+#endif  /*  __PARASITE_LIST_H__  */

app/parasitelistP.h

@@ -14,7 +14,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-
 #ifndef __PARASITE_LIST_P_H__
 #define __PARASITE_LIST_P_H__
 
@@ -23,17 +22,20 @@
 
 struct _ParasiteList
 {
-  GimpObject object;
+  GimpObject  object;
   GHashTable *table;
 };
 
 typedef struct _ParasiteListClass
 {
   GimpObjectClass parent_class;
-  void (* add)    (ParasiteList *list, Parasite *parasite);
-  void (* remove) (ParasiteList *list, Parasite *parasite);
+
+  void (* add)    (ParasiteList *list,
+		   GimpParasite *parasite);
+  void (* remove) (ParasiteList *list,
+		   GimpParasite *parasite);
 } ParasiteListClass;
 
 #define PARASITE_LIST_CLASS(class) GIMP_CHECK_CLASS_CAST (class, parasite_list_get_type(), ParasiteListClass)
 
-#endif  /*  __GIMP_PARASITE_P_H__  */
+#endif  /*  __PARASITE_LIST_P_H__  */

app/plug-in/gimpplugin-message.c

@@ -3053,8 +3053,8 @@ plug_in_params_to_args (GPParam *params,
 	  break;
 	case PDB_PARASITE:
 	  if (full_copy)
-	    args[i].value.pdb_pointer = parasite_copy ((Parasite *)
-						&(params[i].data.d_parasite));
+	    args[i].value.pdb_pointer =
+	      gimp_parasite_copy ((GimpParasite *) &(params[i].data.d_parasite));
 	  else
 	    args[i].value.pdb_pointer = (void *)&(params[i].data.d_parasite);
 	  break;
@@ -3219,34 +3219,35 @@ plug_in_args_to_params (Argument *args,
 	case PDB_PARASITE:
 	  if (full_copy)
 	    {
-	      Parasite *tmp;
-	      tmp = parasite_copy (args[i].value.pdb_pointer);
+	      GimpParasite *tmp;
+	      tmp = gimp_parasite_copy (args[i].value.pdb_pointer);
 	      if (tmp == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
-	      {
-		memcpy (&params[i].data.d_parasite, tmp, sizeof(Parasite));
-		g_free(tmp);
-	      }
+		{
+		  memcpy (&params[i].data.d_parasite, tmp,
+			  sizeof (GimpParasite));
+		  g_free (tmp);
+		}
 	    }
 	  else
 	    {
 	      if (args[i].value.pdb_pointer == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
 		memcpy (&params[i].data.d_parasite,
-			(Parasite *)(args[i].value.pdb_pointer),
-			sizeof(Parasite));
+			(GimpParasite *) (args[i].value.pdb_pointer),
+			sizeof (GimpParasite));
 	    }
 	  break;
 	case PDB_STATUS:
@@ -3405,10 +3406,10 @@ plug_in_args_destroy (Argument *args,
 	  break;
 	case PDB_PARASITE:
 	  if (full_destroy)
-	  {
-	    parasite_free ((Parasite *)(args[i].value.pdb_pointer));
-	    args[i].value.pdb_pointer = NULL;
-	  }
+	    {
+	      gimp_parasite_free ((GimpParasite *) (args[i].value.pdb_pointer));
+	      args[i].value.pdb_pointer = NULL;
+	    }
 	  break;
 	case PDB_STATUS:
 	  break;
@@ -3424,7 +3425,7 @@ gint
 plug_in_image_types_parse (gchar *image_types)
 {
   gchar *type_spec = image_types;
-  gint types = 0;
+  gint   types = 0;
 
   /* 
    *  If the plug_in registers with image_type == NULL or "", return 0

app/plug-in/gimpplugin-progress.c

@@ -3053,8 +3053,8 @@ plug_in_params_to_args (GPParam *params,
 	  break;
 	case PDB_PARASITE:
 	  if (full_copy)
-	    args[i].value.pdb_pointer = parasite_copy ((Parasite *)
-						&(params[i].data.d_parasite));
+	    args[i].value.pdb_pointer =
+	      gimp_parasite_copy ((GimpParasite *) &(params[i].data.d_parasite));
 	  else
 	    args[i].value.pdb_pointer = (void *)&(params[i].data.d_parasite);
 	  break;
@@ -3219,34 +3219,35 @@ plug_in_args_to_params (Argument *args,
 	case PDB_PARASITE:
 	  if (full_copy)
 	    {
-	      Parasite *tmp;
-	      tmp = parasite_copy (args[i].value.pdb_pointer);
+	      GimpParasite *tmp;
+	      tmp = gimp_parasite_copy (args[i].value.pdb_pointer);
 	      if (tmp == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
-	      {
-		memcpy (&params[i].data.d_parasite, tmp, sizeof(Parasite));
-		g_free(tmp);
-	      }
+		{
+		  memcpy (&params[i].data.d_parasite, tmp,
+			  sizeof (GimpParasite));
+		  g_free (tmp);
+		}
 	    }
 	  else
 	    {
 	      if (args[i].value.pdb_pointer == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
 		memcpy (&params[i].data.d_parasite,
-			(Parasite *)(args[i].value.pdb_pointer),
-			sizeof(Parasite));
+			(GimpParasite *) (args[i].value.pdb_pointer),
+			sizeof (GimpParasite));
 	    }
 	  break;
 	case PDB_STATUS:
@@ -3405,10 +3406,10 @@ plug_in_args_destroy (Argument *args,
 	  break;
 	case PDB_PARASITE:
 	  if (full_destroy)
-	  {
-	    parasite_free ((Parasite *)(args[i].value.pdb_pointer));
-	    args[i].value.pdb_pointer = NULL;
-	  }
+	    {
+	      gimp_parasite_free ((GimpParasite *) (args[i].value.pdb_pointer));
+	      args[i].value.pdb_pointer = NULL;
+	    }
 	  break;
 	case PDB_STATUS:
 	  break;
@@ -3424,7 +3425,7 @@ gint
 plug_in_image_types_parse (gchar *image_types)
 {
   gchar *type_spec = image_types;
-  gint types = 0;
+  gint   types = 0;
 
   /* 
    *  If the plug_in registers with image_type == NULL or "", return 0

app/plug-in/gimpplugin.c

@@ -3053,8 +3053,8 @@ plug_in_params_to_args (GPParam *params,
 	  break;
 	case PDB_PARASITE:
 	  if (full_copy)
-	    args[i].value.pdb_pointer = parasite_copy ((Parasite *)
-						&(params[i].data.d_parasite));
+	    args[i].value.pdb_pointer =
+	      gimp_parasite_copy ((GimpParasite *) &(params[i].data.d_parasite));
 	  else
 	    args[i].value.pdb_pointer = (void *)&(params[i].data.d_parasite);
 	  break;
@@ -3219,34 +3219,35 @@ plug_in_args_to_params (Argument *args,
 	case PDB_PARASITE:
 	  if (full_copy)
 	    {
-	      Parasite *tmp;
-	      tmp = parasite_copy (args[i].value.pdb_pointer);
+	      GimpParasite *tmp;
+	      tmp = gimp_parasite_copy (args[i].value.pdb_pointer);
 	      if (tmp == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
-	      {
-		memcpy (&params[i].data.d_parasite, tmp, sizeof(Parasite));
-		g_free(tmp);
-	      }
+		{
+		  memcpy (&params[i].data.d_parasite, tmp,
+			  sizeof (GimpParasite));
+		  g_free (tmp);
+		}
 	    }
 	  else
 	    {
 	      if (args[i].value.pdb_pointer == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
 		memcpy (&params[i].data.d_parasite,
-			(Parasite *)(args[i].value.pdb_pointer),
-			sizeof(Parasite));
+			(GimpParasite *) (args[i].value.pdb_pointer),
+			sizeof (GimpParasite));
 	    }
 	  break;
 	case PDB_STATUS:
@@ -3405,10 +3406,10 @@ plug_in_args_destroy (Argument *args,
 	  break;
 	case PDB_PARASITE:
 	  if (full_destroy)
-	  {
-	    parasite_free ((Parasite *)(args[i].value.pdb_pointer));
-	    args[i].value.pdb_pointer = NULL;
-	  }
+	    {
+	      gimp_parasite_free ((GimpParasite *) (args[i].value.pdb_pointer));
+	      args[i].value.pdb_pointer = NULL;
+	    }
 	  break;
 	case PDB_STATUS:
 	  break;
@@ -3424,7 +3425,7 @@ gint
 plug_in_image_types_parse (gchar *image_types)
 {
   gchar *type_spec = image_types;
-  gint types = 0;
+  gint   types = 0;
 
   /* 
    *  If the plug_in registers with image_type == NULL or "", return 0

app/plug-in/gimppluginmanager-call.c

@@ -3053,8 +3053,8 @@ plug_in_params_to_args (GPParam *params,
 	  break;
 	case PDB_PARASITE:
 	  if (full_copy)
-	    args[i].value.pdb_pointer = parasite_copy ((Parasite *)
-						&(params[i].data.d_parasite));
+	    args[i].value.pdb_pointer =
+	      gimp_parasite_copy ((GimpParasite *) &(params[i].data.d_parasite));
 	  else
 	    args[i].value.pdb_pointer = (void *)&(params[i].data.d_parasite);
 	  break;
@@ -3219,34 +3219,35 @@ plug_in_args_to_params (Argument *args,
 	case PDB_PARASITE:
 	  if (full_copy)
 	    {
-	      Parasite *tmp;
-	      tmp = parasite_copy (args[i].value.pdb_pointer);
+	      GimpParasite *tmp;
+	      tmp = gimp_parasite_copy (args[i].value.pdb_pointer);
 	      if (tmp == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
-	      {
-		memcpy (&params[i].data.d_parasite, tmp, sizeof(Parasite));
-		g_free(tmp);
-	      }
+		{
+		  memcpy (&params[i].data.d_parasite, tmp,
+			  sizeof (GimpParasite));
+		  g_free (tmp);
+		}
 	    }
 	  else
 	    {
 	      if (args[i].value.pdb_pointer == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
 		memcpy (&params[i].data.d_parasite,
-			(Parasite *)(args[i].value.pdb_pointer),
-			sizeof(Parasite));
+			(GimpParasite *) (args[i].value.pdb_pointer),
+			sizeof (GimpParasite));
 	    }
 	  break;
 	case PDB_STATUS:
@@ -3405,10 +3406,10 @@ plug_in_args_destroy (Argument *args,
 	  break;
 	case PDB_PARASITE:
 	  if (full_destroy)
-	  {
-	    parasite_free ((Parasite *)(args[i].value.pdb_pointer));
-	    args[i].value.pdb_pointer = NULL;
-	  }
+	    {
+	      gimp_parasite_free ((GimpParasite *) (args[i].value.pdb_pointer));
+	      args[i].value.pdb_pointer = NULL;
+	    }
 	  break;
 	case PDB_STATUS:
 	  break;
@@ -3424,7 +3425,7 @@ gint
 plug_in_image_types_parse (gchar *image_types)
 {
   gchar *type_spec = image_types;
-  gint types = 0;
+  gint   types = 0;
 
   /* 
    *  If the plug_in registers with image_type == NULL or "", return 0

app/plug-in/gimppluginmanager-run.c

@@ -3053,8 +3053,8 @@ plug_in_params_to_args (GPParam *params,
 	  break;
 	case PDB_PARASITE:
 	  if (full_copy)
-	    args[i].value.pdb_pointer = parasite_copy ((Parasite *)
-						&(params[i].data.d_parasite));
+	    args[i].value.pdb_pointer =
+	      gimp_parasite_copy ((GimpParasite *) &(params[i].data.d_parasite));
 	  else
 	    args[i].value.pdb_pointer = (void *)&(params[i].data.d_parasite);
 	  break;
@@ -3219,34 +3219,35 @@ plug_in_args_to_params (Argument *args,
 	case PDB_PARASITE:
 	  if (full_copy)
 	    {
-	      Parasite *tmp;
-	      tmp = parasite_copy (args[i].value.pdb_pointer);
+	      GimpParasite *tmp;
+	      tmp = gimp_parasite_copy (args[i].value.pdb_pointer);
 	      if (tmp == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
-	      {
-		memcpy (&params[i].data.d_parasite, tmp, sizeof(Parasite));
-		g_free(tmp);
-	      }
+		{
+		  memcpy (&params[i].data.d_parasite, tmp,
+			  sizeof (GimpParasite));
+		  g_free (tmp);
+		}
 	    }
 	  else
 	    {
 	      if (args[i].value.pdb_pointer == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
 		memcpy (&params[i].data.d_parasite,
-			(Parasite *)(args[i].value.pdb_pointer),
-			sizeof(Parasite));
+			(GimpParasite *) (args[i].value.pdb_pointer),
+			sizeof (GimpParasite));
 	    }
 	  break;
 	case PDB_STATUS:
@@ -3405,10 +3406,10 @@ plug_in_args_destroy (Argument *args,
 	  break;
 	case PDB_PARASITE:
 	  if (full_destroy)
-	  {
-	    parasite_free ((Parasite *)(args[i].value.pdb_pointer));
-	    args[i].value.pdb_pointer = NULL;
-	  }
+	    {
+	      gimp_parasite_free ((GimpParasite *) (args[i].value.pdb_pointer));
+	      args[i].value.pdb_pointer = NULL;
+	    }
 	  break;
 	case PDB_STATUS:
 	  break;
@@ -3424,7 +3425,7 @@ gint
 plug_in_image_types_parse (gchar *image_types)
 {
   gchar *type_spec = image_types;
-  gint types = 0;
+  gint   types = 0;
 
   /* 
    *  If the plug_in registers with image_type == NULL or "", return 0

app/plug-in/gimppluginmanager.c

@@ -3053,8 +3053,8 @@ plug_in_params_to_args (GPParam *params,
 	  break;
 	case PDB_PARASITE:
 	  if (full_copy)
-	    args[i].value.pdb_pointer = parasite_copy ((Parasite *)
-						&(params[i].data.d_parasite));
+	    args[i].value.pdb_pointer =
+	      gimp_parasite_copy ((GimpParasite *) &(params[i].data.d_parasite));
 	  else
 	    args[i].value.pdb_pointer = (void *)&(params[i].data.d_parasite);
 	  break;
@@ -3219,34 +3219,35 @@ plug_in_args_to_params (Argument *args,
 	case PDB_PARASITE:
 	  if (full_copy)
 	    {
-	      Parasite *tmp;
-	      tmp = parasite_copy (args[i].value.pdb_pointer);
+	      GimpParasite *tmp;
+	      tmp = gimp_parasite_copy (args[i].value.pdb_pointer);
 	      if (tmp == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
-	      {
-		memcpy (&params[i].data.d_parasite, tmp, sizeof(Parasite));
-		g_free(tmp);
-	      }
+		{
+		  memcpy (&params[i].data.d_parasite, tmp,
+			  sizeof (GimpParasite));
+		  g_free (tmp);
+		}
 	    }
 	  else
 	    {
 	      if (args[i].value.pdb_pointer == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
 		memcpy (&params[i].data.d_parasite,
-			(Parasite *)(args[i].value.pdb_pointer),
-			sizeof(Parasite));
+			(GimpParasite *) (args[i].value.pdb_pointer),
+			sizeof (GimpParasite));
 	    }
 	  break;
 	case PDB_STATUS:
@@ -3405,10 +3406,10 @@ plug_in_args_destroy (Argument *args,
 	  break;
 	case PDB_PARASITE:
 	  if (full_destroy)
-	  {
-	    parasite_free ((Parasite *)(args[i].value.pdb_pointer));
-	    args[i].value.pdb_pointer = NULL;
-	  }
+	    {
+	      gimp_parasite_free ((GimpParasite *) (args[i].value.pdb_pointer));
+	      args[i].value.pdb_pointer = NULL;
+	    }
 	  break;
 	case PDB_STATUS:
 	  break;
@@ -3424,7 +3425,7 @@ gint
 plug_in_image_types_parse (gchar *image_types)
 {
   gchar *type_spec = image_types;
-  gint types = 0;
+  gint   types = 0;
 
   /* 
    *  If the plug_in registers with image_type == NULL or "", return 0

app/plug-in/gimppluginshm.c

@@ -3053,8 +3053,8 @@ plug_in_params_to_args (GPParam *params,
 	  break;
 	case PDB_PARASITE:
 	  if (full_copy)
-	    args[i].value.pdb_pointer = parasite_copy ((Parasite *)
-						&(params[i].data.d_parasite));
+	    args[i].value.pdb_pointer =
+	      gimp_parasite_copy ((GimpParasite *) &(params[i].data.d_parasite));
 	  else
 	    args[i].value.pdb_pointer = (void *)&(params[i].data.d_parasite);
 	  break;
@@ -3219,34 +3219,35 @@ plug_in_args_to_params (Argument *args,
 	case PDB_PARASITE:
 	  if (full_copy)
 	    {
-	      Parasite *tmp;
-	      tmp = parasite_copy (args[i].value.pdb_pointer);
+	      GimpParasite *tmp;
+	      tmp = gimp_parasite_copy (args[i].value.pdb_pointer);
 	      if (tmp == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
-	      {
-		memcpy (&params[i].data.d_parasite, tmp, sizeof(Parasite));
-		g_free(tmp);
-	      }
+		{
+		  memcpy (&params[i].data.d_parasite, tmp,
+			  sizeof (GimpParasite));
+		  g_free (tmp);
+		}
 	    }
 	  else
 	    {
 	      if (args[i].value.pdb_pointer == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
 		memcpy (&params[i].data.d_parasite,
-			(Parasite *)(args[i].value.pdb_pointer),
-			sizeof(Parasite));
+			(GimpParasite *) (args[i].value.pdb_pointer),
+			sizeof (GimpParasite));
 	    }
 	  break;
 	case PDB_STATUS:
@@ -3405,10 +3406,10 @@ plug_in_args_destroy (Argument *args,
 	  break;
 	case PDB_PARASITE:
 	  if (full_destroy)
-	  {
-	    parasite_free ((Parasite *)(args[i].value.pdb_pointer));
-	    args[i].value.pdb_pointer = NULL;
-	  }
+	    {
+	      gimp_parasite_free ((GimpParasite *) (args[i].value.pdb_pointer));
+	      args[i].value.pdb_pointer = NULL;
+	    }
 	  break;
 	case PDB_STATUS:
 	  break;
@@ -3424,7 +3425,7 @@ gint
 plug_in_image_types_parse (gchar *image_types)
 {
   gchar *type_spec = image_types;
-  gint types = 0;
+  gint   types = 0;
 
   /* 
    *  If the plug_in registers with image_type == NULL or "", return 0

app/plug-in/plug-in-def.c

@@ -3053,8 +3053,8 @@ plug_in_params_to_args (GPParam *params,
 	  break;
 	case PDB_PARASITE:
 	  if (full_copy)
-	    args[i].value.pdb_pointer = parasite_copy ((Parasite *)
-						&(params[i].data.d_parasite));
+	    args[i].value.pdb_pointer =
+	      gimp_parasite_copy ((GimpParasite *) &(params[i].data.d_parasite));
 	  else
 	    args[i].value.pdb_pointer = (void *)&(params[i].data.d_parasite);
 	  break;
@@ -3219,34 +3219,35 @@ plug_in_args_to_params (Argument *args,
 	case PDB_PARASITE:
 	  if (full_copy)
 	    {
-	      Parasite *tmp;
-	      tmp = parasite_copy (args[i].value.pdb_pointer);
+	      GimpParasite *tmp;
+	      tmp = gimp_parasite_copy (args[i].value.pdb_pointer);
 	      if (tmp == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
-	      {
-		memcpy (&params[i].data.d_parasite, tmp, sizeof(Parasite));
-		g_free(tmp);
-	      }
+		{
+		  memcpy (&params[i].data.d_parasite, tmp,
+			  sizeof (GimpParasite));
+		  g_free (tmp);
+		}
 	    }
 	  else
 	    {
 	      if (args[i].value.pdb_pointer == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
 		memcpy (&params[i].data.d_parasite,
-			(Parasite *)(args[i].value.pdb_pointer),
-			sizeof(Parasite));
+			(GimpParasite *) (args[i].value.pdb_pointer),
+			sizeof (GimpParasite));
 	    }
 	  break;
 	case PDB_STATUS:
@@ -3405,10 +3406,10 @@ plug_in_args_destroy (Argument *args,
 	  break;
 	case PDB_PARASITE:
 	  if (full_destroy)
-	  {
-	    parasite_free ((Parasite *)(args[i].value.pdb_pointer));
-	    args[i].value.pdb_pointer = NULL;
-	  }
+	    {
+	      gimp_parasite_free ((GimpParasite *) (args[i].value.pdb_pointer));
+	      args[i].value.pdb_pointer = NULL;
+	    }
 	  break;
 	case PDB_STATUS:
 	  break;
@@ -3424,7 +3425,7 @@ gint
 plug_in_image_types_parse (gchar *image_types)
 {
   gchar *type_spec = image_types;
-  gint types = 0;
+  gint   types = 0;
 
   /* 
    *  If the plug_in registers with image_type == NULL or "", return 0

app/plug-in/plug-in-message.c

@@ -3053,8 +3053,8 @@ plug_in_params_to_args (GPParam *params,
 	  break;
 	case PDB_PARASITE:
 	  if (full_copy)
-	    args[i].value.pdb_pointer = parasite_copy ((Parasite *)
-						&(params[i].data.d_parasite));
+	    args[i].value.pdb_pointer =
+	      gimp_parasite_copy ((GimpParasite *) &(params[i].data.d_parasite));
 	  else
 	    args[i].value.pdb_pointer = (void *)&(params[i].data.d_parasite);
 	  break;
@@ -3219,34 +3219,35 @@ plug_in_args_to_params (Argument *args,
 	case PDB_PARASITE:
 	  if (full_copy)
 	    {
-	      Parasite *tmp;
-	      tmp = parasite_copy (args[i].value.pdb_pointer);
+	      GimpParasite *tmp;
+	      tmp = gimp_parasite_copy (args[i].value.pdb_pointer);
 	      if (tmp == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
-	      {
-		memcpy (&params[i].data.d_parasite, tmp, sizeof(Parasite));
-		g_free(tmp);
-	      }
+		{
+		  memcpy (&params[i].data.d_parasite, tmp,
+			  sizeof (GimpParasite));
+		  g_free (tmp);
+		}
 	    }
 	  else
 	    {
 	      if (args[i].value.pdb_pointer == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
 		memcpy (&params[i].data.d_parasite,
-			(Parasite *)(args[i].value.pdb_pointer),
-			sizeof(Parasite));
+			(GimpParasite *) (args[i].value.pdb_pointer),
+			sizeof (GimpParasite));
 	    }
 	  break;
 	case PDB_STATUS:
@@ -3405,10 +3406,10 @@ plug_in_args_destroy (Argument *args,
 	  break;
 	case PDB_PARASITE:
 	  if (full_destroy)
-	  {
-	    parasite_free ((Parasite *)(args[i].value.pdb_pointer));
-	    args[i].value.pdb_pointer = NULL;
-	  }
+	    {
+	      gimp_parasite_free ((GimpParasite *) (args[i].value.pdb_pointer));
+	      args[i].value.pdb_pointer = NULL;
+	    }
 	  break;
 	case PDB_STATUS:
 	  break;
@@ -3424,7 +3425,7 @@ gint
 plug_in_image_types_parse (gchar *image_types)
 {
   gchar *type_spec = image_types;
-  gint types = 0;
+  gint   types = 0;
 
   /* 
    *  If the plug_in registers with image_type == NULL or "", return 0

app/plug-in/plug-in-params.c

@@ -3053,8 +3053,8 @@ plug_in_params_to_args (GPParam *params,
 	  break;
 	case PDB_PARASITE:
 	  if (full_copy)
-	    args[i].value.pdb_pointer = parasite_copy ((Parasite *)
-						&(params[i].data.d_parasite));
+	    args[i].value.pdb_pointer =
+	      gimp_parasite_copy ((GimpParasite *) &(params[i].data.d_parasite));
 	  else
 	    args[i].value.pdb_pointer = (void *)&(params[i].data.d_parasite);
 	  break;
@@ -3219,34 +3219,35 @@ plug_in_args_to_params (Argument *args,
 	case PDB_PARASITE:
 	  if (full_copy)
 	    {
-	      Parasite *tmp;
-	      tmp = parasite_copy (args[i].value.pdb_pointer);
+	      GimpParasite *tmp;
+	      tmp = gimp_parasite_copy (args[i].value.pdb_pointer);
 	      if (tmp == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
-	      {
-		memcpy (&params[i].data.d_parasite, tmp, sizeof(Parasite));
-		g_free(tmp);
-	      }
+		{
+		  memcpy (&params[i].data.d_parasite, tmp,
+			  sizeof (GimpParasite));
+		  g_free (tmp);
+		}
 	    }
 	  else
 	    {
 	      if (args[i].value.pdb_pointer == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
 		memcpy (&params[i].data.d_parasite,
-			(Parasite *)(args[i].value.pdb_pointer),
-			sizeof(Parasite));
+			(GimpParasite *) (args[i].value.pdb_pointer),
+			sizeof (GimpParasite));
 	    }
 	  break;
 	case PDB_STATUS:
@@ -3405,10 +3406,10 @@ plug_in_args_destroy (Argument *args,
 	  break;
 	case PDB_PARASITE:
 	  if (full_destroy)
-	  {
-	    parasite_free ((Parasite *)(args[i].value.pdb_pointer));
-	    args[i].value.pdb_pointer = NULL;
-	  }
+	    {
+	      gimp_parasite_free ((GimpParasite *) (args[i].value.pdb_pointer));
+	      args[i].value.pdb_pointer = NULL;
+	    }
 	  break;
 	case PDB_STATUS:
 	  break;
@@ -3424,7 +3425,7 @@ gint
 plug_in_image_types_parse (gchar *image_types)
 {
   gchar *type_spec = image_types;
-  gint types = 0;
+  gint   types = 0;
 
   /* 
    *  If the plug_in registers with image_type == NULL or "", return 0

app/plug-in/plug-in-progress.c

@@ -3053,8 +3053,8 @@ plug_in_params_to_args (GPParam *params,
 	  break;
 	case PDB_PARASITE:
 	  if (full_copy)
-	    args[i].value.pdb_pointer = parasite_copy ((Parasite *)
-						&(params[i].data.d_parasite));
+	    args[i].value.pdb_pointer =
+	      gimp_parasite_copy ((GimpParasite *) &(params[i].data.d_parasite));
 	  else
 	    args[i].value.pdb_pointer = (void *)&(params[i].data.d_parasite);
 	  break;
@@ -3219,34 +3219,35 @@ plug_in_args_to_params (Argument *args,
 	case PDB_PARASITE:
 	  if (full_copy)
 	    {
-	      Parasite *tmp;
-	      tmp = parasite_copy (args[i].value.pdb_pointer);
+	      GimpParasite *tmp;
+	      tmp = gimp_parasite_copy (args[i].value.pdb_pointer);
 	      if (tmp == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
-	      {
-		memcpy (&params[i].data.d_parasite, tmp, sizeof(Parasite));
-		g_free(tmp);
-	      }
+		{
+		  memcpy (&params[i].data.d_parasite, tmp,
+			  sizeof (GimpParasite));
+		  g_free (tmp);
+		}
 	    }
 	  else
 	    {
 	      if (args[i].value.pdb_pointer == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
 		memcpy (&params[i].data.d_parasite,
-			(Parasite *)(args[i].value.pdb_pointer),
-			sizeof(Parasite));
+			(GimpParasite *) (args[i].value.pdb_pointer),
+			sizeof (GimpParasite));
 	    }
 	  break;
 	case PDB_STATUS:
@@ -3405,10 +3406,10 @@ plug_in_args_destroy (Argument *args,
 	  break;
 	case PDB_PARASITE:
 	  if (full_destroy)
-	  {
-	    parasite_free ((Parasite *)(args[i].value.pdb_pointer));
-	    args[i].value.pdb_pointer = NULL;
-	  }
+	    {
+	      gimp_parasite_free ((GimpParasite *) (args[i].value.pdb_pointer));
+	      args[i].value.pdb_pointer = NULL;
+	    }
 	  break;
 	case PDB_STATUS:
 	  break;
@@ -3424,7 +3425,7 @@ gint
 plug_in_image_types_parse (gchar *image_types)
 {
   gchar *type_spec = image_types;
-  gint types = 0;
+  gint   types = 0;
 
   /* 
    *  If the plug_in registers with image_type == NULL or "", return 0

app/plug-in/plug-in-run.c

@@ -3053,8 +3053,8 @@ plug_in_params_to_args (GPParam *params,
 	  break;
 	case PDB_PARASITE:
 	  if (full_copy)
-	    args[i].value.pdb_pointer = parasite_copy ((Parasite *)
-						&(params[i].data.d_parasite));
+	    args[i].value.pdb_pointer =
+	      gimp_parasite_copy ((GimpParasite *) &(params[i].data.d_parasite));
 	  else
 	    args[i].value.pdb_pointer = (void *)&(params[i].data.d_parasite);
 	  break;
@@ -3219,34 +3219,35 @@ plug_in_args_to_params (Argument *args,
 	case PDB_PARASITE:
 	  if (full_copy)
 	    {
-	      Parasite *tmp;
-	      tmp = parasite_copy (args[i].value.pdb_pointer);
+	      GimpParasite *tmp;
+	      tmp = gimp_parasite_copy (args[i].value.pdb_pointer);
 	      if (tmp == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
-	      {
-		memcpy (&params[i].data.d_parasite, tmp, sizeof(Parasite));
-		g_free(tmp);
-	      }
+		{
+		  memcpy (&params[i].data.d_parasite, tmp,
+			  sizeof (GimpParasite));
+		  g_free (tmp);
+		}
 	    }
 	  else
 	    {
 	      if (args[i].value.pdb_pointer == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
 		memcpy (&params[i].data.d_parasite,
-			(Parasite *)(args[i].value.pdb_pointer),
-			sizeof(Parasite));
+			(GimpParasite *) (args[i].value.pdb_pointer),
+			sizeof (GimpParasite));
 	    }
 	  break;
 	case PDB_STATUS:
@@ -3405,10 +3406,10 @@ plug_in_args_destroy (Argument *args,
 	  break;
 	case PDB_PARASITE:
 	  if (full_destroy)
-	  {
-	    parasite_free ((Parasite *)(args[i].value.pdb_pointer));
-	    args[i].value.pdb_pointer = NULL;
-	  }
+	    {
+	      gimp_parasite_free ((GimpParasite *) (args[i].value.pdb_pointer));
+	      args[i].value.pdb_pointer = NULL;
+	    }
 	  break;
 	case PDB_STATUS:
 	  break;
@@ -3424,7 +3425,7 @@ gint
 plug_in_image_types_parse (gchar *image_types)
 {
   gchar *type_spec = image_types;
-  gint types = 0;
+  gint   types = 0;
 
   /* 
    *  If the plug_in registers with image_type == NULL or "", return 0

app/plug-in/plug-in-shm.c

@@ -3053,8 +3053,8 @@ plug_in_params_to_args (GPParam *params,
 	  break;
 	case PDB_PARASITE:
 	  if (full_copy)
-	    args[i].value.pdb_pointer = parasite_copy ((Parasite *)
-						&(params[i].data.d_parasite));
+	    args[i].value.pdb_pointer =
+	      gimp_parasite_copy ((GimpParasite *) &(params[i].data.d_parasite));
 	  else
 	    args[i].value.pdb_pointer = (void *)&(params[i].data.d_parasite);
 	  break;
@@ -3219,34 +3219,35 @@ plug_in_args_to_params (Argument *args,
 	case PDB_PARASITE:
 	  if (full_copy)
 	    {
-	      Parasite *tmp;
-	      tmp = parasite_copy (args[i].value.pdb_pointer);
+	      GimpParasite *tmp;
+	      tmp = gimp_parasite_copy (args[i].value.pdb_pointer);
 	      if (tmp == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
-	      {
-		memcpy (&params[i].data.d_parasite, tmp, sizeof(Parasite));
-		g_free(tmp);
-	      }
+		{
+		  memcpy (&params[i].data.d_parasite, tmp,
+			  sizeof (GimpParasite));
+		  g_free (tmp);
+		}
 	    }
 	  else
 	    {
 	      if (args[i].value.pdb_pointer == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
 		memcpy (&params[i].data.d_parasite,
-			(Parasite *)(args[i].value.pdb_pointer),
-			sizeof(Parasite));
+			(GimpParasite *) (args[i].value.pdb_pointer),
+			sizeof (GimpParasite));
 	    }
 	  break;
 	case PDB_STATUS:
@@ -3405,10 +3406,10 @@ plug_in_args_destroy (Argument *args,
 	  break;
 	case PDB_PARASITE:
 	  if (full_destroy)
-	  {
-	    parasite_free ((Parasite *)(args[i].value.pdb_pointer));
-	    args[i].value.pdb_pointer = NULL;
-	  }
+	    {
+	      gimp_parasite_free ((GimpParasite *) (args[i].value.pdb_pointer));
+	      args[i].value.pdb_pointer = NULL;
+	    }
 	  break;
 	case PDB_STATUS:
 	  break;
@@ -3424,7 +3425,7 @@ gint
 plug_in_image_types_parse (gchar *image_types)
 {
   gchar *type_spec = image_types;
-  gint types = 0;
+  gint   types = 0;
 
   /* 
    *  If the plug_in registers with image_type == NULL or "", return 0

app/plug-in/plug-in.c

@@ -3053,8 +3053,8 @@ plug_in_params_to_args (GPParam *params,
 	  break;
 	case PDB_PARASITE:
 	  if (full_copy)
-	    args[i].value.pdb_pointer = parasite_copy ((Parasite *)
-						&(params[i].data.d_parasite));
+	    args[i].value.pdb_pointer =
+	      gimp_parasite_copy ((GimpParasite *) &(params[i].data.d_parasite));
 	  else
 	    args[i].value.pdb_pointer = (void *)&(params[i].data.d_parasite);
 	  break;
@@ -3219,34 +3219,35 @@ plug_in_args_to_params (Argument *args,
 	case PDB_PARASITE:
 	  if (full_copy)
 	    {
-	      Parasite *tmp;
-	      tmp = parasite_copy (args[i].value.pdb_pointer);
+	      GimpParasite *tmp;
+	      tmp = gimp_parasite_copy (args[i].value.pdb_pointer);
 	      if (tmp == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
-	      {
-		memcpy (&params[i].data.d_parasite, tmp, sizeof(Parasite));
-		g_free(tmp);
-	      }
+		{
+		  memcpy (&params[i].data.d_parasite, tmp,
+			  sizeof (GimpParasite));
+		  g_free (tmp);
+		}
 	    }
 	  else
 	    {
 	      if (args[i].value.pdb_pointer == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
 		memcpy (&params[i].data.d_parasite,
-			(Parasite *)(args[i].value.pdb_pointer),
-			sizeof(Parasite));
+			(GimpParasite *) (args[i].value.pdb_pointer),
+			sizeof (GimpParasite));
 	    }
 	  break;
 	case PDB_STATUS:
@@ -3405,10 +3406,10 @@ plug_in_args_destroy (Argument *args,
 	  break;
 	case PDB_PARASITE:
 	  if (full_destroy)
-	  {
-	    parasite_free ((Parasite *)(args[i].value.pdb_pointer));
-	    args[i].value.pdb_pointer = NULL;
-	  }
+	    {
+	      gimp_parasite_free ((GimpParasite *) (args[i].value.pdb_pointer));
+	      args[i].value.pdb_pointer = NULL;
+	    }
 	  break;
 	case PDB_STATUS:
 	  break;
@@ -3424,7 +3425,7 @@ gint
 plug_in_image_types_parse (gchar *image_types)
 {
   gchar *type_spec = image_types;
-  gint types = 0;
+  gint   types = 0;
 
   /* 
    *  If the plug_in registers with image_type == NULL or "", return 0

app/plug-in/plug-ins.c

@@ -3053,8 +3053,8 @@ plug_in_params_to_args (GPParam *params,
 	  break;
 	case PDB_PARASITE:
 	  if (full_copy)
-	    args[i].value.pdb_pointer = parasite_copy ((Parasite *)
-						&(params[i].data.d_parasite));
+	    args[i].value.pdb_pointer =
+	      gimp_parasite_copy ((GimpParasite *) &(params[i].data.d_parasite));
 	  else
 	    args[i].value.pdb_pointer = (void *)&(params[i].data.d_parasite);
 	  break;
@@ -3219,34 +3219,35 @@ plug_in_args_to_params (Argument *args,
 	case PDB_PARASITE:
 	  if (full_copy)
 	    {
-	      Parasite *tmp;
-	      tmp = parasite_copy (args[i].value.pdb_pointer);
+	      GimpParasite *tmp;
+	      tmp = gimp_parasite_copy (args[i].value.pdb_pointer);
 	      if (tmp == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
-	      {
-		memcpy (&params[i].data.d_parasite, tmp, sizeof(Parasite));
-		g_free(tmp);
-	      }
+		{
+		  memcpy (&params[i].data.d_parasite, tmp,
+			  sizeof (GimpParasite));
+		  g_free (tmp);
+		}
 	    }
 	  else
 	    {
 	      if (args[i].value.pdb_pointer == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
 		memcpy (&params[i].data.d_parasite,
-			(Parasite *)(args[i].value.pdb_pointer),
-			sizeof(Parasite));
+			(GimpParasite *) (args[i].value.pdb_pointer),
+			sizeof (GimpParasite));
 	    }
 	  break;
 	case PDB_STATUS:
@@ -3405,10 +3406,10 @@ plug_in_args_destroy (Argument *args,
 	  break;
 	case PDB_PARASITE:
 	  if (full_destroy)
-	  {
-	    parasite_free ((Parasite *)(args[i].value.pdb_pointer));
-	    args[i].value.pdb_pointer = NULL;
-	  }
+	    {
+	      gimp_parasite_free ((GimpParasite *) (args[i].value.pdb_pointer));
+	      args[i].value.pdb_pointer = NULL;
+	    }
 	  break;
 	case PDB_STATUS:
 	  break;
@@ -3424,7 +3425,7 @@ gint
 plug_in_image_types_parse (gchar *image_types)
 {
   gchar *type_spec = image_types;
-  gint types = 0;
+  gint   types = 0;
 
   /* 
    *  If the plug_in registers with image_type == NULL or "", return 0

app/plug_in.c

@@ -3053,8 +3053,8 @@ plug_in_params_to_args (GPParam *params,
 	  break;
 	case PDB_PARASITE:
 	  if (full_copy)
-	    args[i].value.pdb_pointer = parasite_copy ((Parasite *)
-						&(params[i].data.d_parasite));
+	    args[i].value.pdb_pointer =
+	      gimp_parasite_copy ((GimpParasite *) &(params[i].data.d_parasite));
 	  else
 	    args[i].value.pdb_pointer = (void *)&(params[i].data.d_parasite);
 	  break;
@@ -3219,34 +3219,35 @@ plug_in_args_to_params (Argument *args,
 	case PDB_PARASITE:
 	  if (full_copy)
 	    {
-	      Parasite *tmp;
-	      tmp = parasite_copy (args[i].value.pdb_pointer);
+	      GimpParasite *tmp;
+	      tmp = gimp_parasite_copy (args[i].value.pdb_pointer);
 	      if (tmp == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
-	      {
-		memcpy (&params[i].data.d_parasite, tmp, sizeof(Parasite));
-		g_free(tmp);
-	      }
+		{
+		  memcpy (&params[i].data.d_parasite, tmp,
+			  sizeof (GimpParasite));
+		  g_free (tmp);
+		}
 	    }
 	  else
 	    {
 	      if (args[i].value.pdb_pointer == NULL)
-	      {
-		params[i].data.d_parasite.name = 0;
-		params[i].data.d_parasite.flags = 0;
-		params[i].data.d_parasite.size = 0;
-		params[i].data.d_parasite.data = 0;
-	      }
+		{
+		  params[i].data.d_parasite.name = 0;
+		  params[i].data.d_parasite.flags = 0;
+		  params[i].data.d_parasite.size = 0;
+		  params[i].data.d_parasite.data = 0;
+		}
 	      else
 		memcpy (&params[i].data.d_parasite,
-			(Parasite *)(args[i].value.pdb_pointer),
-			sizeof(Parasite));
+			(GimpParasite *) (args[i].value.pdb_pointer),
+			sizeof (GimpParasite));
 	    }
 	  break;
 	case PDB_STATUS:
@@ -3405,10 +3406,10 @@ plug_in_args_destroy (Argument *args,
 	  break;
 	case PDB_PARASITE:
 	  if (full_destroy)
-	  {
-	    parasite_free ((Parasite *)(args[i].value.pdb_pointer));
-	    args[i].value.pdb_pointer = NULL;
-	  }
+	    {
+	      gimp_parasite_free ((GimpParasite *) (args[i].value.pdb_pointer));
+	      args[i].value.pdb_pointer = NULL;
+	    }
 	  break;
 	case PDB_STATUS:
 	  break;
@@ -3424,7 +3425,7 @@ gint
 plug_in_image_types_parse (gchar *image_types)
 {
   gchar *type_spec = image_types;
-  gint types = 0;
+  gint   types = 0;
 
   /* 
    *  If the plug_in registers with image_type == NULL or "", return 0

app/xcf.c

@@ -693,25 +693,25 @@ xcf_save_channel_props (XcfInfo *info,
 }
 
 static void 
-write_a_parasite (gchar    *key, 
-		  Parasite *p, 
-		  XcfInfo  *info)
+write_a_parasite (gchar        *key, 
+		  GimpParasite *p, 
+		  XcfInfo      *info)
 {
-  if ((p->flags & PARASITE_PERSISTENT))
-  {
-    info->cp += xcf_write_string (info->fp, &p->name, 1);
-    info->cp += xcf_write_int32 (info->fp, &p->flags, 1);
-    info->cp += xcf_write_int32 (info->fp, &p->size, 1);
-    info->cp += xcf_write_int8 (info->fp, p->data, p->size);
-  }
+  if ((p->flags & GIMP_PARASITE_PERSISTENT))
+    {
+      info->cp += xcf_write_string (info->fp, &p->name, 1);
+      info->cp += xcf_write_int32 (info->fp, &p->flags, 1);
+      info->cp += xcf_write_int32 (info->fp, &p->size, 1);
+      info->cp += xcf_write_int8 (info->fp, p->data, p->size);
+    }
 }
 
-static Parasite*
+static GimpParasite *
 read_a_parasite (XcfInfo *info)
 {
-  Parasite *p;
+  GimpParasite *p;
 
-  p = g_new (Parasite, 1);
+  p = g_new (GimpParasite, 1);
   info->cp += xcf_read_string (info->fp, &p->name, 1);
   info->cp += xcf_read_int32 (info->fp, &p->flags, 1);
   info->cp += xcf_read_int32 (info->fp, &p->size, 1);
@@ -1186,21 +1186,22 @@ xcf_save_prop (XcfInfo  *info,
 	guint32 base, length;
 	long pos;
 	list =  va_arg (args, ParasiteList*);
-	if (parasite_list_persistent_length(list) > 0)
-	{
- 	  info->cp += xcf_write_int32 (info->fp, (guint32*) &prop_type, 1);
-	  /* because we don't know how much room the parasite list will take
-	     we save the file position and write the length later */
-	  pos = ftell(info->fp);
- 	  info->cp += xcf_write_int32 (info->fp, &length, 1);
-	  base = info->cp;
-	  parasite_list_foreach(list, (GHFunc) write_a_parasite, info);
-	  length = info->cp - base;
-	  /* go back to the saved position and write the length */
-	  fseek(info->fp, pos, SEEK_SET);
-	  xcf_write_int32 (info->fp, &length, 1);
-	  fseek(info->fp, 0, SEEK_END);
-	}
+	if (parasite_list_persistent_length (list) > 0)
+	  {
+	    info->cp += xcf_write_int32 (info->fp, (guint32*) &prop_type, 1);
+	    /* because we don't know how much room the parasite list will take
+	     * we save the file position and write the length later
+	     */
+	    pos = ftell (info->fp);
+	    info->cp += xcf_write_int32 (info->fp, &length, 1);
+	    base = info->cp;
+	    parasite_list_foreach (list, (GHFunc) write_a_parasite, info);
+	    length = info->cp - base;
+	    /* go back to the saved position and write the length */
+	    fseek (info->fp, pos, SEEK_SET);
+	    xcf_write_int32 (info->fp, &length, 1);
+	    fseek (info->fp, 0, SEEK_END);
+	  }
       }
       break;
     case PROP_UNIT:
@@ -1904,12 +1905,12 @@ xcf_load_image_props (XcfInfo *info,
 	case PROP_PARASITES:
 	  {
 	    glong base = info->cp;
-	    Parasite *p;
+	    GimpParasite *p;
 	    while (info->cp - base < prop_size)
 	      {
-		p = read_a_parasite(info);
-		gimp_image_parasite_attach(gimage, p);
-		parasite_free(p);
+		p = read_a_parasite (info);
+		gimp_image_parasite_attach (gimage, p);
+		gimp_parasite_free (p);
 	      }
 	    if (info->cp - base != prop_size)
 	      g_message ("Error detected while loading an image's parasites");
@@ -2072,12 +2073,12 @@ xcf_load_layer_props (XcfInfo *info,
 	 case PROP_PARASITES:
 	 {
 	   long base = info->cp;
-	   Parasite *p;
+	   GimpParasite *p;
 	   while (info->cp - base < prop_size)
 	   {
 	     p = read_a_parasite(info);
 	     gimp_drawable_parasite_attach(GIMP_DRAWABLE(layer), p);
-	     parasite_free(p);
+	     gimp_parasite_free(p);
 	   }
 	   if (info->cp - base != prop_size)
 	     g_message ("Error detected while loading a layer's parasites");
@@ -2149,13 +2150,13 @@ xcf_load_channel_props (XcfInfo *info,
 	 case PROP_PARASITES:
 	 {
 	   long base = info->cp;
-	   Parasite *p;
+	   GimpParasite *p;
 	   while ((info->cp - base) < prop_size)
-	   {
-	     p = read_a_parasite(info);
-	     gimp_drawable_parasite_attach(GIMP_DRAWABLE(channel), p);
-	     parasite_free(p);
-	   }
+	     {
+	       p = read_a_parasite(info);
+	       gimp_drawable_parasite_attach(GIMP_DRAWABLE(channel), p);
+	       gimp_parasite_free(p);
+	     }
 	   if (info->cp - base != prop_size)
 	     g_message("Error detected while loading a channel's parasites");
 	 }

app/xcf/xcf.c

@@ -693,25 +693,25 @@ xcf_save_channel_props (XcfInfo *info,
 }
 
 static void 
-write_a_parasite (gchar    *key, 
-		  Parasite *p, 
-		  XcfInfo  *info)
+write_a_parasite (gchar        *key, 
+		  GimpParasite *p, 
+		  XcfInfo      *info)
 {
-  if ((p->flags & PARASITE_PERSISTENT))
-  {
-    info->cp += xcf_write_string (info->fp, &p->name, 1);
-    info->cp += xcf_write_int32 (info->fp, &p->flags, 1);
-    info->cp += xcf_write_int32 (info->fp, &p->size, 1);
-    info->cp += xcf_write_int8 (info->fp, p->data, p->size);
-  }
+  if ((p->flags & GIMP_PARASITE_PERSISTENT))
+    {
+      info->cp += xcf_write_string (info->fp, &p->name, 1);
+      info->cp += xcf_write_int32 (info->fp, &p->flags, 1);
+      info->cp += xcf_write_int32 (info->fp, &p->size, 1);
+      info->cp += xcf_write_int8 (info->fp, p->data, p->size);
+    }
 }
 
-static Parasite*
+static GimpParasite *
 read_a_parasite (XcfInfo *info)
 {
-  Parasite *p;
+  GimpParasite *p;
 
-  p = g_new (Parasite, 1);
+  p = g_new (GimpParasite, 1);
   info->cp += xcf_read_string (info->fp, &p->name, 1);
   info->cp += xcf_read_int32 (info->fp, &p->flags, 1);
   info->cp += xcf_read_int32 (info->fp, &p->size, 1);
@@ -1186,21 +1186,22 @@ xcf_save_prop (XcfInfo  *info,
 	guint32 base, length;
 	long pos;
 	list =  va_arg (args, ParasiteList*);
-	if (parasite_list_persistent_length(list) > 0)
-	{
- 	  info->cp += xcf_write_int32 (info->fp, (guint32*) &prop_type, 1);
-	  /* because we don't know how much room the parasite list will take
-	     we save the file position and write the length later */
-	  pos = ftell(info->fp);
- 	  info->cp += xcf_write_int32 (info->fp, &length, 1);
-	  base = info->cp;
-	  parasite_list_foreach(list, (GHFunc) write_a_parasite, info);
-	  length = info->cp - base;
-	  /* go back to the saved position and write the length */
-	  fseek(info->fp, pos, SEEK_SET);
-	  xcf_write_int32 (info->fp, &length, 1);
-	  fseek(info->fp, 0, SEEK_END);
-	}
+	if (parasite_list_persistent_length (list) > 0)
+	  {
+	    info->cp += xcf_write_int32 (info->fp, (guint32*) &prop_type, 1);
+	    /* because we don't know how much room the parasite list will take
+	     * we save the file position and write the length later
+	     */
+	    pos = ftell (info->fp);
+	    info->cp += xcf_write_int32 (info->fp, &length, 1);
+	    base = info->cp;
+	    parasite_list_foreach (list, (GHFunc) write_a_parasite, info);
+	    length = info->cp - base;
+	    /* go back to the saved position and write the length */
+	    fseek (info->fp, pos, SEEK_SET);
+	    xcf_write_int32 (info->fp, &length, 1);
+	    fseek (info->fp, 0, SEEK_END);
+	  }
       }
       break;
     case PROP_UNIT:
@@ -1904,12 +1905,12 @@ xcf_load_image_props (XcfInfo *info,
 	case PROP_PARASITES:
 	  {
 	    glong base = info->cp;
-	    Parasite *p;
+	    GimpParasite *p;
 	    while (info->cp - base < prop_size)
 	      {
-		p = read_a_parasite(info);
-		gimp_image_parasite_attach(gimage, p);
-		parasite_free(p);
+		p = read_a_parasite (info);
+		gimp_image_parasite_attach (gimage, p);
+		gimp_parasite_free (p);
 	      }
 	    if (info->cp - base != prop_size)
 	      g_message ("Error detected while loading an image's parasites");
@@ -2072,12 +2073,12 @@ xcf_load_layer_props (XcfInfo *info,
 	 case PROP_PARASITES:
 	 {
 	   long base = info->cp;
-	   Parasite *p;
+	   GimpParasite *p;
 	   while (info->cp - base < prop_size)
 	   {
 	     p = read_a_parasite(info);
 	     gimp_drawable_parasite_attach(GIMP_DRAWABLE(layer), p);
-	     parasite_free(p);
+	     gimp_parasite_free(p);
 	   }
 	   if (info->cp - base != prop_size)
 	     g_message ("Error detected while loading a layer's parasites");
@@ -2149,13 +2150,13 @@ xcf_load_channel_props (XcfInfo *info,
 	 case PROP_PARASITES:
 	 {
 	   long base = info->cp;
-	   Parasite *p;
+	   GimpParasite *p;
 	   while ((info->cp - base) < prop_size)
-	   {
-	     p = read_a_parasite(info);
-	     gimp_drawable_parasite_attach(GIMP_DRAWABLE(channel), p);
-	     parasite_free(p);
-	   }
+	     {
+	       p = read_a_parasite(info);
+	       gimp_drawable_parasite_attach(GIMP_DRAWABLE(channel), p);
+	       gimp_parasite_free(p);
+	     }
 	   if (info->cp - base != prop_size)
 	     g_message("Error detected while loading a channel's parasites");
 	 }

libgimp/color_display.h

@@ -24,26 +24,26 @@
 
 #include <libgimp/parasiteF.h>
 
-typedef void       (*GimpColorDisplayInit)            (void);
-typedef gpointer   (*GimpColorDisplayNew)             (int       type);
-typedef gpointer   (*GimpColorDisplayClone)           (gpointer  cd_ID);
-typedef void       (*GimpColorDisplayConvert)         (gpointer  cd_ID,
-						       guchar    *buf,
-						       int        width,
-						       int        height,
-						       int        bpp,
-						       int        bpl);
-typedef void       (*GimpColorDisplayDestroy)         (gpointer   cd_ID);
-typedef void       (*GimpColorDisplayFinalize)        (void);
-typedef void       (*GimpColorDisplayLoadState)       (gpointer   cd_ID,
-						       Parasite  *state);
-typedef Parasite * (*GimpColorDisplaySaveState)       (gpointer   cd_ID);
-typedef void       (*GimpColorDisplayConfigure)       (gpointer   cd_ID,
-    						       GFunc      ok_func,
-						       gpointer   ok_data,
-						       GFunc      cancel_func,
-						       gpointer   cancel_data);
-typedef void       (*GimpColorDisplayConfigureCancel) (gpointer   cd_ID);
+typedef void           (* GimpColorDisplayInit)       (void);
+typedef gpointer       (* GimpColorDisplayNew)        (gint          type);
+typedef gpointer       (* GimpColorDisplayClone)      (gpointer      cd_ID);
+typedef void           (* GimpColorDisplayConvert)    (gpointer      cd_ID,
+						       guchar       *buf,
+						       gint          width,
+						       gint          height,
+						       gint          bpp,
+						       gint          bpl);
+typedef void           (* GimpColorDisplayDestroy)    (gpointer      cd_ID);
+typedef void           (* GimpColorDisplayFinalize)   (void);
+typedef void           (* GimpColorDisplayLoadState)  (gpointer      cd_ID,
+						       GimpParasite *state);
+typedef GimpParasite * (* GimpColorDisplaySaveState)  (gpointer      cd_ID);
+typedef void           (* GimpColorDisplayConfigure)  (gpointer      cd_ID,
+						       GFunc         ok_func,
+						       gpointer      ok_data,
+						       GFunc         cancel_func,
+						       gpointer      cancel_data);
+typedef void      (* GimpColorDisplayConfigureCancel) (gpointer      cd_ID);
 
 typedef struct _GimpColorDisplayMethods GimpColorDisplayMethods;
 

libgimp/gimp.c

@@ -798,7 +798,7 @@ gimp_run_procedure (gchar *name,
           (void) va_arg (args, guchar*);
           break;
         case PARAM_PARASITE:
-          (void) va_arg (args, Parasite*);
+          (void) va_arg (args, GimpParasite*);
           break;
         case PARAM_REGION:
           break;
@@ -885,21 +885,22 @@ gimp_run_procedure (gchar *name,
 	  proc_run.params[i].data.d_path = va_arg (args, gint32);
           break;
         case PARAM_PARASITE:
-	{
-	  Parasite *p = va_arg (args, Parasite*);
-	  if (p == NULL)
 	  {
-	    proc_run.params[i].data.d_parasite.name = NULL;
-	    proc_run.params[i].data.d_parasite.data = NULL;
+	    GimpParasite *p = va_arg (args, GimpParasite*);
+	    if (p == NULL)
+	      {
+		proc_run.params[i].data.d_parasite.name = NULL;
+		proc_run.params[i].data.d_parasite.data = NULL;
+	      }
+	    else
+	      {
+		proc_run.params[i].data.d_parasite.name  = p->name;
+		proc_run.params[i].data.d_parasite.flags = p->flags;
+		proc_run.params[i].data.d_parasite.size  = p->size;
+		proc_run.params[i].data.d_parasite.data  = p->data;
+	      }
 	  }
-	  else
-	  {
-	    proc_run.params[i].data.d_parasite.name    = p->name;
-	    proc_run.params[i].data.d_parasite.flags   = p->flags;
-	    proc_run.params[i].data.d_parasite.size    = p->size;
-	    proc_run.params[i].data.d_parasite.data    = p->data;
-	  }
-	} break;
+	  break;
         case PARAM_STATUS:
 	  proc_run.params[i].data.d_status = va_arg (args, gint32);
           break;

libgimp/gimp.h

@@ -155,28 +155,28 @@ struct _GParamRegion
 
 union _GParamData
 {
-  gint32 d_int32;
-  gint16 d_int16;
-  gint8 d_int8;
-  gdouble d_float;
-  gchar *d_string;
-  gint32 *d_int32array;
-  gint16 *d_int16array;
-  gint8 *d_int8array;
-  gdouble *d_floatarray;
-  gchar **d_stringarray;
-  GParamColor d_color;
-  GParamRegion d_region;
-  gint32 d_display;
-  gint32 d_image;
-  gint32 d_layer;
-  gint32 d_channel;
-  gint32 d_drawable;
-  gint32 d_selection;
-  gint32 d_boundary;
-  gint32 d_path;
-  Parasite d_parasite;
-  gint32 d_status;
+  gint32         d_int32;
+  gint16         d_int16;
+  gint8          d_int8;
+  gdouble        d_float;
+  gchar         *d_string;
+  gint32        *d_int32array;
+  gint16        *d_int16array;
+  gint8         *d_int8array;
+  gdouble       *d_floatarray;
+  gchar        **d_stringarray;
+  GParamColor    d_color;
+  GParamRegion   d_region;
+  gint32         d_display;
+  gint32         d_image;
+  gint32         d_layer;
+  gint32         d_channel;
+  gint32         d_drawable;
+  gint32         d_selection;
+  gint32         d_boundary;
+  gint32         d_path;
+  GimpParasite   d_parasite;
+  gint32         d_status;
 };
 
 struct _GParam
@@ -514,10 +514,10 @@ void       gimp_image_set_component_visible (gint32     image_ID,
 					     gboolean   visible);
 void       gimp_image_set_filename          (gint32     image_ID,
 					     gchar     *name);
-Parasite  *gimp_image_parasite_find         (gint32          image_ID,
+GimpParasite * gimp_image_parasite_find     (gint32          image_ID,
 					     const gchar    *name);
-void       gimp_image_parasite_attach       (gint32          image_ID,
-					     const Parasite *p);
+void       gimp_image_parasite_attach       (gint32              image_ID,
+					     const GimpParasite *parasite);
 void       gimp_image_attach_new_parasite   (gint32          image_ID,
 					     const gchar    *name, 
 					     gint            flags,
@@ -735,21 +735,21 @@ GTile*        gimp_drawable_get_tile2    (GDrawable *drawable,
 					  gint       shadow,
 					  gint       x,
 					  gint       y);
-Parasite*     gimp_drawable_parasite_find       (gint32          drawable,
-						 const gchar    *name);
-void          gimp_drawable_parasite_attach     (gint32          drawable,
-						 const Parasite *p);
-void          gimp_drawable_attach_new_parasite (gint32          drawable,
-						 const gchar    *name, 
-						 gint            flags,
-						 gint            size, 
-						 const gpointer  data);
-void          gimp_drawable_parasite_detach     (gint32          drawable,
-						 const char     *name);
-guchar*       gimp_drawable_get_thumbnail_data  (gint32          drawable_ID,
-						 gint           *width,
-						 gint           *height,
-						 gint           *bytes);
+GimpParasite * gimp_drawable_parasite_find      (gint32              drawable,
+						 const gchar        *name);
+void           gimp_drawable_parasite_attach    (gint32              drawable,
+						 const GimpParasite *parasite);
+void          gimp_drawable_attach_new_parasite (gint32              drawable,
+						 const gchar        *name, 
+						 gint                flags,
+						 gint                size, 
+						 const gpointer      data);
+void          gimp_drawable_parasite_detach     (gint32              drawable,
+						 const char         *name);
+guchar      * gimp_drawable_get_thumbnail_data  (gint32              drawable_ID,
+						 gint               *width,
+						 gint               *height,
+						 gint               *bytes);
 
 
 /****************************************
@@ -870,24 +870,24 @@ void gimp_palette_set_foreground (guchar  red,
  *            Gradients                 *
  ****************************************/
 
-gchar**  gimp_gradients_get_list       (gint    *num_gradients);
-gchar*   gimp_gradients_get_active     (void);
-void     gimp_gradients_set_active     (char    *name);
-gdouble* gimp_gradients_sample_uniform (gint     num_samples);
-gdouble* gimp_gradients_sample_custom  (gint     num_samples,
-					gdouble *positions);
+gchar   ** gimp_gradients_get_list       (gint    *num_gradients);
+gchar    * gimp_gradients_get_active     (void);
+void       gimp_gradients_set_active     (char    *name);
+gdouble  * gimp_gradients_sample_uniform (gint     num_samples);
+gdouble  * gimp_gradients_sample_custom  (gint     num_samples,
+					  gdouble *positions);
 
 /****************************************
  *            Parasites                 *
  ****************************************/
 
-Parasite *gimp_parasite_find       (const gchar    *name);
-void      gimp_parasite_attach     (const Parasite *p);
-void      gimp_attach_new_parasite (const gchar    *name, 
-				    gint            flags,
-				    gint            size, 
-				    const gpointer  data);
-void      gimp_parasite_detach     (const gchar    *name);
+GimpParasite * gimp_parasite_find       (const gchar        *name);
+void           gimp_parasite_attach     (const GimpParasite *parasite);
+void           gimp_attach_new_parasite (const gchar        *name, 
+					 gint                flags,
+					 gint                size, 
+					 const gpointer      data);
+void           gimp_parasite_detach     (const gchar        *name);
 
 /****************************************
  *                Help                  *

libgimp/gimpcolordisplay.h

@@ -24,26 +24,26 @@
 
 #include <libgimp/parasiteF.h>
 
-typedef void       (*GimpColorDisplayInit)            (void);
-typedef gpointer   (*GimpColorDisplayNew)             (int       type);
-typedef gpointer   (*GimpColorDisplayClone)           (gpointer  cd_ID);
-typedef void       (*GimpColorDisplayConvert)         (gpointer  cd_ID,
-						       guchar    *buf,
-						       int        width,
-						       int        height,
-						       int        bpp,
-						       int        bpl);
-typedef void       (*GimpColorDisplayDestroy)         (gpointer   cd_ID);
-typedef void       (*GimpColorDisplayFinalize)        (void);
-typedef void       (*GimpColorDisplayLoadState)       (gpointer   cd_ID,
-						       Parasite  *state);
-typedef Parasite * (*GimpColorDisplaySaveState)       (gpointer   cd_ID);
-typedef void       (*GimpColorDisplayConfigure)       (gpointer   cd_ID,
-    						       GFunc      ok_func,
-						       gpointer   ok_data,
-						       GFunc      cancel_func,
-						       gpointer   cancel_data);
-typedef void       (*GimpColorDisplayConfigureCancel) (gpointer   cd_ID);
+typedef void           (* GimpColorDisplayInit)       (void);
+typedef gpointer       (* GimpColorDisplayNew)        (gint          type);
+typedef gpointer       (* GimpColorDisplayClone)      (gpointer      cd_ID);
+typedef void           (* GimpColorDisplayConvert)    (gpointer      cd_ID,
+						       guchar       *buf,
+						       gint          width,
+						       gint          height,
+						       gint          bpp,
+						       gint          bpl);
+typedef void           (* GimpColorDisplayDestroy)    (gpointer      cd_ID);
+typedef void           (* GimpColorDisplayFinalize)   (void);
+typedef void           (* GimpColorDisplayLoadState)  (gpointer      cd_ID,
+						       GimpParasite *state);
+typedef GimpParasite * (* GimpColorDisplaySaveState)  (gpointer      cd_ID);
+typedef void           (* GimpColorDisplayConfigure)  (gpointer      cd_ID,
+						       GFunc         ok_func,
+						       gpointer      ok_data,
+						       GFunc         cancel_func,
+						       gpointer      cancel_data);
+typedef void      (* GimpColorDisplayConfigureCancel) (gpointer      cd_ID);
 
 typedef struct _GimpColorDisplayMethods GimpColorDisplayMethods;
 

libgimp/gimpcompat.h

@@ -48,6 +48,33 @@ extern "C" {
 #define gimp_image_thaw_undo		gimp_image_undo_thaw
 #define gimp_plugin_help_func           gimp_standard_help_func
 
+#define Parasite                        GimpParasite
+#define PARASITE_PERSISTENT             GIMP_PARASITE_PERSISTENT
+#define PARASITE_UNDOABLE               GIMP_PARASITE_UNDOABLE
+#define PARASITE_ATTACH_PARENT          GIMP_PARASITE_ATTACH_PARENT
+#define PARASITE_PARENT_PERSISTENT      GIMP_PARASITE_PARENT_PERSISTENT
+#define PARASITE_PARENT_UNDOABLE        GIMP_PARASITE_PARENT_UNDOABLE
+#define PARASITE_ATTACH_GRANDPARENT     GIMP_PARASITE_ATTACH_GRANDPARENT
+#define PARASITE_GRANDPARENT_PERSISTENT GIMP_PARASITE_GRANDPARENT_PERSISTENT
+#define PARASITE_GRANDPARENT_UNDOABLE   GIMP_PARASITE_GRANDPARENT_UNDOABLE
+#define parasite_new                    gimp_parasite_new
+#define parasite_free                   gimp_parasite_free
+#define parasite_copy                   gimp_parasite_copy
+#define parasite_compare                gimp_parasite_compare
+#define parasite_is_type                gimp_parasite_is_type
+#define parasite_is_persistent          gimp_parasite_is_persistent
+#define parasite_is_undoable            gimp_parasite_is_undoable
+#define parasite_has_flag               gimp_parasite_has_flag
+#define parasite_flags                  gimp_parasite_flags
+#define parasite_name                   gimp_parasite_name
+#define parasite_data                   gimp_parasite_data
+#define parasite_data_size              gimp_parasite_data_size
+#define PIXPIPE_MAXDIM                  GIMP_PIXPIPE_MAXDIM
+#define PixPipeParams                   GimpPixPipeParams
+#define pixpipeparams_init              gimp_pixpipe_params_init
+#define pixpipeparams_parse             gimp_pixpipe_params_parse
+#define pixpipeparams_build             gimp_pixpipe_params_build
+
 #endif /* GIMP_DISABLE_COMPAT_H */
 
 #ifdef __cplusplus

libgimp/gimpdrawable.c

@@ -579,14 +579,14 @@ gimp_drawable_get_tile2 (GDrawable *drawable,
   return gimp_drawable_get_tile (drawable, shadow, row, col);
 }
 
-Parasite *
+GimpParasite *
 gimp_drawable_parasite_find (gint32       drawable_ID,
 			     const gchar *name)
 
 {
   GParam *return_vals;
   gint nreturn_vals;
-  Parasite *parasite;
+  GimpParasite *parasite;
   return_vals = gimp_run_procedure ("gimp_drawable_parasite_find",
 				    &nreturn_vals,
 				    PARAM_DRAWABLE, drawable_ID,
@@ -594,9 +594,9 @@ gimp_drawable_parasite_find (gint32       drawable_ID,
 				    PARAM_END);
 
   if (return_vals[0].data.d_status == STATUS_SUCCESS)
-  {
-    parasite = parasite_copy(&return_vals[1].data.d_parasite);
-  }
+    {
+      parasite = gimp_parasite_copy (&return_vals[1].data.d_parasite);
+    }
   else
     parasite = NULL;
 
@@ -606,8 +606,8 @@ gimp_drawable_parasite_find (gint32       drawable_ID,
 }
 
 void
-gimp_drawable_parasite_attach (gint32          drawable_ID,
-			       const Parasite *p)
+gimp_drawable_parasite_attach (gint32              drawable_ID,
+			       const GimpParasite *parasite)
 {
   GParam *return_vals;
   gint nreturn_vals;
@@ -615,7 +615,7 @@ gimp_drawable_parasite_attach (gint32          drawable_ID,
   return_vals = gimp_run_procedure ("gimp_drawable_parasite_attach",
 				    &nreturn_vals,
 				    PARAM_DRAWABLE, drawable_ID,
-				    PARAM_PARASITE, p,
+				    PARAM_PARASITE, parasite,
 				    PARAM_END);
 
   gimp_destroy_params (return_vals, nreturn_vals);
@@ -631,7 +631,7 @@ gimp_drawable_attach_new_parasite (gint32          drawable,
 {
   GParam *return_vals;
   gint nreturn_vals;
-  Parasite *p = parasite_new (name, flags, size, data);
+  GimpParasite *p = gimp_parasite_new (name, flags, size, data);
 
   return_vals = gimp_run_procedure ("gimp_drawable_parasite_attach",
 				    &nreturn_vals,
@@ -639,7 +639,7 @@ gimp_drawable_attach_new_parasite (gint32          drawable,
 				    PARAM_PARASITE, p,
 				    PARAM_END);
 
-  parasite_free(p);
+  gimp_parasite_free(p);
   gimp_destroy_params (return_vals, nreturn_vals);
 }
 

libgimp/gimpdrawable_pdb.c

@@ -579,14 +579,14 @@ gimp_drawable_get_tile2 (GDrawable *drawable,
   return gimp_drawable_get_tile (drawable, shadow, row, col);
 }
 
-Parasite *
+GimpParasite *
 gimp_drawable_parasite_find (gint32       drawable_ID,
 			     const gchar *name)
 
 {
   GParam *return_vals;
   gint nreturn_vals;
-  Parasite *parasite;
+  GimpParasite *parasite;
   return_vals = gimp_run_procedure ("gimp_drawable_parasite_find",
 				    &nreturn_vals,
 				    PARAM_DRAWABLE, drawable_ID,
@@ -594,9 +594,9 @@ gimp_drawable_parasite_find (gint32       drawable_ID,
 				    PARAM_END);
 
   if (return_vals[0].data.d_status == STATUS_SUCCESS)
-  {
-    parasite = parasite_copy(&return_vals[1].data.d_parasite);
-  }
+    {
+      parasite = gimp_parasite_copy (&return_vals[1].data.d_parasite);
+    }
   else
     parasite = NULL;
 
@@ -606,8 +606,8 @@ gimp_drawable_parasite_find (gint32       drawable_ID,
 }
 
 void
-gimp_drawable_parasite_attach (gint32          drawable_ID,
-			       const Parasite *p)
+gimp_drawable_parasite_attach (gint32              drawable_ID,
+			       const GimpParasite *parasite)
 {
   GParam *return_vals;
   gint nreturn_vals;
@@ -615,7 +615,7 @@ gimp_drawable_parasite_attach (gint32          drawable_ID,
   return_vals = gimp_run_procedure ("gimp_drawable_parasite_attach",
 				    &nreturn_vals,
 				    PARAM_DRAWABLE, drawable_ID,
-				    PARAM_PARASITE, p,
+				    PARAM_PARASITE, parasite,
 				    PARAM_END);
 
   gimp_destroy_params (return_vals, nreturn_vals);
@@ -631,7 +631,7 @@ gimp_drawable_attach_new_parasite (gint32          drawable,
 {
   GParam *return_vals;
   gint nreturn_vals;
-  Parasite *p = parasite_new (name, flags, size, data);
+  GimpParasite *p = gimp_parasite_new (name, flags, size, data);
 
   return_vals = gimp_run_procedure ("gimp_drawable_parasite_attach",
 				    &nreturn_vals,
@@ -639,7 +639,7 @@ gimp_drawable_attach_new_parasite (gint32          drawable,
 				    PARAM_PARASITE, p,
 				    PARAM_END);
 
-  parasite_free(p);
+  gimp_parasite_free(p);
   gimp_destroy_params (return_vals, nreturn_vals);
 }
 

libgimp/gimpimage.c

@@ -976,13 +976,13 @@ gimp_image_set_filename (gint32  image_ID,
   gimp_destroy_params (return_vals, nreturn_vals);
 }
 
-Parasite *
+GimpParasite *
 gimp_image_parasite_find (gint32       image_ID, 
 			  const gchar *name)
 {
   GParam *return_vals;
   gint nreturn_vals;
-  Parasite *parasite;
+  GimpParasite *parasite;
   return_vals = gimp_run_procedure ("gimp_image_parasite_find",
 				    &nreturn_vals,
 				    PARAM_IMAGE, image_ID,
@@ -990,9 +990,9 @@ gimp_image_parasite_find (gint32       image_ID,
 				    PARAM_END);
 
   if (return_vals[0].data.d_status == STATUS_SUCCESS)
-  {
-    parasite = parasite_copy(&return_vals[1].data.d_parasite);
-  }
+    {
+      parasite = gimp_parasite_copy (&return_vals[1].data.d_parasite);
+    }
   else
     parasite = NULL;
 
@@ -1002,8 +1002,8 @@ gimp_image_parasite_find (gint32       image_ID,
 }
 
 void
-gimp_image_parasite_attach (gint32          image_ID, 
-			    const Parasite *p)
+gimp_image_parasite_attach (gint32              image_ID, 
+			    const GimpParasite *parasite)
 {
   GParam *return_vals;
   gint nreturn_vals;
@@ -1011,7 +1011,7 @@ gimp_image_parasite_attach (gint32          image_ID,
   return_vals = gimp_run_procedure ("gimp_image_parasite_attach",
 				    &nreturn_vals,
 				    PARAM_IMAGE, image_ID,
-				    PARAM_PARASITE, p,
+				    PARAM_PARASITE, parasite,
 				    PARAM_END);
 
   gimp_destroy_params (return_vals, nreturn_vals);
@@ -1026,7 +1026,7 @@ gimp_image_attach_new_parasite (gint32          image_ID,
 {
   GParam *return_vals;
   gint nreturn_vals;
-  Parasite *p = parasite_new(name, flags, size, data);
+  GimpParasite *p = gimp_parasite_new (name, flags, size, data);
 
   return_vals = gimp_run_procedure ("gimp_image_parasite_attach",
 				    &nreturn_vals,
@@ -1034,7 +1034,7 @@ gimp_image_attach_new_parasite (gint32          image_ID,
 				    PARAM_PARASITE, p,
 				    PARAM_END);
 
-  parasite_free(p);
+  gimp_parasite_free (p);
   gimp_destroy_params (return_vals, nreturn_vals);
 }
 

libgimp/gimpimage_pdb.c

@@ -976,13 +976,13 @@ gimp_image_set_filename (gint32  image_ID,
   gimp_destroy_params (return_vals, nreturn_vals);
 }
 
-Parasite *
+GimpParasite *
 gimp_image_parasite_find (gint32       image_ID, 
 			  const gchar *name)
 {
   GParam *return_vals;
   gint nreturn_vals;
-  Parasite *parasite;
+  GimpParasite *parasite;
   return_vals = gimp_run_procedure ("gimp_image_parasite_find",
 				    &nreturn_vals,
 				    PARAM_IMAGE, image_ID,
@@ -990,9 +990,9 @@ gimp_image_parasite_find (gint32       image_ID,
 				    PARAM_END);
 
   if (return_vals[0].data.d_status == STATUS_SUCCESS)
-  {
-    parasite = parasite_copy(&return_vals[1].data.d_parasite);
-  }
+    {
+      parasite = gimp_parasite_copy (&return_vals[1].data.d_parasite);
+    }
   else
     parasite = NULL;
 
@@ -1002,8 +1002,8 @@ gimp_image_parasite_find (gint32       image_ID,
 }
 
 void
-gimp_image_parasite_attach (gint32          image_ID, 
-			    const Parasite *p)
+gimp_image_parasite_attach (gint32              image_ID, 
+			    const GimpParasite *parasite)
 {
   GParam *return_vals;
   gint nreturn_vals;
@@ -1011,7 +1011,7 @@ gimp_image_parasite_attach (gint32          image_ID,
   return_vals = gimp_run_procedure ("gimp_image_parasite_attach",
 				    &nreturn_vals,
 				    PARAM_IMAGE, image_ID,
-				    PARAM_PARASITE, p,
+				    PARAM_PARASITE, parasite,
 				    PARAM_END);
 
   gimp_destroy_params (return_vals, nreturn_vals);
@@ -1026,7 +1026,7 @@ gimp_image_attach_new_parasite (gint32          image_ID,
 {
   GParam *return_vals;
   gint nreturn_vals;
-  Parasite *p = parasite_new(name, flags, size, data);
+  GimpParasite *p = gimp_parasite_new (name, flags, size, data);
 
   return_vals = gimp_run_procedure ("gimp_image_parasite_attach",
 				    &nreturn_vals,
@@ -1034,7 +1034,7 @@ gimp_image_attach_new_parasite (gint32          image_ID,
 				    PARAM_PARASITE, p,
 				    PARAM_END);
 
-  parasite_free(p);
+  gimp_parasite_free (p);
   gimp_destroy_params (return_vals, nreturn_vals);
 }
 

libgimp/gimpparasite.c

@@ -1,7 +1,7 @@
 /* LIBGIMP - The GIMP Library 
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
- * parasite.c
+ * gimpparasite.c
  * Copyright (C) 1998 Jay Cox <jaycox@earthlink.net>
  *
  * This library is free software; you can redistribute it and/or
@@ -37,150 +37,164 @@
 
 #ifdef DEBUG
 static void 
-parasite_print (Parasite *p)
+gimp_parasite_print (GimpParasite *parasite)
 {
-  if (p == NULL)
+  if (parasite == NULL)
     {
-      printf("(pid %d)attempt to print a null parasite\n", getpid());
+      g_print ("pid %d: attempt to print a null parasite\n", getpid ());
       return;
     }
-  printf("(pid %d), parasite: %p\n", getpid(), p);
-  if (p->name)
-    printf("\tname: %s\n", p->name);
+
+  g_print ("pid %d: parasite: %p\n", getpid (), parasite);
+
+  if (parasite->name)
+    g_print ("\tname: %s\n", parasite->name);
   else
-    printf("\tname: NULL\n");
-  printf("\tflags: %d\n", p->flags);
-  printf("\tsize: %d\n", p->size);
-  if (p->size > 0)
-    printf("\tdata: %p\n", p->data);
+    g_print ("\tname: NULL\n");
+
+  g_print ("\tflags: %d\n", parasite->flags);
+  g_print ("\tsize: %d\n", parasite->size);
+  if (parasite->size > 0)
+    g_print ("\tdata: %p\n", parasite->data);
 }
 #endif
 
-Parasite *
-parasite_new (const gchar    *name, 
-	      guint32         flags,
-	      guint32         size, 
-	      const gpointer  data)
+GimpParasite *
+gimp_parasite_new (const gchar    *name, 
+		   guint32         flags,
+		   guint32         size, 
+		   const gpointer  data)
 {
-  Parasite *p;
-  p = g_new (Parasite, 1);
-  if (name)
-    p->name = g_strdup (name);
-  else
-    {
-      g_free (p);
-      return NULL;
-    }
-  p->flags = (flags & 0xFF);
-  p->size = size;
+  GimpParasite *parasite;
+
+  if (!name)
+    return NULL;
+
+  parasite = g_new (GimpParasite, 1);
+  parasite->name  = g_strdup (name);
+  parasite->flags = (flags & 0xFF);
+  parasite->size  = size;
   if (size)
-    p->data = g_memdup (data, size);
+    parasite->data = g_memdup (data, size);
   else
-    p->data = NULL;
-  return p;
+    parasite->data = NULL;
+
+  return parasite;
 }
 
 void
-parasite_free (Parasite *parasite)
+gimp_parasite_free (GimpParasite *parasite)
 {
   if (parasite == NULL)
     return;
+
   if (parasite->name)
     g_free (parasite->name);
   if (parasite->data)
     g_free (parasite->data);
+
   g_free (parasite);
 }
 
-int
-parasite_is_type (const Parasite *parasite, 
-		  const gchar    *name)
+gboolean
+gimp_parasite_is_type (const GimpParasite *parasite, 
+		       const gchar        *name)
 {
   if (!parasite || !parasite->name)
     return FALSE;
-  return (strcmp(parasite->name, name) == 0);
+
+  return (strcmp (parasite->name, name) == 0);
 }
 
-Parasite *
-parasite_copy (const Parasite *parasite)
+GimpParasite *
+gimp_parasite_copy (const GimpParasite *parasite)
 {
   if (parasite == NULL)
     return NULL;
-  return parasite_new (parasite->name, parasite->flags,
-		       parasite->size, parasite->data);
+
+  return gimp_parasite_new (parasite->name, parasite->flags,
+			    parasite->size, parasite->data);
 }
 
 gboolean
-parasite_compare (const Parasite *a, 
-		  const Parasite *b)
+gimp_parasite_compare (const GimpParasite *a, 
+		       const GimpParasite *b)
 {
-  if (a && b && a->name && b->name && strcmp(a->name, b->name) == 0 &&
-      a->flags == b->flags && a->size == b->size )
+  if (a && b &&
+      a->name && b->name &&
+      strcmp (a->name, b->name) == 0 &&
+      a->flags == b->flags &&
+      a->size == b->size)
     {
       if (a->data == NULL && b->data == NULL)  
 	return TRUE;
-      else if (a->data && b->data && memcmp(a->data, b->data, a->size) == 0)
+      else if (a->data && b->data && memcmp (a->data, b->data, a->size) == 0)
 	return TRUE;
     }
+
   return FALSE;
 }
 
 gulong
-parasite_flags (const Parasite *p)
+gimp_parasite_flags (const GimpParasite *parasite)
 {
-  if (p == NULL)
+  if (parasite == NULL)
     return 0;
-  return p->flags;
+
+  return parasite->flags;
 }
 
 gboolean
-parasite_is_persistent (const Parasite *p)
+gimp_parasite_is_persistent (const GimpParasite *parasite)
 {
-  if (p == NULL)
+  if (parasite == NULL)
     return FALSE;
-  return (p->flags & PARASITE_PERSISTENT);
+
+  return (parasite->flags & GIMP_PARASITE_PERSISTENT);
 }
 
 gboolean
-parasite_is_undoable (const Parasite *p)
+gimp_parasite_is_undoable (const GimpParasite *parasite)
 {
-  if (p == NULL)
+  if (parasite == NULL)
     return FALSE;
-  return (p->flags & PARASITE_UNDOABLE);
+
+  return (parasite->flags & GIMP_PARASITE_UNDOABLE);
 }
 
 gboolean
-parasite_has_flag (const Parasite *p, 
-		   gulong          flag)
+gimp_parasite_has_flag (const GimpParasite *parasite, 
+			gulong              flag)
 {
-  if (p == NULL)
+  if (parasite == NULL)
     return FALSE;
-  return (p->flags & flag);
+
+  return (parasite->flags & flag);
 }
 
 const gchar *
-parasite_name (const Parasite *p)
+gimp_parasite_name (const GimpParasite *parasite)
 {
-  if (p)
-    return p->name;
+  if (parasite)
+    return parasite->name;
+
   return NULL;
 }
 
 void *
-parasite_data (const Parasite *p)
+gimp_parasite_data (const GimpParasite *parasite)
 {
-  if (p)
-    return p->data;
+  if (parasite)
+    return parasite->data;
+
   return NULL;
 }
 
 glong 
-parasite_data_size (const Parasite *p)
+gimp_parasite_data_size (const GimpParasite *parasite)
 {
-  if (p)
-    return p->size;
+  if (parasite)
+    return parasite->size;
+
   return 0;
 }
-
-
-

libgimp/gimpparasite.h

@@ -1,7 +1,7 @@
 /* LIBGIMP - The GIMP Library 
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
- * parasite.h
+ * gimpparasite.h
  * Copyright (C) 1998 Jay Cox <jaycox@earthlink.net>
  *
  * This library is free software; you can redistribute it and/or
@@ -20,8 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef __PARASITE_H__
-#define __PARASITE_H__
+#ifndef __GIMP_PARASITE_H__
+#define __GIMP_PARASITE_H__
 
 #include <glib.h>
 #include <stdio.h>
@@ -32,43 +32,42 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#define PARASITE_PERSISTENT 1
-#define PARASITE_UNDOABLE   2
+#define GIMP_PARASITE_PERSISTENT 1
+#define GIMP_PARASITE_UNDOABLE   2
 
-#define PARASITE_ATTACH_PARENT (0x80 << 8)
-#define PARASITE_PARENT_PERSISTENT (PARASITE_PERSISTENT << 8)
-#define PARASITE_PARENT_UNDOABLE (PARASITE_UNDOABLE << 8)
+#define GIMP_PARASITE_ATTACH_PARENT     (0x80 << 8)
+#define GIMP_PARASITE_PARENT_PERSISTENT (GIMP_PARASITE_PERSISTENT << 8)
+#define GIMP_PARASITE_PARENT_UNDOABLE   (GIMP_PARASITE_UNDOABLE << 8)
 
-#define PARASITE_ATTACH_GRANDPARENT (0x80 << 16)
-#define PARASITE_GRANDPARENT_PERSISTENT (PARASITE_PERSISTENT << 16)
-#define PARASITE_GRANDPARENT_UNDOABLE (PARASITE_UNDOABLE << 16)
+#define GIMP_PARASITE_ATTACH_GRANDPARENT     (0x80 << 16)
+#define GIMP_PARASITE_GRANDPARENT_PERSISTENT (GIMP_PARASITE_PERSISTENT << 16)
+#define GIMP_PARASITE_GRANDPARENT_UNDOABLE   (GIMP_PARASITE_UNDOABLE << 16)
 
-Parasite    *parasite_new           (const gchar    *name, 
-				     guint32         flags,
-				     guint32         size, 
-				     const gpointer  data);
-void         parasite_free          (Parasite       *parasite);
-  
-Parasite    *parasite_copy          (const Parasite *parasite);
+GimpParasite * gimp_parasite_new           (const gchar        *name, 
+					    guint32             flags,
+					    guint32             size, 
+					    const gpointer      data);
+void           gimp_parasite_free          (GimpParasite       *parasite);
 
-gboolean     parasite_compare       (const Parasite *a, 
-				     const Parasite *b);
+GimpParasite * gimp_parasite_copy          (const GimpParasite *parasite);
 
-gboolean     parasite_is_type       (const Parasite *parasite,
-				     const gchar    *name);
-gboolean     parasite_is_persistent (const Parasite *p);
-gboolean     parasite_is_undoable   (const Parasite *p);
-gboolean     parasite_has_flag      (const Parasite *p, 
-				     gulong          flag);
-gulong       parasite_flags         (const Parasite *p);
-const gchar *parasite_name          (const Parasite *p);
-void        *parasite_data          (const Parasite *p);
-glong        parasite_data_size     (const Parasite *p);
+gboolean       gimp_parasite_compare       (const GimpParasite *a, 
+					    const GimpParasite *b);
 
+gboolean       gimp_parasite_is_type       (const GimpParasite *parasite,
+					    const gchar        *name);
+gboolean       gimp_parasite_is_persistent (const GimpParasite *parasite);
+gboolean       gimp_parasite_is_undoable   (const GimpParasite *parasite);
+gboolean       gimp_parasite_has_flag      (const GimpParasite *parasite,
+					    gulong              flag);
+gulong         gimp_parasite_flags         (const GimpParasite *parasite);
+const gchar  * gimp_parasite_name          (const GimpParasite *parasite);
+void         * gimp_parasite_data          (const GimpParasite *parasite);
+glong          gimp_parasite_data_size     (const GimpParasite *parasite);
 
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __PARASITE_H__ */
+#endif /* __GIMP_PARASITE_H__ */

libgimp/gimpparasiteF.h

@@ -1,7 +1,7 @@
 /* LIBGIMP - The GIMP Library 
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
- * parasiteF.h
+ * gimpparasiteF.h
  * Copyright (C) 1998 Jay Cox <jaycox@earthlink.net>
  *
  * This library is free software; you can redistribute it and/or
@@ -19,10 +19,9 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifndef __GIMP_PARASITE_F_H__
+#define __GIMP_PARASITE_F_H__
 
-#ifndef __PARASITEF_H__
-#define __PARASITEF_H__
+typedef struct _GimpParasite GimpParasite;
 
-typedef struct _Parasite Parasite;
-
-#endif /* __PARASITEF_H__ */
+#endif /* __GIMP_PARASITE_F_H__ */

libgimp/gimpparasiteP.h

@@ -1,7 +1,7 @@
 /* LIBGIMP - The GIMP Library 
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
- * parasiteP.h
+ * gimpparasiteP.h
  * Copyright (C) 1998 Jay Cox <jaycox@earthlink.net>
  *
  * This library is free software; you can redistribute it and/or
@@ -19,9 +19,8 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-
-#ifndef __PARASITEP_H__
-#define __PARASITEP_H__
+#ifndef __GIMP_PARASITE_P_H__
+#define __GIMP_PARASITE_P_H__
 
 #include <glib.h>
 
@@ -29,12 +28,12 @@
 extern "C" {
 #endif /* __cplusplus */
 
-struct _Parasite
+struct _GimpParasite
 {
-  char *name;           /* The name of the parasite. USE A UNIQUE PREFIX! */
-  guint32 flags;	/* save Parasite in XCF file, etc.                */
-  guint32 size;         /* amount of data                                 */
-  void *data;           /* a pointer to the data.  plugin is              *
+  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            */
 };
 
@@ -42,4 +41,4 @@ struct _Parasite
 }
 #endif /* __cplusplus */
 
-#endif /* __PARASITEP_H__ */
+#endif /* __GIMP_PARASITE_P_H__ */

libgimp/gimpparasite_pdb.c

@@ -1,7 +1,7 @@
 /* LIBGIMP - The GIMP Library 
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
- * parasite.c
+ * gimpparasite.c
  * Copyright (C) 1998 Jay Cox <jaycox@earthlink.net>
  *
  * This library is free software; you can redistribute it and/or
@@ -21,21 +21,21 @@
  */
 #include "gimp.h"
 
-Parasite *
+GimpParasite *
 gimp_parasite_find (const gchar *name)
 {
   GParam *return_vals;
   gint nreturn_vals;
-  Parasite *parasite;
+  GimpParasite *parasite;
   return_vals = gimp_run_procedure ("gimp_parasite_find",
 				    &nreturn_vals,
 				    PARAM_STRING, name,
 				    PARAM_END);
 
   if (return_vals[0].data.d_status == STATUS_SUCCESS)
-  {
-    parasite = parasite_copy(&return_vals[1].data.d_parasite);
-  }
+    {
+      parasite = gimp_parasite_copy (&return_vals[1].data.d_parasite);
+    }
   else
     parasite = NULL;
 
@@ -44,16 +44,15 @@ gimp_parasite_find (const gchar *name)
   return parasite;
 }
 
-
 void
-gimp_parasite_attach (const Parasite *p)
+gimp_parasite_attach (const GimpParasite *parasite)
 {
   GParam *return_vals;
   gint nreturn_vals;
 
   return_vals = gimp_run_procedure ("gimp_parasite_attach",
 				    &nreturn_vals,
-				    PARAM_PARASITE, p,
+				    PARAM_PARASITE, parasite,
 				    PARAM_END);
 
   gimp_destroy_params (return_vals, nreturn_vals);
@@ -67,14 +66,14 @@ gimp_attach_new_parasite (const gchar    *name,
 {
   GParam *return_vals;
   gint nreturn_vals;
-  Parasite *p = parasite_new(name, flags, size, data);
+  GimpParasite *p = gimp_parasite_new (name, flags, size, data);
 
   return_vals = gimp_run_procedure ("gimp_parasite_attach",
 				    &nreturn_vals,
 				    PARAM_PARASITE, p,
 				    PARAM_END);
 
-  parasite_free(p);
+  gimp_parasite_free (p);
   gimp_destroy_params (return_vals, nreturn_vals);
 }
 

libgimp/gimpparasiteio.c

@@ -1,6 +1,7 @@
 /* LIBGIMP - The GIMP Library 
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
+ * gimpparasiteio.c
  * Copyright (C) 1999 Tor Lillqvist <tml@iki.fi>
  *
  * This library is free software; you can redistribute it and/or
@@ -11,7 +12,7 @@
  * 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
- * Library General Public License for more details.
+ * 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
@@ -29,37 +30,39 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <glib.h>
 
-#include "libgimp/parasiteio.h"
+#include "parasiteio.h"
+
 
 void
-pixpipeparams_init (PixPipeParams *params)
+gimp_pixpipe_params_init (GimpPixPipeParams *params)
 {
-  int i;
+  gint i;
 
-  params->step = 100;
-  params->ncells = 1;
-  params->cellwidth = 1;
+  params->step       = 100;
+  params->ncells     = 1;
+  params->cellwidth  = 1;
   params->cellheight = 1;
-  params->dim = 1;
-  params->cols = 1;
-  params->rows = 1;
-  params->placement = "constant";
+  params->dim        = 1;
+  params->cols       = 1;
+  params->rows       = 1;
+  params->placement  = "constant";
   params->free_placement_string = FALSE;
-  for (i = 0; i < PIXPIPE_MAXDIM; i++)
+  for (i = 0; i < GIMP_PIXPIPE_MAXDIM; i++)
     {
-      params->selection[i] = "random";
+      params->selection[i]          = "random";
       params->free_selection_string = FALSE;
     }
   params->rank[0] = 1;
-  for (i = 1; i < PIXPIPE_MAXDIM; i++)
+  for (i = 1; i < GIMP_PIXPIPE_MAXDIM; i++)
     params->rank[i] = 0;
 }
 
 void
-pixpipeparams_parse (gchar	   *string,
-		     PixPipeParams *params)
+gimp_pixpipe_params_parse (gchar            *string,
+			   GimpPixPipeParams *params)
 {
   gchar *p, *q, *r;		/* Don't you love single-char identifiers?  */
   gint i;                       /*          No, we don't!!   <Sven>         */ 
@@ -142,12 +145,12 @@ pixpipeparams_parse (gchar	   *string,
 }
 
 gchar *
-pixpipeparams_build (PixPipeParams *params)
+gimp_pixpipe_params_build (GimpPixPipeParams *params)
 {
   GString *s = g_string_new (NULL);
   gchar *str;
-  
-  int i;
+
+  gint i;
 
   g_string_sprintf (s, "ncells:%d cellwidth:%d cellheight:%d "
 		    "step:%d dim:%d cols:%d rows:%d placement:%s",
@@ -167,4 +170,3 @@ pixpipeparams_build (PixPipeParams *params)
 
   return str;
 }
-

libgimp/gimpparasiteio.h

@@ -1,7 +1,7 @@
 /* LIBGIMP - The GIMP Library 
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
- * parasiteio.h
+ * gimpparasiteio.h
  * Copyright (C) 1999 Tor Lillqvist <tml@iki.fi>
  *
  * This library is free software; you can redistribute it and/or
@@ -19,53 +19,53 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-
-#ifndef __PARASITEIO_H__
-#define __PARASITEIO_H__
+#ifndef __GIMP_PARASITE_IO_H__
+#define __GIMP_PARASITE_IO_H__
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-/* Data structures for various standard parasites used by plug-ins and
- * the GIMP core, and functions to build and parse their string
- * representations.
+/*  Data structures for various standard parasites used by plug-ins and
+ *  the GIMP core, and functions to build and parse their string
+ *  representations.
  */
 
 /*
- * Pixmap brush pipes.
+ *  Pixmap brush pipes.
  */
 
-#define PIXPIPE_MAXDIM 4
+#define GIMP_PIXPIPE_MAXDIM 4
 
-typedef struct {
-  gint step;
-  gint ncells;
-  gint dim;
-  gint cols;
-  gint rows;
-  gint cellwidth;
-  gint cellheight;
-  gchar *placement;
-  gboolean free_placement_string;
-  gint rank[PIXPIPE_MAXDIM];
-  gchar *selection[PIXPIPE_MAXDIM];
-  gboolean free_selection_string;
-} PixPipeParams;
+typedef struct
+{
+  gint      step;
+  gint      ncells;
+  gint      dim;
+  gint      cols;
+  gint      rows;
+  gint      cellwidth;
+  gint      cellheight;
+  gchar    *placement;
+  gboolean  free_placement_string;
+  gint      rank[GIMP_PIXPIPE_MAXDIM];
+  gchar    *selection[GIMP_PIXPIPE_MAXDIM];
+  gboolean  free_selection_string;
+} GimpPixPipeParams;
 
 /* Initalize with dummy values */
-void   pixpipeparams_init (PixPipeParams *params);
+void    gimp_pixpipe_params_init  (GimpPixPipeParams *params);
 
-/* Parse a string into a PixPipeParams */
-void   pixpipeparams_parse (gchar *parameters,
-			    PixPipeParams *params);
+/* Parse a string into a GimpPixPipeParams */
+void    gimp_pixpipe_params_parse (gchar             *parameters,
+				   GimpPixPipeParams *params);
 
-/* Build a string representation of PixPipeParams */
-gchar *pixpipeparams_build (PixPipeParams *params);
+/* Build a string representation of GimpPixPipeParams */
+gchar * gimp_pixpipe_params_build (GimpPixPipeParams *params);
 
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __PARASITEIO_H__ */
+#endif /* __GIMP_PARASITE_IO_H__ */

libgimp/gimpprotocol.c

@@ -1355,7 +1355,7 @@ _gp_params_write (GIOChannel *channel,
 
         case PARAM_PARASITE:
 	  {
-	    Parasite *p = (Parasite *)&params[i].data.d_parasite;
+	    GimpParasite *p = (GimpParasite *) &params[i].data.d_parasite;
 	    if (p->name == NULL)
 	      {
 		/* write a null string to signifly a null parasite */

libgimp/parasite.c

@@ -1,7 +1,7 @@
 /* LIBGIMP - The GIMP Library 
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
- * parasite.c
+ * gimpparasite.c
  * Copyright (C) 1998 Jay Cox <jaycox@earthlink.net>
  *
  * This library is free software; you can redistribute it and/or
@@ -37,150 +37,164 @@
 
 #ifdef DEBUG
 static void 
-parasite_print (Parasite *p)
+gimp_parasite_print (GimpParasite *parasite)
 {
-  if (p == NULL)
+  if (parasite == NULL)
     {
-      printf("(pid %d)attempt to print a null parasite\n", getpid());
+      g_print ("pid %d: attempt to print a null parasite\n", getpid ());
       return;
     }
-  printf("(pid %d), parasite: %p\n", getpid(), p);
-  if (p->name)
-    printf("\tname: %s\n", p->name);
+
+  g_print ("pid %d: parasite: %p\n", getpid (), parasite);
+
+  if (parasite->name)
+    g_print ("\tname: %s\n", parasite->name);
   else
-    printf("\tname: NULL\n");
-  printf("\tflags: %d\n", p->flags);
-  printf("\tsize: %d\n", p->size);
-  if (p->size > 0)
-    printf("\tdata: %p\n", p->data);
+    g_print ("\tname: NULL\n");
+
+  g_print ("\tflags: %d\n", parasite->flags);
+  g_print ("\tsize: %d\n", parasite->size);
+  if (parasite->size > 0)
+    g_print ("\tdata: %p\n", parasite->data);
 }
 #endif
 
-Parasite *
-parasite_new (const gchar    *name, 
-	      guint32         flags,
-	      guint32         size, 
-	      const gpointer  data)
+GimpParasite *
+gimp_parasite_new (const gchar    *name, 
+		   guint32         flags,
+		   guint32         size, 
+		   const gpointer  data)
 {
-  Parasite *p;
-  p = g_new (Parasite, 1);
-  if (name)
-    p->name = g_strdup (name);
-  else
-    {
-      g_free (p);
-      return NULL;
-    }
-  p->flags = (flags & 0xFF);
-  p->size = size;
+  GimpParasite *parasite;
+
+  if (!name)
+    return NULL;
+
+  parasite = g_new (GimpParasite, 1);
+  parasite->name  = g_strdup (name);
+  parasite->flags = (flags & 0xFF);
+  parasite->size  = size;
   if (size)
-    p->data = g_memdup (data, size);
+    parasite->data = g_memdup (data, size);
   else
-    p->data = NULL;
-  return p;
+    parasite->data = NULL;
+
+  return parasite;
 }
 
 void
-parasite_free (Parasite *parasite)
+gimp_parasite_free (GimpParasite *parasite)
 {
   if (parasite == NULL)
     return;
+
   if (parasite->name)
     g_free (parasite->name);
   if (parasite->data)
     g_free (parasite->data);
+
   g_free (parasite);
 }
 
-int
-parasite_is_type (const Parasite *parasite, 
-		  const gchar    *name)
+gboolean
+gimp_parasite_is_type (const GimpParasite *parasite, 
+		       const gchar        *name)
 {
   if (!parasite || !parasite->name)
     return FALSE;
-  return (strcmp(parasite->name, name) == 0);
+
+  return (strcmp (parasite->name, name) == 0);
 }
 
-Parasite *
-parasite_copy (const Parasite *parasite)
+GimpParasite *
+gimp_parasite_copy (const GimpParasite *parasite)
 {
   if (parasite == NULL)
     return NULL;
-  return parasite_new (parasite->name, parasite->flags,
-		       parasite->size, parasite->data);
+
+  return gimp_parasite_new (parasite->name, parasite->flags,
+			    parasite->size, parasite->data);
 }
 
 gboolean
-parasite_compare (const Parasite *a, 
-		  const Parasite *b)
+gimp_parasite_compare (const GimpParasite *a, 
+		       const GimpParasite *b)
 {
-  if (a && b && a->name && b->name && strcmp(a->name, b->name) == 0 &&
-      a->flags == b->flags && a->size == b->size )
+  if (a && b &&
+      a->name && b->name &&
+      strcmp (a->name, b->name) == 0 &&
+      a->flags == b->flags &&
+      a->size == b->size)
     {
       if (a->data == NULL && b->data == NULL)  
 	return TRUE;
-      else if (a->data && b->data && memcmp(a->data, b->data, a->size) == 0)
+      else if (a->data && b->data && memcmp (a->data, b->data, a->size) == 0)
 	return TRUE;
     }
+
   return FALSE;
 }
 
 gulong
-parasite_flags (const Parasite *p)
+gimp_parasite_flags (const GimpParasite *parasite)
 {
-  if (p == NULL)
+  if (parasite == NULL)
     return 0;
-  return p->flags;
+
+  return parasite->flags;
 }
 
 gboolean
-parasite_is_persistent (const Parasite *p)
+gimp_parasite_is_persistent (const GimpParasite *parasite)
 {
-  if (p == NULL)
+  if (parasite == NULL)
     return FALSE;
-  return (p->flags & PARASITE_PERSISTENT);
+
+  return (parasite->flags & GIMP_PARASITE_PERSISTENT);
 }
 
 gboolean
-parasite_is_undoable (const Parasite *p)
+gimp_parasite_is_undoable (const GimpParasite *parasite)
 {
-  if (p == NULL)
+  if (parasite == NULL)
     return FALSE;
-  return (p->flags & PARASITE_UNDOABLE);
+
+  return (parasite->flags & GIMP_PARASITE_UNDOABLE);
 }
 
 gboolean
-parasite_has_flag (const Parasite *p, 
-		   gulong          flag)
+gimp_parasite_has_flag (const GimpParasite *parasite, 
+			gulong              flag)
 {
-  if (p == NULL)
+  if (parasite == NULL)
     return FALSE;
-  return (p->flags & flag);
+
+  return (parasite->flags & flag);
 }
 
 const gchar *
-parasite_name (const Parasite *p)
+gimp_parasite_name (const GimpParasite *parasite)
 {
-  if (p)
-    return p->name;
+  if (parasite)
+    return parasite->name;
+
   return NULL;
 }
 
 void *
-parasite_data (const Parasite *p)
+gimp_parasite_data (const GimpParasite *parasite)
 {
-  if (p)
-    return p->data;
+  if (parasite)
+    return parasite->data;
+
   return NULL;
 }
 
 glong 
-parasite_data_size (const Parasite *p)
+gimp_parasite_data_size (const GimpParasite *parasite)
 {
-  if (p)
-    return p->size;
+  if (parasite)
+    return parasite->size;
+
   return 0;
 }
-
-
-

libgimp/parasite.h

@@ -1,7 +1,7 @@
 /* LIBGIMP - The GIMP Library 
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
- * parasite.h
+ * gimpparasite.h
  * Copyright (C) 1998 Jay Cox <jaycox@earthlink.net>
  *
  * This library is free software; you can redistribute it and/or
@@ -20,8 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef __PARASITE_H__
-#define __PARASITE_H__
+#ifndef __GIMP_PARASITE_H__
+#define __GIMP_PARASITE_H__
 
 #include <glib.h>
 #include <stdio.h>
@@ -32,43 +32,42 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#define PARASITE_PERSISTENT 1
-#define PARASITE_UNDOABLE   2
+#define GIMP_PARASITE_PERSISTENT 1
+#define GIMP_PARASITE_UNDOABLE   2
 
-#define PARASITE_ATTACH_PARENT (0x80 << 8)
-#define PARASITE_PARENT_PERSISTENT (PARASITE_PERSISTENT << 8)
-#define PARASITE_PARENT_UNDOABLE (PARASITE_UNDOABLE << 8)
+#define GIMP_PARASITE_ATTACH_PARENT     (0x80 << 8)
+#define GIMP_PARASITE_PARENT_PERSISTENT (GIMP_PARASITE_PERSISTENT << 8)
+#define GIMP_PARASITE_PARENT_UNDOABLE   (GIMP_PARASITE_UNDOABLE << 8)
 
-#define PARASITE_ATTACH_GRANDPARENT (0x80 << 16)
-#define PARASITE_GRANDPARENT_PERSISTENT (PARASITE_PERSISTENT << 16)
-#define PARASITE_GRANDPARENT_UNDOABLE (PARASITE_UNDOABLE << 16)
+#define GIMP_PARASITE_ATTACH_GRANDPARENT     (0x80 << 16)
+#define GIMP_PARASITE_GRANDPARENT_PERSISTENT (GIMP_PARASITE_PERSISTENT << 16)
+#define GIMP_PARASITE_GRANDPARENT_UNDOABLE   (GIMP_PARASITE_UNDOABLE << 16)
 
-Parasite    *parasite_new           (const gchar    *name, 
-				     guint32         flags,
-				     guint32         size, 
-				     const gpointer  data);
-void         parasite_free          (Parasite       *parasite);
-  
-Parasite    *parasite_copy          (const Parasite *parasite);
+GimpParasite * gimp_parasite_new           (const gchar        *name, 
+					    guint32             flags,
+					    guint32             size, 
+					    const gpointer      data);
+void           gimp_parasite_free          (GimpParasite       *parasite);
 
-gboolean     parasite_compare       (const Parasite *a, 
-				     const Parasite *b);
+GimpParasite * gimp_parasite_copy          (const GimpParasite *parasite);
 
-gboolean     parasite_is_type       (const Parasite *parasite,
-				     const gchar    *name);
-gboolean     parasite_is_persistent (const Parasite *p);
-gboolean     parasite_is_undoable   (const Parasite *p);
-gboolean     parasite_has_flag      (const Parasite *p, 
-				     gulong          flag);
-gulong       parasite_flags         (const Parasite *p);
-const gchar *parasite_name          (const Parasite *p);
-void        *parasite_data          (const Parasite *p);
-glong        parasite_data_size     (const Parasite *p);
+gboolean       gimp_parasite_compare       (const GimpParasite *a, 
+					    const GimpParasite *b);
 
+gboolean       gimp_parasite_is_type       (const GimpParasite *parasite,
+					    const gchar        *name);
+gboolean       gimp_parasite_is_persistent (const GimpParasite *parasite);
+gboolean       gimp_parasite_is_undoable   (const GimpParasite *parasite);
+gboolean       gimp_parasite_has_flag      (const GimpParasite *parasite,
+					    gulong              flag);
+gulong         gimp_parasite_flags         (const GimpParasite *parasite);
+const gchar  * gimp_parasite_name          (const GimpParasite *parasite);
+void         * gimp_parasite_data          (const GimpParasite *parasite);
+glong          gimp_parasite_data_size     (const GimpParasite *parasite);
 
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __PARASITE_H__ */
+#endif /* __GIMP_PARASITE_H__ */

libgimp/parasiteF.h

@@ -1,7 +1,7 @@
 /* LIBGIMP - The GIMP Library 
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
- * parasiteF.h
+ * gimpparasiteF.h
  * Copyright (C) 1998 Jay Cox <jaycox@earthlink.net>
  *
  * This library is free software; you can redistribute it and/or
@@ -19,10 +19,9 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifndef __GIMP_PARASITE_F_H__
+#define __GIMP_PARASITE_F_H__
 
-#ifndef __PARASITEF_H__
-#define __PARASITEF_H__
+typedef struct _GimpParasite GimpParasite;
 
-typedef struct _Parasite Parasite;
-
-#endif /* __PARASITEF_H__ */
+#endif /* __GIMP_PARASITE_F_H__ */

libgimp/parasiteP.h

@@ -1,7 +1,7 @@
 /* LIBGIMP - The GIMP Library 
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
- * parasiteP.h
+ * gimpparasiteP.h
  * Copyright (C) 1998 Jay Cox <jaycox@earthlink.net>
  *
  * This library is free software; you can redistribute it and/or
@@ -19,9 +19,8 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-
-#ifndef __PARASITEP_H__
-#define __PARASITEP_H__
+#ifndef __GIMP_PARASITE_P_H__
+#define __GIMP_PARASITE_P_H__
 
 #include <glib.h>
 
@@ -29,12 +28,12 @@
 extern "C" {
 #endif /* __cplusplus */
 
-struct _Parasite
+struct _GimpParasite
 {
-  char *name;           /* The name of the parasite. USE A UNIQUE PREFIX! */
-  guint32 flags;	/* save Parasite in XCF file, etc.                */
-  guint32 size;         /* amount of data                                 */
-  void *data;           /* a pointer to the data.  plugin is              *
+  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            */
 };
 
@@ -42,4 +41,4 @@ struct _Parasite
 }
 #endif /* __cplusplus */
 
-#endif /* __PARASITEP_H__ */
+#endif /* __GIMP_PARASITE_P_H__ */

libgimp/parasiteio.c

@@ -1,6 +1,7 @@
 /* LIBGIMP - The GIMP Library 
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
+ * gimpparasiteio.c
  * Copyright (C) 1999 Tor Lillqvist <tml@iki.fi>
  *
  * This library is free software; you can redistribute it and/or
@@ -11,7 +12,7 @@
  * 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
- * Library General Public License for more details.
+ * 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
@@ -29,37 +30,39 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <glib.h>
 
-#include "libgimp/parasiteio.h"
+#include "parasiteio.h"
+
 
 void
-pixpipeparams_init (PixPipeParams *params)
+gimp_pixpipe_params_init (GimpPixPipeParams *params)
 {
-  int i;
+  gint i;
 
-  params->step = 100;
-  params->ncells = 1;
-  params->cellwidth = 1;
+  params->step       = 100;
+  params->ncells     = 1;
+  params->cellwidth  = 1;
   params->cellheight = 1;
-  params->dim = 1;
-  params->cols = 1;
-  params->rows = 1;
-  params->placement = "constant";
+  params->dim        = 1;
+  params->cols       = 1;
+  params->rows       = 1;
+  params->placement  = "constant";
   params->free_placement_string = FALSE;
-  for (i = 0; i < PIXPIPE_MAXDIM; i++)
+  for (i = 0; i < GIMP_PIXPIPE_MAXDIM; i++)
     {
-      params->selection[i] = "random";
+      params->selection[i]          = "random";
       params->free_selection_string = FALSE;
     }
   params->rank[0] = 1;
-  for (i = 1; i < PIXPIPE_MAXDIM; i++)
+  for (i = 1; i < GIMP_PIXPIPE_MAXDIM; i++)
     params->rank[i] = 0;
 }
 
 void
-pixpipeparams_parse (gchar	   *string,
-		     PixPipeParams *params)
+gimp_pixpipe_params_parse (gchar            *string,
+			   GimpPixPipeParams *params)
 {
   gchar *p, *q, *r;		/* Don't you love single-char identifiers?  */
   gint i;                       /*          No, we don't!!   <Sven>         */ 
@@ -142,12 +145,12 @@ pixpipeparams_parse (gchar	   *string,
 }
 
 gchar *
-pixpipeparams_build (PixPipeParams *params)
+gimp_pixpipe_params_build (GimpPixPipeParams *params)
 {
   GString *s = g_string_new (NULL);
   gchar *str;
-  
-  int i;
+
+  gint i;
 
   g_string_sprintf (s, "ncells:%d cellwidth:%d cellheight:%d "
 		    "step:%d dim:%d cols:%d rows:%d placement:%s",
@@ -167,4 +170,3 @@ pixpipeparams_build (PixPipeParams *params)
 
   return str;
 }
-

libgimp/parasiteio.h

@@ -1,7 +1,7 @@
 /* LIBGIMP - The GIMP Library 
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
- * parasiteio.h
+ * gimpparasiteio.h
  * Copyright (C) 1999 Tor Lillqvist <tml@iki.fi>
  *
  * This library is free software; you can redistribute it and/or
@@ -19,53 +19,53 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-
-#ifndef __PARASITEIO_H__
-#define __PARASITEIO_H__
+#ifndef __GIMP_PARASITE_IO_H__
+#define __GIMP_PARASITE_IO_H__
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-/* Data structures for various standard parasites used by plug-ins and
- * the GIMP core, and functions to build and parse their string
- * representations.
+/*  Data structures for various standard parasites used by plug-ins and
+ *  the GIMP core, and functions to build and parse their string
+ *  representations.
  */
 
 /*
- * Pixmap brush pipes.
+ *  Pixmap brush pipes.
  */
 
-#define PIXPIPE_MAXDIM 4
+#define GIMP_PIXPIPE_MAXDIM 4
 
-typedef struct {
-  gint step;
-  gint ncells;
-  gint dim;
-  gint cols;
-  gint rows;
-  gint cellwidth;
-  gint cellheight;
-  gchar *placement;
-  gboolean free_placement_string;
-  gint rank[PIXPIPE_MAXDIM];
-  gchar *selection[PIXPIPE_MAXDIM];
-  gboolean free_selection_string;
-} PixPipeParams;
+typedef struct
+{
+  gint      step;
+  gint      ncells;
+  gint      dim;
+  gint      cols;
+  gint      rows;
+  gint      cellwidth;
+  gint      cellheight;
+  gchar    *placement;
+  gboolean  free_placement_string;
+  gint      rank[GIMP_PIXPIPE_MAXDIM];
+  gchar    *selection[GIMP_PIXPIPE_MAXDIM];
+  gboolean  free_selection_string;
+} GimpPixPipeParams;
 
 /* Initalize with dummy values */
-void   pixpipeparams_init (PixPipeParams *params);
+void    gimp_pixpipe_params_init  (GimpPixPipeParams *params);
 
-/* Parse a string into a PixPipeParams */
-void   pixpipeparams_parse (gchar *parameters,
-			    PixPipeParams *params);
+/* Parse a string into a GimpPixPipeParams */
+void    gimp_pixpipe_params_parse (gchar             *parameters,
+				   GimpPixPipeParams *params);
 
-/* Build a string representation of PixPipeParams */
-gchar *pixpipeparams_build (PixPipeParams *params);
+/* Build a string representation of GimpPixPipeParams */
+gchar * gimp_pixpipe_params_build (GimpPixPipeParams *params);
 
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __PARASITEIO_H__ */
+#endif /* __GIMP_PARASITE_IO_H__ */

libgimpbase/gimpparasite.c

@@ -1,7 +1,7 @@
 /* LIBGIMP - The GIMP Library 
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
- * parasite.c
+ * gimpparasite.c
  * Copyright (C) 1998 Jay Cox <jaycox@earthlink.net>
  *
  * This library is free software; you can redistribute it and/or
@@ -37,150 +37,164 @@
 
 #ifdef DEBUG
 static void 
-parasite_print (Parasite *p)
+gimp_parasite_print (GimpParasite *parasite)
 {
-  if (p == NULL)
+  if (parasite == NULL)
     {
-      printf("(pid %d)attempt to print a null parasite\n", getpid());
+      g_print ("pid %d: attempt to print a null parasite\n", getpid ());
       return;
     }
-  printf("(pid %d), parasite: %p\n", getpid(), p);
-  if (p->name)
-    printf("\tname: %s\n", p->name);
+
+  g_print ("pid %d: parasite: %p\n", getpid (), parasite);
+
+  if (parasite->name)
+    g_print ("\tname: %s\n", parasite->name);
   else
-    printf("\tname: NULL\n");
-  printf("\tflags: %d\n", p->flags);
-  printf("\tsize: %d\n", p->size);
-  if (p->size > 0)
-    printf("\tdata: %p\n", p->data);
+    g_print ("\tname: NULL\n");
+
+  g_print ("\tflags: %d\n", parasite->flags);
+  g_print ("\tsize: %d\n", parasite->size);
+  if (parasite->size > 0)
+    g_print ("\tdata: %p\n", parasite->data);
 }
 #endif
 
-Parasite *
-parasite_new (const gchar    *name, 
-	      guint32         flags,
-	      guint32         size, 
-	      const gpointer  data)
+GimpParasite *
+gimp_parasite_new (const gchar    *name, 
+		   guint32         flags,
+		   guint32         size, 
+		   const gpointer  data)
 {
-  Parasite *p;
-  p = g_new (Parasite, 1);
-  if (name)
-    p->name = g_strdup (name);
-  else
-    {
-      g_free (p);
-      return NULL;
-    }
-  p->flags = (flags & 0xFF);
-  p->size = size;
+  GimpParasite *parasite;
+
+  if (!name)
+    return NULL;
+
+  parasite = g_new (GimpParasite, 1);
+  parasite->name  = g_strdup (name);
+  parasite->flags = (flags & 0xFF);
+  parasite->size  = size;
   if (size)
-    p->data = g_memdup (data, size);
+    parasite->data = g_memdup (data, size);
   else
-    p->data = NULL;
-  return p;
+    parasite->data = NULL;
+
+  return parasite;
 }
 
 void
-parasite_free (Parasite *parasite)
+gimp_parasite_free (GimpParasite *parasite)
 {
   if (parasite == NULL)
     return;
+
   if (parasite->name)
     g_free (parasite->name);
   if (parasite->data)
     g_free (parasite->data);
+
   g_free (parasite);
 }
 
-int
-parasite_is_type (const Parasite *parasite, 
-		  const gchar    *name)
+gboolean
+gimp_parasite_is_type (const GimpParasite *parasite, 
+		       const gchar        *name)
 {
   if (!parasite || !parasite->name)
     return FALSE;
-  return (strcmp(parasite->name, name) == 0);
+
+  return (strcmp (parasite->name, name) == 0);
 }
 
-Parasite *
-parasite_copy (const Parasite *parasite)
+GimpParasite *
+gimp_parasite_copy (const GimpParasite *parasite)
 {
   if (parasite == NULL)
     return NULL;
-  return parasite_new (parasite->name, parasite->flags,
-		       parasite->size, parasite->data);
+
+  return gimp_parasite_new (parasite->name, parasite->flags,
+			    parasite->size, parasite->data);
 }
 
 gboolean
-parasite_compare (const Parasite *a, 
-		  const Parasite *b)
+gimp_parasite_compare (const GimpParasite *a, 
+		       const GimpParasite *b)
 {
-  if (a && b && a->name && b->name && strcmp(a->name, b->name) == 0 &&
-      a->flags == b->flags && a->size == b->size )
+  if (a && b &&
+      a->name && b->name &&
+      strcmp (a->name, b->name) == 0 &&
+      a->flags == b->flags &&
+      a->size == b->size)
     {
       if (a->data == NULL && b->data == NULL)  
 	return TRUE;
-      else if (a->data && b->data && memcmp(a->data, b->data, a->size) == 0)
+      else if (a->data && b->data && memcmp (a->data, b->data, a->size) == 0)
 	return TRUE;
     }
+
   return FALSE;
 }
 
 gulong
-parasite_flags (const Parasite *p)
+gimp_parasite_flags (const GimpParasite *parasite)
 {
-  if (p == NULL)
+  if (parasite == NULL)
     return 0;
-  return p->flags;
+
+  return parasite->flags;
 }
 
 gboolean
-parasite_is_persistent (const Parasite *p)
+gimp_parasite_is_persistent (const GimpParasite *parasite)
 {
-  if (p == NULL)
+  if (parasite == NULL)
     return FALSE;
-  return (p->flags & PARASITE_PERSISTENT);
+
+  return (parasite->flags & GIMP_PARASITE_PERSISTENT);
 }
 
 gboolean
-parasite_is_undoable (const Parasite *p)
+gimp_parasite_is_undoable (const GimpParasite *parasite)
 {
-  if (p == NULL)
+  if (parasite == NULL)
     return FALSE;
-  return (p->flags & PARASITE_UNDOABLE);
+
+  return (parasite->flags & GIMP_PARASITE_UNDOABLE);
 }
 
 gboolean
-parasite_has_flag (const Parasite *p, 
-		   gulong          flag)
+gimp_parasite_has_flag (const GimpParasite *parasite, 
+			gulong              flag)
 {
-  if (p == NULL)
+  if (parasite == NULL)
     return FALSE;
-  return (p->flags & flag);
+
+  return (parasite->flags & flag);
 }
 
 const gchar *
-parasite_name (const Parasite *p)
+gimp_parasite_name (const GimpParasite *parasite)
 {
-  if (p)
-    return p->name;
+  if (parasite)
+    return parasite->name;
+
   return NULL;
 }
 
 void *
-parasite_data (const Parasite *p)
+gimp_parasite_data (const GimpParasite *parasite)
 {
-  if (p)
-    return p->data;
+  if (parasite)
+    return parasite->data;
+
   return NULL;
 }
 
 glong 
-parasite_data_size (const Parasite *p)
+gimp_parasite_data_size (const GimpParasite *parasite)
 {
-  if (p)
-    return p->size;
+  if (parasite)
+    return parasite->size;
+
   return 0;
 }
-
-
-

libgimpbase/gimpparasite.h

@@ -1,7 +1,7 @@
 /* LIBGIMP - The GIMP Library 
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
- * parasite.h
+ * gimpparasite.h
  * Copyright (C) 1998 Jay Cox <jaycox@earthlink.net>
  *
  * This library is free software; you can redistribute it and/or
@@ -20,8 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef __PARASITE_H__
-#define __PARASITE_H__
+#ifndef __GIMP_PARASITE_H__
+#define __GIMP_PARASITE_H__
 
 #include <glib.h>
 #include <stdio.h>
@@ -32,43 +32,42 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#define PARASITE_PERSISTENT 1
-#define PARASITE_UNDOABLE   2
+#define GIMP_PARASITE_PERSISTENT 1
+#define GIMP_PARASITE_UNDOABLE   2
 
-#define PARASITE_ATTACH_PARENT (0x80 << 8)
-#define PARASITE_PARENT_PERSISTENT (PARASITE_PERSISTENT << 8)
-#define PARASITE_PARENT_UNDOABLE (PARASITE_UNDOABLE << 8)
+#define GIMP_PARASITE_ATTACH_PARENT     (0x80 << 8)
+#define GIMP_PARASITE_PARENT_PERSISTENT (GIMP_PARASITE_PERSISTENT << 8)
+#define GIMP_PARASITE_PARENT_UNDOABLE   (GIMP_PARASITE_UNDOABLE << 8)
 
-#define PARASITE_ATTACH_GRANDPARENT (0x80 << 16)
-#define PARASITE_GRANDPARENT_PERSISTENT (PARASITE_PERSISTENT << 16)
-#define PARASITE_GRANDPARENT_UNDOABLE (PARASITE_UNDOABLE << 16)
+#define GIMP_PARASITE_ATTACH_GRANDPARENT     (0x80 << 16)
+#define GIMP_PARASITE_GRANDPARENT_PERSISTENT (GIMP_PARASITE_PERSISTENT << 16)
+#define GIMP_PARASITE_GRANDPARENT_UNDOABLE   (GIMP_PARASITE_UNDOABLE << 16)
 
-Parasite    *parasite_new           (const gchar    *name, 
-				     guint32         flags,
-				     guint32         size, 
-				     const gpointer  data);
-void         parasite_free          (Parasite       *parasite);
-  
-Parasite    *parasite_copy          (const Parasite *parasite);
+GimpParasite * gimp_parasite_new           (const gchar        *name, 
+					    guint32             flags,
+					    guint32             size, 
+					    const gpointer      data);
+void           gimp_parasite_free          (GimpParasite       *parasite);
 
-gboolean     parasite_compare       (const Parasite *a, 
-				     const Parasite *b);
+GimpParasite * gimp_parasite_copy          (const GimpParasite *parasite);
 
-gboolean     parasite_is_type       (const Parasite *parasite,
-				     const gchar    *name);
-gboolean     parasite_is_persistent (const Parasite *p);
-gboolean     parasite_is_undoable   (const Parasite *p);
-gboolean     parasite_has_flag      (const Parasite *p, 
-				     gulong          flag);
-gulong       parasite_flags         (const Parasite *p);
-const gchar *parasite_name          (const Parasite *p);
-void        *parasite_data          (const Parasite *p);
-glong        parasite_data_size     (const Parasite *p);
+gboolean       gimp_parasite_compare       (const GimpParasite *a, 
+					    const GimpParasite *b);
 
+gboolean       gimp_parasite_is_type       (const GimpParasite *parasite,
+					    const gchar        *name);
+gboolean       gimp_parasite_is_persistent (const GimpParasite *parasite);
+gboolean       gimp_parasite_is_undoable   (const GimpParasite *parasite);
+gboolean       gimp_parasite_has_flag      (const GimpParasite *parasite,
+					    gulong              flag);
+gulong         gimp_parasite_flags         (const GimpParasite *parasite);
+const gchar  * gimp_parasite_name          (const GimpParasite *parasite);
+void         * gimp_parasite_data          (const GimpParasite *parasite);
+glong          gimp_parasite_data_size     (const GimpParasite *parasite);
 
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __PARASITE_H__ */
+#endif /* __GIMP_PARASITE_H__ */

libgimpbase/gimpparasiteio.c

@@ -1,6 +1,7 @@
 /* LIBGIMP - The GIMP Library 
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
+ * gimpparasiteio.c
  * Copyright (C) 1999 Tor Lillqvist <tml@iki.fi>
  *
  * This library is free software; you can redistribute it and/or
@@ -11,7 +12,7 @@
  * 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
- * Library General Public License for more details.
+ * 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
@@ -29,37 +30,39 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <glib.h>
 
-#include "libgimp/parasiteio.h"
+#include "parasiteio.h"
+
 
 void
-pixpipeparams_init (PixPipeParams *params)
+gimp_pixpipe_params_init (GimpPixPipeParams *params)
 {
-  int i;
+  gint i;
 
-  params->step = 100;
-  params->ncells = 1;
-  params->cellwidth = 1;
+  params->step       = 100;
+  params->ncells     = 1;
+  params->cellwidth  = 1;
   params->cellheight = 1;
-  params->dim = 1;
-  params->cols = 1;
-  params->rows = 1;
-  params->placement = "constant";
+  params->dim        = 1;
+  params->cols       = 1;
+  params->rows       = 1;
+  params->placement  = "constant";
   params->free_placement_string = FALSE;
-  for (i = 0; i < PIXPIPE_MAXDIM; i++)
+  for (i = 0; i < GIMP_PIXPIPE_MAXDIM; i++)
     {
-      params->selection[i] = "random";
+      params->selection[i]          = "random";
       params->free_selection_string = FALSE;
     }
   params->rank[0] = 1;
-  for (i = 1; i < PIXPIPE_MAXDIM; i++)
+  for (i = 1; i < GIMP_PIXPIPE_MAXDIM; i++)
     params->rank[i] = 0;
 }
 
 void
-pixpipeparams_parse (gchar	   *string,
-		     PixPipeParams *params)
+gimp_pixpipe_params_parse (gchar            *string,
+			   GimpPixPipeParams *params)
 {
   gchar *p, *q, *r;		/* Don't you love single-char identifiers?  */
   gint i;                       /*          No, we don't!!   <Sven>         */ 
@@ -142,12 +145,12 @@ pixpipeparams_parse (gchar	   *string,
 }
 
 gchar *
-pixpipeparams_build (PixPipeParams *params)
+gimp_pixpipe_params_build (GimpPixPipeParams *params)
 {
   GString *s = g_string_new (NULL);
   gchar *str;
-  
-  int i;
+
+  gint i;
 
   g_string_sprintf (s, "ncells:%d cellwidth:%d cellheight:%d "
 		    "step:%d dim:%d cols:%d rows:%d placement:%s",
@@ -167,4 +170,3 @@ pixpipeparams_build (PixPipeParams *params)
 
   return str;
 }
-

libgimpbase/gimpparasiteio.h

@@ -1,7 +1,7 @@
 /* LIBGIMP - The GIMP Library 
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
- * parasiteio.h
+ * gimpparasiteio.h
  * Copyright (C) 1999 Tor Lillqvist <tml@iki.fi>
  *
  * This library is free software; you can redistribute it and/or
@@ -19,53 +19,53 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-
-#ifndef __PARASITEIO_H__
-#define __PARASITEIO_H__
+#ifndef __GIMP_PARASITE_IO_H__
+#define __GIMP_PARASITE_IO_H__
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-/* Data structures for various standard parasites used by plug-ins and
- * the GIMP core, and functions to build and parse their string
- * representations.
+/*  Data structures for various standard parasites used by plug-ins and
+ *  the GIMP core, and functions to build and parse their string
+ *  representations.
  */
 
 /*
- * Pixmap brush pipes.
+ *  Pixmap brush pipes.
  */
 
-#define PIXPIPE_MAXDIM 4
+#define GIMP_PIXPIPE_MAXDIM 4
 
-typedef struct {
-  gint step;
-  gint ncells;
-  gint dim;
-  gint cols;
-  gint rows;
-  gint cellwidth;
-  gint cellheight;
-  gchar *placement;
-  gboolean free_placement_string;
-  gint rank[PIXPIPE_MAXDIM];
-  gchar *selection[PIXPIPE_MAXDIM];
-  gboolean free_selection_string;
-} PixPipeParams;
+typedef struct
+{
+  gint      step;
+  gint      ncells;
+  gint      dim;
+  gint      cols;
+  gint      rows;
+  gint      cellwidth;
+  gint      cellheight;
+  gchar    *placement;
+  gboolean  free_placement_string;
+  gint      rank[GIMP_PIXPIPE_MAXDIM];
+  gchar    *selection[GIMP_PIXPIPE_MAXDIM];
+  gboolean  free_selection_string;
+} GimpPixPipeParams;
 
 /* Initalize with dummy values */
-void   pixpipeparams_init (PixPipeParams *params);
+void    gimp_pixpipe_params_init  (GimpPixPipeParams *params);
 
-/* Parse a string into a PixPipeParams */
-void   pixpipeparams_parse (gchar *parameters,
-			    PixPipeParams *params);
+/* Parse a string into a GimpPixPipeParams */
+void    gimp_pixpipe_params_parse (gchar             *parameters,
+				   GimpPixPipeParams *params);
 
-/* Build a string representation of PixPipeParams */
-gchar *pixpipeparams_build (PixPipeParams *params);
+/* Build a string representation of GimpPixPipeParams */
+gchar * gimp_pixpipe_params_build (GimpPixPipeParams *params);
 
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __PARASITEIO_H__ */
+#endif /* __GIMP_PARASITE_IO_H__ */

libgimpbase/gimpprotocol.c

@@ -1355,7 +1355,7 @@ _gp_params_write (GIOChannel *channel,
 
         case PARAM_PARASITE:
 	  {
-	    Parasite *p = (Parasite *)&params[i].data.d_parasite;
+	    GimpParasite *p = (GimpParasite *) &params[i].data.d_parasite;
 	    if (p->name == NULL)
 	      {
 		/* write a null string to signifly a null parasite */

modules/cdisplay_gamma.c

@@ -45,36 +45,36 @@ struct _GammaContext
   GFunc    cancel_func;
   gpointer cancel_data;
 
-  double  gamma;
-  guchar *lookup;
+  gdouble  gamma;
+  guchar  *lookup;
 
   GtkWidget *shell;
   GtkWidget *spinner;
 };
 
-static gpointer   gamma_new                       (int           type);
-static gpointer   gamma_clone                     (gpointer      cd_ID);
-static void       gamma_create_lookup_table       (GammaContext *context);
-static void       gamma_destroy                   (gpointer      cd_ID);
-static void       gamma_convert                   (gpointer      cd_ID,
-						   guchar       *buf,
-						   int           w,
-						   int           h,
-						   int           bpp,
-						   int           bpl);
-static void       gamma_load                      (gpointer      cd_ID,
-						   Parasite     *state);
-static Parasite * gamma_save                      (gpointer      cd_ID);
-static void       gamma_configure_ok_callback     (GtkWidget    *widget,
-						   gpointer      data);
-static void       gamma_configure_cancel_callback (GtkWidget    *widget,
-						   gpointer      data);
-static void       gamma_configure                 (gpointer      cd_ID,
-    						   GFunc         ok_func,
-						   gpointer      ok_data,
-						   GFunc         cancel_func,
-						   gpointer      cancel_data);
-static void       gamma_configure_cancel          (gpointer      cd_ID);
+static gpointer       gamma_new                       (int           type);
+static gpointer       gamma_clone                     (gpointer      cd_ID);
+static void           gamma_create_lookup_table       (GammaContext *context);
+static void           gamma_destroy                   (gpointer      cd_ID);
+static void           gamma_convert                   (gpointer      cd_ID,
+						       guchar       *buf,
+						       int           w,
+						       int           h,
+						       int           bpp,
+						       int           bpl);
+static void           gamma_load                      (gpointer      cd_ID,
+						       GimpParasite *state);
+static GimpParasite * gamma_save                      (gpointer      cd_ID);
+static void           gamma_configure_ok_callback     (GtkWidget    *widget,
+						       gpointer      data);
+static void           gamma_configure_cancel_callback (GtkWidget    *widget,
+						       gpointer      data);
+static void           gamma_configure                 (gpointer      cd_ID,
+						       GFunc         ok_func,
+						       gpointer      ok_data,
+						       GFunc         cancel_func,
+						       gpointer      cancel_data);
+static void           gamma_configure_cancel          (gpointer      cd_ID);
 
 static GimpColorDisplayMethods methods = 
 {
@@ -117,9 +117,9 @@ module_init (GimpModuleInfo **inforet)
 }
 
 G_MODULE_EXPORT void
-module_unload (void *shutdown_data,
-	       void (*completed_cb)(void *),
-	       void *completed_data)
+module_unload (void  *shutdown_data,
+	       void (*completed_cb) (void *),
+	       void  *completed_data)
 {
 #ifndef __EMX__
   gimp_color_display_unregister (COLOR_DISPLAY_NAME);
@@ -154,7 +154,7 @@ gamma_clone (gpointer cd_ID)
   context = gamma_new (0);
   context->gamma = src_context->gamma;
   
-  memcpy (context->lookup, src_context->lookup, sizeof(guchar) * 256);
+  memcpy (context->lookup, src_context->lookup, sizeof (guchar) * 256);
 
   return context;
 }
@@ -174,7 +174,7 @@ gamma_create_lookup_table (GammaContext *context)
   for (i = 0; i < 256; i++)
     {
       ind = (double) i / 255.0;
-      context->lookup[i] = (guchar) (int) (255 * pow (ind, one_over_gamma));
+      context->lookup[i] = (guchar) (gint) (255 * pow (ind, one_over_gamma));
     }
 }
 
@@ -231,26 +231,26 @@ gamma_convert (gpointer  cd_ID,
 }
 
 static void
-gamma_load (gpointer  cd_ID,
-            Parasite *state)
+gamma_load (gpointer      cd_ID,
+            GimpParasite *state)
 {
   GammaContext *context = cd_ID;
 
 #if G_BYTE_ORDER == G_BIG_ENDIAN
-  memcpy (&context->gamma, parasite_data (state), sizeof (double));
+  memcpy (&context->gamma, gimp_parasite_data (state), sizeof (gdouble));
 #else
-  guint32 buf[2], *data = parasite_data (state);
+  guint32 buf[2], *data = gimp_parasite_data (state);
 
   buf[0] = g_ntohl (data[1]);
   buf[1] = g_ntohl (data[0]);
 
-  memcpy (&context->gamma, buf, sizeof (double));
+  memcpy (&context->gamma, buf, sizeof (gdouble));
 #endif
 
   gamma_create_lookup_table (context);
 }
 
-static Parasite *
+static GimpParasite *
 gamma_save (gpointer cd_ID)
 {
   GammaContext *context = cd_ID;
@@ -266,8 +266,8 @@ gamma_save (gpointer cd_ID)
   }
 #endif
 
-  return parasite_new ("Display/Gamma", PARASITE_PERSISTENT,
-		       sizeof (double), &buf);
+  return gimp_parasite_new ("Display/Gamma", GIMP_PARASITE_PERSISTENT,
+			    sizeof (double), &buf);
 }
 
 static void
@@ -276,7 +276,8 @@ gamma_configure_ok_callback (GtkWidget *widget,
 {
   GammaContext *context = data;
 
-  context->gamma = gtk_spin_button_get_value_as_float (GTK_SPIN_BUTTON (context->spinner));
+  context->gamma =
+    gtk_spin_button_get_value_as_float (GTK_SPIN_BUTTON (context->spinner));
   gamma_create_lookup_table (context);
 
   dialog_unregister (context->shell);

modules/cdisplay_highcontrast.c

@@ -45,36 +45,36 @@ struct _ContrastContext
   GFunc    cancel_func;
   gpointer cancel_data;
 
-  double  contrast;
-  guchar *lookup;
+  gdouble  contrast;
+  guchar  *lookup;
 
   GtkWidget *shell;
   GtkWidget *spinner;
 };
 
-static gpointer   contrast_new                       (int           type);
-static gpointer   contrast_clone                     (gpointer      cd_ID);
-static void       contrast_create_lookup_table       (ContrastContext *context);
-static void       contrast_destroy                   (gpointer      cd_ID);
-static void       contrast_convert                   (gpointer      cd_ID,
-						      guchar       *buf,
-						      int           w,
-						      int           h,
-						      int           bpp,
-						      int           bpl);
-static void       contrast_load                      (gpointer      cd_ID,
-						      Parasite     *state);
-static Parasite * contrast_save                      (gpointer      cd_ID);
-static void       contrast_configure_ok_callback     (GtkWidget    *widget,
-						      gpointer      data);
-static void       contrast_configure_cancel_callback (GtkWidget    *widget,
-						      gpointer      data);
-static void       contrast_configure                 (gpointer      cd_ID,
-						      GFunc         ok_func,
-						      gpointer      ok_data,
-						      GFunc         cancel_func,
-						      gpointer      cancel_data);
-static void       contrast_configure_cancel          (gpointer      cd_ID);
+static gpointer       contrast_new                   (gint             type);
+static gpointer       contrast_clone                 (gpointer         cd_ID);
+static void           contrast_create_lookup_table   (ContrastContext *context);
+static void           contrast_destroy               (gpointer         cd_ID);
+static void           contrast_convert               (gpointer         cd_ID,
+						      guchar          *buf,
+						      gint             w,
+						      gint             h,
+						      gint             bpp,
+						      gint             bpl);
+static void           contrast_load                  (gpointer         cd_ID,
+						      GimpParasite    *state);
+static GimpParasite * contrast_save                  (gpointer         cd_ID);
+static void           contrast_configure_ok_callback (GtkWidget       *widget,
+						      gpointer         data);
+static void       contrast_configure_cancel_callback (GtkWidget       *widget,
+						      gpointer         data);
+static void           contrast_configure             (gpointer         cd_ID,
+						      GFunc            ok_func,
+						      gpointer         ok_data,
+						      GFunc            cancel_func,
+						      gpointer         cancel_data);
+static void           contrast_configure_cancel      (gpointer         cd_ID);
 
 static GimpColorDisplayMethods methods = 
 {
@@ -117,9 +117,9 @@ module_init (GimpModuleInfo **inforet)
 }
 
 G_MODULE_EXPORT void
-module_unload (void *shutdown_data,
-	       void (*completed_cb)(void *),
-	       void *completed_data)
+module_unload (void  *shutdown_data,
+	       void (*completed_cb) (void *),
+	       void  *completed_data)
 {
 #ifndef __EMX__
   gimp_color_display_unregister (COLOR_DISPLAY_NAME);
@@ -152,7 +152,7 @@ contrast_clone (gpointer cd_ID)
   context = contrast_new (0);
   context->contrast = src_context->contrast;
   
-  memcpy (context->lookup, src_context->lookup, sizeof(guchar) * 256);
+  memcpy (context->lookup, src_context->lookup, sizeof (guchar) * 256);
 
   return context;
 }
@@ -225,32 +225,32 @@ contrast_convert (gpointer  cd_ID,
 }
 
 static void
-contrast_load (gpointer  cd_ID,
-	       Parasite *state)
+contrast_load (gpointer      cd_ID,
+	       GimpParasite *state)
 {
   ContrastContext *context = cd_ID;
 
 #if G_BYTE_ORDER == G_BIG_ENDIAN
-  memcpy (&context->contrast, parasite_data (state), sizeof (double));
+  memcpy (&context->contrast, gimp_parasite_data (state), sizeof (gdouble));
 #else
-  guint32 buf[2], *data = parasite_data (state);
+  guint32 buf[2], *data = gimp_parasite_data (state);
 
   buf[0] = g_ntohl (data[1]);
   buf[1] = g_ntohl (data[0]);
 
-  memcpy (&context->contrast, buf, sizeof (double));
+  memcpy (&context->contrast, buf, sizeof (gdouble));
 #endif
 
   contrast_create_lookup_table (context);
 }
 
-static Parasite *
+static GimpParasite *
 contrast_save (gpointer cd_ID)
 {
   ContrastContext *context = cd_ID;
   guint32 buf[2];
 
-  memcpy (buf, &context->contrast, sizeof (double));
+  memcpy (buf, &context->contrast, sizeof (gdouble));
 
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
   {
@@ -260,8 +260,8 @@ contrast_save (gpointer cd_ID)
   }
 #endif
 
-  return parasite_new ("Display/Contrast", PARASITE_PERSISTENT,
-		       sizeof (double), &buf);
+  return gimp_parasite_new ("Display/Contrast", GIMP_PARASITE_PERSISTENT,
+			    sizeof (gdouble), &buf);
 }
 
 static void

plug-ins/common/csource.c

@@ -143,7 +143,7 @@ run (gchar   *name,
     {
       gint32 image_ID    = param[1].data.d_int32;
       gint32 drawable_ID = param[2].data.d_int32;
-      Parasite *parasite;
+      GimpParasite *parasite;
       gchar *x;
       GDrawableType drawable_type = gimp_drawable_type (drawable_ID);
 
@@ -162,7 +162,7 @@ run (gchar   *name,
       if (parasite)
 	{
 	  config.comment = g_strdup (parasite->data);
-	  parasite_free (parasite);
+	  gimp_parasite_free (parasite);
 	}
       x = config.comment;
 
@@ -188,12 +188,12 @@ run (gchar   *name,
 		gimp_image_parasite_detach (image_ID, "gimp-comment");
 	      else
 		{
-		  parasite = parasite_new ("gimp-comment",
-					   PARASITE_PERSISTENT,
-					   strlen (config.comment) + 1,
-					   config.comment);
+		  parasite = gimp_parasite_new ("gimp-comment",
+						GIMP_PARASITE_PERSISTENT,
+						strlen (config.comment) + 1,
+						config.comment);
 		  gimp_image_parasite_attach (image_ID, parasite);
-		  parasite_free (parasite);
+		  gimp_parasite_free (parasite);
 		}
 	    }
 

plug-ins/common/gif.c

@@ -338,7 +338,7 @@ static gboolean comment_was_edited = FALSE;
 static gboolean can_crop = FALSE;
 static GRunModeType run_mode;
 #ifdef FACEHUGGERS
-Parasite*      comment_parasite = NULL;
+GimpParasite * comment_parasite = NULL;
 #endif
 
 /* For compression code */
@@ -867,11 +867,12 @@ save_image (gchar  *filename,
   /* Save the comment back to the ImageID, if appropriate */
   if (globalcomment != NULL && comment_was_edited)
     {
-      comment_parasite = parasite_new ("gimp-comment", PARASITE_PERSISTENT,
-				       strlen (globalcomment)+1,
-				       (void*) globalcomment);
+      comment_parasite = gimp_parasite_new ("gimp-comment",
+					    GIMP_PARASITE_PERSISTENT,
+					    strlen (globalcomment)+1,
+					    (void*) globalcomment);
       gimp_image_parasite_attach (orig_image_ID, comment_parasite);
-      parasite_free (comment_parasite);
+      gimp_parasite_free (comment_parasite);
       comment_parasite = NULL;
     }
 #endif
@@ -1196,7 +1197,7 @@ save_dialog (gint32 image_ID)
   GtkWidget *com_table;
   GtkWidget *vscrollbar;
 #ifdef FACEHUGGERS
-  Parasite* GIF2_CMNT;
+  GimpParasite* GIF2_CMNT;
 #endif
 
   gint32 nlayers;
@@ -1281,7 +1282,7 @@ save_dialog (gint32 image_ID)
       globalcomment = NULL;
 #ifdef FACEHUGGERS
     }
-  parasite_free (GIF2_CMNT);
+  gimp_parasite_free (GIF2_CMNT);
 #endif
 
   if (globalcomment)

plug-ins/common/gpb.c

@@ -64,7 +64,7 @@ static struct
 static gint run_flag = 0;
 static gint num_layers_with_alpha;
 
-static PixPipeParams gihparms;
+static GimpPixPipeParams gihparms;
 
 typedef struct
 {
@@ -249,7 +249,7 @@ ok_callback (GtkWidget *widget,
 {
   int i;
 
-  for (i = 0; i < PIXPIPE_MAXDIM; i++)
+  for (i = 0; i < GIMP_PIXPIPE_MAXDIM; i++)
     gihparms.selection[i] = g_strdup (gihparms.selection[i]);
 
   run_flag = 1;
@@ -509,9 +509,9 @@ gih_save_dialog (gint32 image_ID)
   /*
    * Ranks: __ __ __ __ __
    */
-  dimtable = gtk_table_new (1, PIXPIPE_MAXDIM, FALSE);
+  dimtable = gtk_table_new (1, GIMP_PIXPIPE_MAXDIM, FALSE);
   gtk_table_set_col_spacings (GTK_TABLE (dimtable), 4);
-  for (i = 0; i < PIXPIPE_MAXDIM; i++)
+  for (i = 0; i < GIMP_PIXPIPE_MAXDIM; i++)
     {
       box = gtk_hbox_new (FALSE, 0);
       gtk_table_attach (GTK_TABLE (dimtable), box, i, i + 1, 0, 1,
@@ -550,7 +550,7 @@ gih_save_dialog (gint32 image_ID)
   cbitems = g_list_append (cbitems, "ytilt");
 
   box = gtk_hbox_new (TRUE, 4);
-  for (i = 0; i < PIXPIPE_MAXDIM; i++)
+  for (i = 0; i < GIMP_PIXPIPE_MAXDIM; i++)
     {
       cb = gtk_combo_new ();
       gtk_combo_set_popdown_strings (GTK_COMBO (cb), cbitems);
@@ -794,7 +794,7 @@ gih_save_image (char   *filename,
   GDrawable *drawable;
   GPixelRgn pixel_rgn;
   FILE *file;
-  Parasite *pipe_parasite;
+  GimpParasite *pipe_parasite;
   gchar *msg, *parstring, *ncells;
   gint32 *layer_ID;
   gint nlayers, layer, row, col;
@@ -817,7 +817,7 @@ gih_save_image (char   *filename,
       return FALSE;
     }
 
-  parstring = pixpipeparams_build (&gihparms);
+  parstring = gimp_pixpipe_params_build (&gihparms);
   IFDBG(2) g_message ("parameter string: %s", parstring);
   ncells = g_strdup_printf ("%d ", gihparms.ncells);
   if (!(try_fwrite (info.description, strlen (info.description), 1, file)
@@ -831,11 +831,11 @@ gih_save_image (char   *filename,
       return FALSE;
     }
 
-  pipe_parasite = parasite_new ("gimp-brush-pipe-parameters",
-				PARASITE_PERSISTENT,
-				strlen (parstring) + 1, parstring);
+  pipe_parasite = gimp_parasite_new ("gimp-brush-pipe-parameters",
+				     GIMP_PARASITE_PERSISTENT,
+				     strlen (parstring) + 1, parstring);
   gimp_image_parasite_attach (orig_image_ID, pipe_parasite);
-  parasite_free (pipe_parasite);
+  gimp_parasite_free (pipe_parasite);
 
   g_free (parstring);
   g_free (ncells);
@@ -898,7 +898,7 @@ run (char    *name,
   static GParam values[1];
   GRunModeType  run_mode;
   GStatusType   status = STATUS_SUCCESS;
-  Parasite     *pipe_parasite;
+  GimpParasite *pipe_parasite;
   gint32        image_ID;
   gint32        orig_image_ID;
   gint32        drawable_ID;
@@ -1037,9 +1037,9 @@ run (char    *name,
 	  pipe_parasite =
 	    gimp_image_parasite_find (orig_image_ID,
 				      "gimp-brush-pipe-parameters");
-	  pixpipeparams_init (&gihparms);
+	  gimp_pixpipe_params_init (&gihparms);
 	  if (pipe_parasite)
-	    pixpipeparams_parse (pipe_parasite->data, &gihparms);
+	    gimp_pixpipe_params_parse (pipe_parasite->data, &gihparms);
 
 	  if (!gih_save_dialog (image_ID))
 	    status = STATUS_CANCEL;
@@ -1063,9 +1063,9 @@ run (char    *name,
 	  pipe_parasite =
 	    gimp_image_parasite_find (orig_image_ID,
 				      "gimp-brush-pipe-parameters");
-	  pixpipeparams_init (&gihparms);
+	  gimp_pixpipe_params_init (&gihparms);
 	  if (pipe_parasite)
-	    pixpipeparams_parse (pipe_parasite->data, &gihparms);
+	    gimp_pixpipe_params_parse (pipe_parasite->data, &gihparms);
 	  break;
 	}
 

plug-ins/common/jpeg.c

@@ -365,7 +365,7 @@ run (gchar   *name,
   gint32        orig_image_ID;
   gint32        display_ID = -1;
 #ifdef GIMP_HAVE_PARASITES
-  Parasite     *parasite;
+  GimpParasite *parasite;
 #endif /* GIMP_HAVE_PARASITES */
   gint          err;
   GimpExportReturnType export = EXPORT_CANCEL;
@@ -439,7 +439,7 @@ run (gchar   *name,
       if (parasite) 
 	{
 	  image_comment = g_strdup (parasite->data);
-	  parasite_free (parasite);
+	  gimp_parasite_free (parasite);
 	}
 #endif /* GIMP_HAVE_PARASITES */
       if (!image_comment) 
@@ -476,7 +476,7 @@ run (gchar   *name,
 	      jsvals.restart     = ((JpegSaveVals *)parasite->data)->restart;
 	      jsvals.dct         = ((JpegSaveVals *)parasite->data)->dct;
 	      jsvals.preview     = ((JpegSaveVals *)parasite->data)->preview;
-	      parasite_free(parasite);
+	      gimp_parasite_free (parasite);
 	    }
 #endif /* GIMP_HAVE_PARASITES */
 
@@ -557,7 +557,7 @@ run (gchar   *name,
 	      jsvals.restart     = ((JpegSaveVals *)parasite->data)->restart;
 	      jsvals.dct         = ((JpegSaveVals *)parasite->data)->dct;
 	      jsvals.preview     = FALSE;
-	      parasite_free(parasite);
+	      gimp_parasite_free (parasite);
 	    }
 #endif /* GIMP_HAVE_PARASITES */
 	  break;
@@ -602,18 +602,19 @@ run (gchar   *name,
       gimp_image_parasite_detach (orig_image_ID, "gimp-comment");
       if (strlen (image_comment)) 
 	{
-	  parasite = parasite_new ("gimp-comment",
-				   PARASITE_PERSISTENT,
-				   strlen (image_comment) + 1,
-				   image_comment);
+	  parasite = gimp_parasite_new ("gimp-comment",
+					GIMP_PARASITE_PERSISTENT,
+					strlen (image_comment) + 1,
+					image_comment);
 	  gimp_image_parasite_attach (orig_image_ID, parasite);
-	  parasite_free (parasite);
+	  gimp_parasite_free (parasite);
 	}
       gimp_image_parasite_detach (orig_image_ID, "jpeg-save-options");
       
-      parasite = parasite_new ("jpeg-save-options", 0, sizeof (jsvals), &jsvals);
+      parasite = gimp_parasite_new ("jpeg-save-options",
+				    0, sizeof (jsvals), &jsvals);
       gimp_image_parasite_attach (orig_image_ID, parasite);
-      parasite_free (parasite);
+      gimp_parasite_free (parasite);
 #endif /* Have Parasites */  
     }
   else
@@ -725,8 +726,8 @@ load_image (gchar        *filename,
 
 #ifdef GIMP_HAVE_PARASITES
   JpegSaveVals local_save_vals;
-  Parasite * volatile comment_parasite = NULL;
-  Parasite * volatile vals_parasite = NULL;
+  GimpParasite * volatile comment_parasite = NULL;
+  GimpParasite * volatile vals_parasite = NULL;
 #endif /* GIMP_HAVE_PARASITES */
 
   
@@ -791,8 +792,9 @@ load_image (gchar        *filename,
 	char *string = local_image_comments->str;
 	g_string_free (local_image_comments,FALSE);
 	local_image_comments = NULL;
-	comment_parasite = parasite_new ("gimp-comment", PARASITE_PERSISTENT,
-					 strlen (string) + 1, string);
+	comment_parasite = gimp_parasite_new ("gimp-comment",
+					      GIMP_PARASITE_PERSISTENT,
+					      strlen (string) + 1, string);
       } 
     else 
       {
@@ -819,8 +821,9 @@ load_image (gchar        *filename,
     local_save_vals.dct         = DEFAULT_DCT;
     local_save_vals.preview     = DEFAULT_PREVIEW;
   
-    vals_parasite = parasite_new ("jpeg-save-options", 0,
-				  sizeof (local_save_vals), &local_save_vals);
+    vals_parasite = gimp_parasite_new ("jpeg-save-options", 0,
+				       sizeof (local_save_vals),
+				       &local_save_vals);
   } 
 #endif /* GIMP_HAVE_PARASITES */
   
@@ -1047,12 +1050,12 @@ load_image (gchar        *filename,
       if (comment_parasite)
 	{
 	  gimp_image_parasite_attach (image_ID, comment_parasite);
-	  parasite_free (comment_parasite);
+	  gimp_parasite_free (comment_parasite);
 	}
       if (vals_parasite)
 	{
 	  gimp_image_parasite_attach (image_ID, vals_parasite);
-	  parasite_free (vals_parasite);
+	  gimp_parasite_free (vals_parasite);
 	}   
     }
 #endif /* GIMP_HAVE_PARASITES */

plug-ins/common/psp.c

@@ -658,7 +658,7 @@ read_creator_block (FILE     *f,
   guint32 dword;
   guint32 cdate = 0, mdate = 0, appid, appver;
   GString *comment;
-  Parasite *comment_parasite;
+  GimpParasite *comment_parasite;
 
   data_start = ftell (f);
   comment = g_string_new (NULL);
@@ -771,10 +771,12 @@ read_creator_block (FILE     *f,
     }
   if (comment->len > 0)
     {
-      comment_parasite = parasite_new("gimp-comment", PARASITE_PERSISTENT,
-				      strlen (comment->str) + 1, comment->str);
+      comment_parasite = gimp_parasite_new ("gimp-comment",
+					    GIMP_PARASITE_PERSISTENT,
+					    strlen (comment->str) + 1,
+					    comment->str);
       gimp_image_parasite_attach(image_ID, comment_parasite);
-      parasite_free (comment_parasite);
+      gimp_parasite_free (comment_parasite);
     }
 
   g_string_free (comment, FALSE);
@@ -1405,11 +1407,11 @@ read_tube_block (FILE     *f,
   guint32 step_size, column_count, row_count, cell_count;
   guint32 placement_mode, selection_mode;
   gint i;
-  PixPipeParams params;
-  Parasite *pipe_parasite;
+  GimpPixPipeParams params;
+  GimpParasite *pipe_parasite;
   gchar *parasite_text;
 
-  pixpipeparams_init (&params);
+  gimp_pixpipe_params_init (&params);
 
   if (fread (&version, 2, 1, f) < 1
       || fread (name, 513, 1, f) < 1
@@ -1456,15 +1458,15 @@ read_tube_block (FILE     *f,
 			   (selection_mode == tsmPressure ? "pressure" :
 			    (selection_mode == tsmVelocity ? "velocity" :
 			     "default")))));
-  parasite_text = pixpipeparams_build (&params);
+  parasite_text = gimp_pixpipe_params_build (&params);
 
   IFDBG(2) g_message ("parasite: %s", parasite_text);
 
-  pipe_parasite = parasite_new ("gimp-brush-pipe-parameters",
-				PARASITE_PERSISTENT,
-				strlen (parasite_text) + 1, parasite_text);
+  pipe_parasite = gimp_parasite_new ("gimp-brush-pipe-parameters",
+				     GIMP_PARASITE_PERSISTENT,
+				     strlen (parasite_text) + 1, parasite_text);
   gimp_image_parasite_attach (image_ID, pipe_parasite);
-  parasite_free (pipe_parasite);
+  gimp_parasite_free (pipe_parasite);
   g_free (parasite_text);
 
   return 0;

plug-ins/common/tiff.c

@@ -239,7 +239,7 @@ run (gchar   *name,
   GRunModeType  run_mode;
   GStatusType   status = STATUS_SUCCESS;
 #ifdef GIMP_HAVE_PARASITES
-  Parasite     *parasite;
+  GimpParasite *parasite;
 #endif /* GIMP_HAVE_PARASITES */
   gint32        image;
   gint32        drawable;
@@ -303,7 +303,7 @@ run (gchar   *name,
       parasite = gimp_image_parasite_find (orig_image, "gimp-comment");
       if (parasite)
         image_comment = g_strdup (parasite->data);
-      parasite_free (parasite);
+      gimp_parasite_free (parasite);
 #endif /* GIMP_HAVE_PARASITES */
 
       if (!image_comment)
@@ -322,7 +322,7 @@ run (gchar   *name,
 	      tsvals.compression =
 		((TiffSaveVals *) parasite->data)->compression;
 	    }
-	  parasite_free (parasite);
+	  gimp_parasite_free (parasite);
 #endif /* GIMP_HAVE_PARASITES */
 
 	  /*  First acquire information with a dialog  */
@@ -362,7 +362,7 @@ run (gchar   *name,
 	      tsvals.compression =
 		((TiffSaveVals *) parasite->data)->compression;
 	    }
-	  parasite_free (parasite);
+	  gimp_parasite_free (parasite);
 #endif /* GIMP_HAVE_PARASITES */
 	  break;
 
@@ -427,7 +427,7 @@ load_image (gchar *filename)
 
   TiffSaveVals save_vals;
 #ifdef GIMP_HAVE_PARASITES
-  Parasite *parasite;
+  GimpParasite *parasite;
 #endif /* GIMP_HAVE_PARASITES */
   guint16 tmp;
 
@@ -528,10 +528,10 @@ load_image (gchar *filename)
   else
     save_vals.compression = tmp;
 #ifdef GIMP_HAVE_PARASITES
-  parasite = parasite_new("tiff-save-options", 0,
-			  sizeof(save_vals), &save_vals);
-  gimp_image_parasite_attach(image, parasite);
-  parasite_free(parasite);
+  parasite = gimp_parasite_new ("tiff-save-options", 0,
+				sizeof (save_vals), &save_vals);
+  gimp_image_parasite_attach (image, parasite);
+  gimp_parasite_free (parasite);
 #endif /* GIMP_HAVE_PARASITES */
 
 
@@ -550,10 +550,11 @@ load_image (gchar *filename)
       len = MIN(len, 241);
       img_desc[len-1] = '\000';
 
-      parasite = parasite_new ("gimp-comment", PARASITE_PERSISTENT,
-			       len, img_desc);
+      parasite = gimp_parasite_new ("gimp-comment",
+				    GIMP_PARASITE_PERSISTENT,
+				    len, img_desc);
       gimp_image_parasite_attach (image, parasite);
-      parasite_free (parasite);
+      gimp_parasite_free (parasite);
     }
   }
 #endif /* GIMP_HAVE_PARASITES */
@@ -1384,13 +1385,14 @@ save_image (gchar   *filename,
 #ifdef GIMP_HAVE_PARASITES
   if (image_comment && *image_comment != '\000')
     {
-      Parasite *parasite;
+      GimpParasite *parasite;
       
       TIFFSetField (tif, TIFFTAG_IMAGEDESCRIPTION, image_comment);
-      parasite = parasite_new ("gimp-comment", 1,
-			       strlen (image_comment) + 1, image_comment);
+      parasite = gimp_parasite_new ("gimp-comment",
+				    GIMP_PARASITE_PERSISTENT,
+				    strlen (image_comment) + 1, image_comment);
       gimp_image_parasite_attach (orig_image, parasite);
-      parasite_free (parasite);
+      gimp_parasite_free (parasite);
     }
 #endif /* GIMP_HAVE_PARASITES */
 

plug-ins/common/xbm.c

@@ -230,7 +230,7 @@ run (gchar   *name,
   GStatusType   status = STATUS_SUCCESS;
   gint32        image_ID;
   gint32        drawable_ID;
-  Parasite     *parasite;
+  GimpParasite *parasite;
   GimpExportReturnType export = EXPORT_CANCEL;
 
   INIT_I18N_UI();
@@ -308,13 +308,13 @@ run (gchar   *name,
 	  gpointer data;
 	  gint     size;
 
-	  data = parasite_data (parasite);
-	  size = parasite_data_size (parasite);
+	  data = gimp_parasite_data (parasite);
+	  size = gimp_parasite_data_size (parasite);
 
 	  strncpy (xsvals.comment, data, MIN (size, MAX_COMMENT));
 	  xsvals.comment[MIN (size, MAX_COMMENT) + 1] = 0;
 
-	  parasite_free (parasite);
+	  gimp_parasite_free (parasite);
 	}
 
       parasite = gimp_image_parasite_find (image_ID, "hot-spot");
@@ -324,7 +324,7 @@ run (gchar   *name,
 	  gpointer data;
 	  gint     x, y;
 
-	  data = parasite_data (parasite);
+	  data = gimp_parasite_data (parasite);
 
 	  if (sscanf (data, "%i %i", &x, &y) == 2)
 	    {
@@ -333,7 +333,7 @@ run (gchar   *name,
 	      xsvals.y_hot = y;
 	    }
 
-	  parasite_free (parasite);
+	  gimp_parasite_free (parasite);
 	}
 
       switch (run_mode)
@@ -777,12 +777,13 @@ load_image (gchar *filename)
 
   if (comment)
     {
-      Parasite *parasite;
+      GimpParasite *parasite;
 
-      parasite = parasite_new ("gimp-comment", PARASITE_PERSISTENT,
-			       strlen (comment) + 1, (gpointer) comment);
+      parasite = gimp_parasite_new ("gimp-comment",
+				    GIMP_PARASITE_PERSISTENT,
+				    strlen (comment) + 1, (gpointer) comment);
       gimp_image_parasite_attach (image_ID, parasite);
-      parasite_free (parasite);
+      gimp_parasite_free (parasite);
 
       g_free (comment);
     }
@@ -792,15 +793,16 @@ load_image (gchar *filename)
 
   if (x_hot > 0 || y_hot > 0)
     {
-      Parasite *parasite;
-      gchar    *str;
+      GimpParasite *parasite;
+      gchar        *str;
 
       str = g_strdup_printf ("%d %d", x_hot, y_hot);
-      parasite = parasite_new ("hot-spot", PARASITE_PERSISTENT,
-			       strlen (str) + 1, (gpointer) str);
+      parasite = gimp_parasite_new ("hot-spot",
+				    GIMP_PARASITE_PERSISTENT,
+				    strlen (str) + 1, (gpointer) str);
       g_free (str);
       gimp_image_parasite_attach (image_ID, parasite);
-      parasite_free (parasite);
+      gimp_parasite_free (parasite);
     }
 
   /* Set a black-and-white colormap. */

plug-ins/gap/gap_exchange_image.c

@@ -104,7 +104,7 @@ p_steal_content(gint32 dst_image_id, gint32 src_image_id)
    gint32   l_path_type;
    gint32   l_path_closed;
    gint32   l_num_points;
-   Parasite  *l_parasite;
+   GimpParasite  *l_parasite;
    gchar    **l_parasite_names = NULL;
    gint32     l_num_parasites = 0;