Commit 863f7e1c authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

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.
parent 93c3085a
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
......
......@@ -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,8 +3219,8 @@ 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;
......@@ -3230,8 +3230,9 @@ plug_in_args_to_params (Argument *args,
}
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
......@@ -3245,8 +3246,8 @@ plug_in_args_to_params (Argument *args,
}
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:
......@@ -3406,7 +3407,7 @@ plug_in_args_destroy (Argument *args,
case PDB_PARASITE:
if (full_destroy)
{
parasite_free ((Parasite *)(args[i].value.pdb_pointer));
gimp_parasite_free ((GimpParasite *) (args[i].value.pdb_pointer));
args[i].value.pdb_pointer = NULL;
}
break;
......
......@@ -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,
save_func (gchar *key,
GimpParasite *p,
FILE *fp)
{
if (parasite_is_persistent (p))
if (gimp_parasite_is_persistent (p))
{
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,7 +125,7 @@ save_func (char *key,
void
gimp_parasiterc_save (void)
{
char *filename;
gchar *filename;
FILE *fp;
filename = gimp_personal_rc_file ("#parasiterc.tmp~");
......@@ -149,7 +151,7 @@ gimp_parasiterc_save (void)
gimp_personal_rc_file ("parasiterc.bak"));
#endif
if (rename(gimp_personal_rc_file ("#parasiterc.tmp~"),
if (rename (gimp_personal_rc_file ("#parasiterc.tmp~"),
gimp_personal_rc_file ("parasiterc")) != 0)
{
#if defined(G_OS_WIN32) || defined(__EMX__)
......@@ -157,14 +159,14 @@ gimp_parasiterc_save (void)
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);
......
......@@ -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_attach (GimpParasite *parasite);
void gimp_parasite_detach (const gchar *name);
Parasite * gimp_parasite_find (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 /* __GIMP_PARASITE_H__ */
#endif /* __APP_GIMP_PARASITE_H__ */
......@@ -270,7 +270,7 @@ gimp_brush_pipe_load (gchar *filename)
{
GimpBrushPipe *pipe;
GPattern *pattern;
PixPipeParams params;
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);
......
......@@ -270,7 +270,7 @@ gimp_brush_pipe_load (gchar *filename)
{
GimpBrushPipe *pipe;
GPattern *pattern;
PixPipeParams params;
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);
......
......@@ -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,7 +53,7 @@ GtkType
gimp_drawable_get_type (void)
{
static GtkType type;
GIMP_TYPE_INIT(type,
GIMP_TYPE_INIT (type,
GimpDrawable,
GimpDrawableClass,
gimp_drawable_init,
......@@ -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)
{
......@@ -451,7 +456,7 @@ gimp_drawable_parasite_find (const GimpDrawable *drawable,
static void
list_func (gchar *key,
Parasite *p,
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,
else if (gimp_parasite_is_persistent (parasite) &&
!gimp_parasite_compare (parasite,
gimp_drawable_parasite_find
(drawable, parasite_name (parasite))))
(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);
......
......@@ -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);
......
......@@ -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)
{
......@@ -1144,7 +1144,7 @@ gimp_image_parasite_find (const GimpImage *gimage,
static void
list_func (gchar *key,
Parasite *p,
GimpParasite *p,
gchar ***cur)
{
*(*cur)++ = (gchar *) g_strdup (key);
......@@ -1168,23 +1168,23 @@ gimp_image_parasite_list (GimpImage *gimage,
void
gimp_image_parasite_attach (GimpImage *gimage,
Parasite *parasite)
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,
if (gimp_parasite_is_persistent (parasite) &&
!gimp_parasite_compare (parasite,
gimp_image_parasite_find (gimage,
parasite_name (parasite))))
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)
{
......
......@@ -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 *);
......
......@@ -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)
{
......@@ -1144,7 +1144,7 @@ gimp_image_parasite_find (const GimpImage *gimage,
static void
list_func (gchar *key,
Parasite *p,
GimpParasite *p,
gchar ***cur)
{
*(*cur)++ = (gchar *) g_strdup (key);
......@@ -1168,23 +1168,23 @@ gimp_image_parasite_list (GimpImage *gimage,
void
gimp_image_parasite_attach (GimpImage *gimage,
Parasite *parasite)
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,
if (gimp_parasite_is_persistent (parasite) &&
!gimp_parasite_compare (parasite,
gimp_image_parasite_find (gimage,
parasite_name (parasite))))
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)
{
......
......@@ -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 *);
......
......@@ -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)
{
......@@ -1144,7 +1144,7 @@ gimp_image_parasite_find (const GimpImage *gimage,
static void
list_func (gchar *key,
Parasite *p,
GimpParasite *p,
gchar ***cur)
{
*(*cur)++ = (gchar *) g_strdup (key);
......@@ -1168,23 +1168,23 @@ gimp_image_parasite_list (GimpImage *gimage,
void
gimp_image_parasite_attach (GimpImage *gimage,
Parasite *parasite)
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,
if (