Commit 757017a8 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

bumped version number to 1.3.1. Require Glib/GTK+-1.3.11 and Pango-0.22.

2001-11-23  Sven Neumann  <sven@gimp.org>

	* configure.in: bumped version number to 1.3.1.
	Require Glib/GTK+-1.3.11 and Pango-0.22. Removed GDK_DISABLE_COMPAT_H
	and GTK_DISABLE_COMPAT_H from our default CFLAGS since they don't
	exist any longer.

	* RELEASE-TO-CVS.patch: removed since the glib/gtk+ API is supposed to
	be frozen now.

	* HACKING: removed reference to RELEASE-TO-CVS.patch

	* app/gui/menus.c
	* app/tools/gimptexttool.c: applied RELEASE-TO-CVS.patch to conform
	to the new GTK+/Pango API.

	* app/core/Makefile.am: generate marshallers with gimp_marshal prefix.

	* app/core/gimpmarshal.list: added all marshallers we use.

	* app/core/gimpmarshal.[ch]: regenerated.

	* app/[lots of .c files]: use gimp_marshal_* for all marshallers.

	* data/images/
	* app/app_procs.c
	* app/gui/splash.c:

	* libgimpbase/Makefile.am
	* libgimpbase/gimpbase.h
	* libgimpbase/gimputils.[ch]: removed since they are no longer needed.

	* app/gimprc.c
	* plug-ins/common/ps.c
	* plug-ins/gdyntext/gdyntext.c
	* plug-ins/gdyntext/gdyntextcompat.c
	* plug-ins/gfig/gfig.c
	* plug-ins/gflare/gflare.c
	* plug-ins/script-fu/script-fu-scripts.c: use glib functions instead
	of gimp_strescape() and gimpstrcompress().

	* cleaned up all header files: use G_BEGIN_DECLS/G_END_DECLS, declared
	all _get_type function as G_GNUC_CONST.

	* tools/pdbgen/enumcode.pl
	* tools/pdbgen/lib.pl: make them generate header files using
	G_BEGIN_DECLS/G_END_DECLS.

	* pixmaps/Makefile.am
	* pixmaps/wilber3.xpm: removed ...
	* data/images/tips_wilber.png: ... and added here as PNG

	* app/gui/tips-dialog.c: load the Wilber on demand using GdkPixbuf.

	* data/images/gimp_splash.ppm: removed ...
	* data/images/gimp_splash.png: ... and added as PNG

	* app/app_procs.c
	* app/gui/splash.[ch]: load the splash image using GdkPixbuf.

	* app/gui/about-dialog.c: sink the GtkPreview.
parent c3c42962
2001-11-23 Sven Neumann <sven@gimp.org>
* configure.in: bumped version number to 1.3.1.
Require Glib/GTK+-1.3.11 and Pango-0.22. Removed GDK_DISABLE_COMPAT_H
and GTK_DISABLE_COMPAT_H from our default CFLAGS since they don't
exist any longer.
* RELEASE-TO-CVS.patch: removed since the glib/gtk+ API is supposed to
be frozen now.
* HACKING: removed reference to RELEASE-TO-CVS.patch
* app/gui/menus.c
* app/tools/gimptexttool.c: applied RELEASE-TO-CVS.patch to conform
to the new GTK+/Pango API.
* app/core/Makefile.am: generate marshallers with gimp_marshal prefix.
* app/core/gimpmarshal.list: added all marshallers we use.
* app/core/gimpmarshal.[ch]: regenerated.
* app/[lots of .c files]: use gimp_marshal_* for all marshallers.
* data/images/
* app/app_procs.c
* app/gui/splash.c:
* libgimpbase/Makefile.am
* libgimpbase/gimpbase.h
* libgimpbase/gimputils.[ch]: removed since they are no longer needed.
* app/gimprc.c
* plug-ins/common/ps.c
* plug-ins/gdyntext/gdyntext.c
* plug-ins/gdyntext/gdyntextcompat.c
* plug-ins/gfig/gfig.c
* plug-ins/gflare/gflare.c
* plug-ins/script-fu/script-fu-scripts.c: use glib functions instead
of gimp_strescape() and gimpstrcompress().
* cleaned up all header files: use G_BEGIN_DECLS/G_END_DECLS, declared
all _get_type function as G_GNUC_CONST.
* tools/pdbgen/enumcode.pl
* tools/pdbgen/lib.pl: make them generate header files using
G_BEGIN_DECLS/G_END_DECLS.
* pixmaps/Makefile.am
* pixmaps/wilber3.xpm: removed ...
* data/images/tips_wilber.png: ... and added here as PNG
* app/gui/tips-dialog.c: load the Wilber on demand using GdkPixbuf.
* data/images/gimp_splash.ppm: removed ...
* data/images/gimp_splash.png: ... and added as PNG
* app/app_procs.c
* app/gui/splash.[ch]: load the splash image using GdkPixbuf.
* app/gui/about-dialog.c: sink the GtkPreview.
2001-11-22 Michael Natterer <mitch@gimp.org>
* app/devices.c: made device_status_update() static as declared.
......
......@@ -56,15 +56,11 @@ We will try our best to keep the GIMP CVS tree compileable against
the latest development releases of glib, pango, atk and gtk+. Since
it is sometimes difficult to get a working state out of CVS, you may
prefer to use these releases instead. Get them from
ftp://ftp.gtk.org/pub/gtk/v1.3/.
As we said above, GIMP CVS will, as far as possible, be kept
compatible with the most current release. This means that
occasionally it will not build with CVS glib, gtk+, atk and
pango. To allow people to build with the CVS versions of these,
the file RELEASE-TO-CVS.patch is included. To patch GIMP CVS
with this file, run patch -p0 < RELEASE-TO-CVS.patch in the root
gimp directory.
ftp://ftp.gtk.org/pub/gtk/v1.3/. We don't expect the API of these
modules to change anymore. If it does nevertheless, we will adapt
GIMP in CVS. This means, GIMP from CVS is supposed to compile against
glib, pango, atk and gtk+ from CVS. Most probably however, the latest
releases will do also.
Patches
......
Index: app/gui/menus.c
===================================================================
RCS file: /cvs/gnome/gimp/app/gui/menus.c,v
retrieving revision 1.243
diff -u -p -r1.243 menus.c
--- app/gui/menus.c 2001/11/16 15:08:53 1.243
+++ app/gui/menus.c 2001/11/21 17:20:25
@@ -1820,7 +1820,7 @@ menus_init (Gimp *gimp)
}
filename = gimp_personal_rc_file ("menurc");
- gtk_item_factory_parse_rc (filename);
+ gtk_accel_map_load (filename);
g_free (filename);
g_signal_connect (G_OBJECT (gimp->documents), "add",
@@ -1848,7 +1848,7 @@ menus_exit (Gimp *gimp)
gimp);
filename = gimp_personal_rc_file ("menurc");
- gtk_item_factory_dump_rc (filename, NULL, TRUE);
+ gtk_accel_map_save (filename);
g_free (filename);
if (toolbox_factory)
Index: app/tools/gimptexttool.c
===================================================================
RCS file: /cvs/gnome/gimp/app/tools/gimptexttool.c,v
retrieving revision 1.134
diff -u -p -r1.134 gimptexttool.c
--- app/tools/gimptexttool.c 2001/11/21 17:18:43 1.134
+++ app/tools/gimptexttool.c 2001/11/21 17:20:26
@@ -54,6 +54,8 @@
#include "floating_sel.h"
#include "undo.h"
+#include "gimprc.h"
+
#include "libgimp/gimpintl.h"
@@ -197,7 +199,8 @@ gimp_text_tool_init (GimpTextTool *text_
tool = GIMP_TOOL (text_tool);
- text_tool->pango_context = pango_ft2_get_context ();
+ text_tool->pango_context = pango_ft2_get_context (gimprc.monitor_xres,
+ gimprc.monitor_yres);
tool->tool_cursor = GIMP_TEXT_TOOL_CURSOR;
tool->scroll_lock = TRUE; /* Disallow scrolling */
@@ -389,6 +392,8 @@ text_render (GimpImage *gimage,
PangoRectangle logical;
GimpImageType layer_type;
GimpLayer *layer = NULL;
+ gdouble xres;
+ gdouble yres;
g_return_val_if_fail (fontname != NULL, FALSE);
g_return_val_if_fail (text != NULL, FALSE);
@@ -407,7 +412,9 @@ text_render (GimpImage *gimage,
if (!font_desc)
return NULL;
- context = pango_ft2_get_context ();
+ gimp_image_get_resolution (gimage, &xres, &yres);
+ context = pango_ft2_get_context (xres, yres);
+
layout = pango_layout_new (context);
pango_layout_set_font_description (layout, font_desc);
pango_font_description_free (font_desc);
@@ -540,8 +547,10 @@ text_get_extents (const gchar *fontname,
font_desc = pango_font_description_from_string (fontname);
if (!font_desc)
return FALSE;
-
- context = pango_ft2_get_context ();
+
+ /* FIXME: resolution */
+ context = pango_ft2_get_context (72.0, 72.0);
+
layout = pango_layout_new (context);
pango_layout_set_font_description (layout, font_desc);
pango_font_description_free (font_desc);
@@ -592,7 +601,8 @@ text_tool_options_new (GimpToolInfo *too
/* the main vbox */
vbox = options->tool_options.main_vbox;
- pango_context = pango_ft2_get_context ();
+ pango_context = pango_ft2_get_context (gimprc.monitor_xres,
+ gimprc.monitor_yres);
options->font_selection = gimp_font_selection_new (pango_context);
......@@ -128,6 +128,9 @@ app_init (gint gimp_argc,
gimprc_parse (the_gimp);
}
/* initialize lowlevel stuff */
base_init ();
if (! no_interface)
{
gui_themes_init (the_gimp);
......@@ -138,9 +141,6 @@ app_init (gint gimp_argc,
splash_create (! no_splash_image);
}
/* initialize lowlevel stuff */
base_init ();
/* Create all members of the global Gimp instance which need an already
* parsed gimprc, e.g. the data factories
*/
......@@ -149,14 +149,6 @@ app_init (gint gimp_argc,
if (! no_interface)
{
tool_manager_init (the_gimp);
/* Now we are ready to draw the splash-screen-image
* to the start-up window
*/
if (! no_splash && ! no_splash_image)
{
splash_logo_load ();
}
}
/* Load all data files
......
......@@ -76,7 +76,7 @@ struct _ColorBalanceDialog
void gimp_color_balance_tool_register (Gimp *gimp,
GimpToolRegisterCallback callback);
GType gimp_color_balance_tool_get_type (void);
GType gimp_color_balance_tool_get_type (void) G_GNUC_CONST;
void color_balance (PixelRegion *srcPR,
......
......@@ -88,7 +88,7 @@ struct _CurvesDialog
void gimp_curves_tool_register (Gimp *gimp,
GimpToolRegisterCallback callback);
GType gimp_curves_tool_get_type (void);
GType gimp_curves_tool_get_type (void) G_GNUC_CONST;
void curves_free (void);
......
......@@ -84,7 +84,7 @@ struct _HueSaturationDialog
void gimp_hue_saturation_tool_register (Gimp *gimp,
GimpToolRegisterCallback callback);
GType gimp_hue_saturation_tool_get_type (void);
GType gimp_hue_saturation_tool_get_type (void) G_GNUC_CONST;
void hue_saturation_free (void);
void hue_saturation (PixelRegion *srcPR,
......
......@@ -71,7 +71,7 @@ struct _ThresholdDialog
void gimp_threshold_tool_register (Gimp *gimp,
GimpToolRegisterCallback callback);
GType gimp_threshold_tool_get_type (void);
GType gimp_threshold_tool_get_type (void) G_GNUC_CONST;
void threshold_2 (gpointer data,
......
......@@ -158,10 +158,7 @@ gen_sources = xgen-gmh xgen-gmc
CLEANFILES += $(gen_sources)
$(srcdir)/stamp-gimpmarshal.h: $(srcdir)/gimpmarshal.list gimpmarshal.h
echo "#ifndef __GIMP_MARSHAL_H__" > xgen-gmh \
&& echo "#define __GIMP_MARSHAL_H__" >> xgen-gmh \
&& glib-genmarshal --nostdinc --prefix=gimp_cclosure_marshal $(srcdir)/gimpmarshal.list --header >> xgen-gmh \
&& echo "#endif /* __GIMP_MARSHAL_H__ */" >> xgen-gmh \
glib-genmarshal --prefix=gimp_marshal $(srcdir)/gimpmarshal.list --header >> xgen-gmh \
&& (cmp -s xgen-gmh $(srcdir)/gimpmarshal.h || cp xgen-gmh $(srcdir)/gimpmarshal.h) \
&& rm -f xgen-gmh xgen-gmh~ \
&& echo timestamp > $@
......@@ -169,6 +166,6 @@ $(srcdir)/gimpmarshal.c: $(srcdir)/stamp-gimpmarshal.h
echo "#include <glib.h>" > xgen-gmc \
&& echo "#include <glib-object.h>" >> xgen-gmc \
&& echo "#include \"gimpmarshal.h\"" >> xgen-gmc \
&& glib-genmarshal --nostdinc --prefix=gimp_cclosure_marshal $(srcdir)/gimpmarshal.list --body >> xgen-gmc \
&& glib-genmarshal --prefix=gimp_marshal $(srcdir)/gimpmarshal.list --body >> xgen-gmc \
&& cp xgen-gmc $(srcdir)/gimpmarshal.c \
&& rm -f xgen-gmc xgen-gmc~
......@@ -124,7 +124,7 @@ struct _GimpClass
};
GType gimp_get_type (void);
GType gimp_get_type (void) G_GNUC_CONST;
Gimp * gimp_new (gboolean be_verbose,
gboolean no_data,
......
......@@ -50,6 +50,7 @@
#include "gimpbrush.h"
#include "gimpbrush-header.h"
#include "gimpbrushgenerated.h"
#include "gimpmarshal.h"
#include "libgimp/gimpintl.h"
......@@ -129,7 +130,7 @@ gimp_brush_class_init (GimpBrushClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpBrushClass, spacing_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
object_class->finalize = gimp_brush_finalize;
......
......@@ -50,6 +50,7 @@
#include "gimpbrush.h"
#include "gimpbrush-header.h"
#include "gimpbrushgenerated.h"
#include "gimpmarshal.h"
#include "libgimp/gimpintl.h"
......@@ -129,7 +130,7 @@ gimp_brush_class_init (GimpBrushClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpBrushClass, spacing_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
object_class->finalize = gimp_brush_finalize;
......
......@@ -69,7 +69,7 @@ struct _GimpBrushClass
};
GType gimp_brush_get_type (void);
GType gimp_brush_get_type (void) G_GNUC_CONST;
GimpData * gimp_brush_new (const gchar *name);
GimpData * gimp_brush_get_standard (void);
......
......@@ -57,7 +57,7 @@ struct _GimpBrushGeneratedClass
};
GType gimp_brush_generated_get_type (void);
GType gimp_brush_generated_get_type (void) G_GNUC_CONST;
GimpData * gimp_brush_generated_new (gfloat radius,
gfloat hardness,
......
......@@ -73,7 +73,7 @@ struct _GimpBrushPipeClass
};
GType gimp_brush_pipe_get_type (void);
GType gimp_brush_pipe_get_type (void) G_GNUC_CONST;
GimpData * gimp_brush_pipe_load (const gchar *filename);
......
......@@ -46,7 +46,7 @@ struct _GimpBufferClass
};
GType gimp_buffer_get_type (void);
GType gimp_buffer_get_type (void) G_GNUC_CONST;
GimpBuffer * gimp_buffer_new (TileManager *tiles,
const gchar *name);
......
......@@ -84,7 +84,7 @@ struct _MaskUndo
/* function declarations */
GType gimp_channel_get_type (void);
GType gimp_channel_get_type (void) G_GNUC_CONST;
GimpChannel * gimp_channel_new (GimpImage *gimage,
gint width,
......
......@@ -84,7 +84,7 @@ struct _MaskUndo
/* function declarations */
GType gimp_channel_get_type (void);
GType gimp_channel_get_type (void) G_GNUC_CONST;
GimpChannel * gimp_channel_new (GimpImage *gimage,
gint width,
......
......@@ -146,7 +146,7 @@ gimp_container_class_init (GimpContainerClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpContainerClass, add),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
gimp_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
GIMP_TYPE_OBJECT);
......@@ -156,7 +156,7 @@ gimp_container_class_init (GimpContainerClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpContainerClass, remove),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
gimp_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
GIMP_TYPE_OBJECT);
......@@ -166,7 +166,7 @@ gimp_container_class_init (GimpContainerClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpContainerClass, reorder),
NULL, NULL,
gimp_cclosure_marshal_VOID__OBJECT_INT,
gimp_marshal_VOID__OBJECT_INT,
G_TYPE_NONE, 2,
GIMP_TYPE_OBJECT,
G_TYPE_INT);
......@@ -177,7 +177,7 @@ gimp_container_class_init (GimpContainerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GimpContainerClass, freeze),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
container_signals[THAW] =
......@@ -186,7 +186,7 @@ gimp_container_class_init (GimpContainerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GimpContainerClass, thaw),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
object_class->dispose = gimp_container_dispose;
......
......@@ -88,9 +88,9 @@ struct _GimpContainerClass
};
GType gimp_container_policy_get_type (void);
GType gimp_container_policy_get_type (void) G_GNUC_CONST;
GType gimp_container_get_type (void);
GType gimp_container_get_type (void) G_GNUC_CONST;
GType gimp_container_children_type (const GimpContainer *container);
GimpContainerPolicy gimp_container_policy (const GimpContainer *container);
......
......@@ -375,7 +375,7 @@ gimp_context_class_init (GimpContextClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpContextClass, image_changed),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
gimp_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
GIMP_TYPE_IMAGE);
......@@ -385,7 +385,7 @@ gimp_context_class_init (GimpContextClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpContextClass, display_changed),
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
gimp_marshal_VOID__POINTER,
G_TYPE_NONE, 1,
G_TYPE_POINTER);
......@@ -395,7 +395,7 @@ gimp_context_class_init (GimpContextClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpContextClass, tool_changed),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
gimp_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
GIMP_TYPE_TOOL_INFO);
......@@ -405,7 +405,7 @@ gimp_context_class_init (GimpContextClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpContextClass, foreground_changed),
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
gimp_marshal_VOID__POINTER,
G_TYPE_NONE, 1,
G_TYPE_POINTER);
......@@ -415,7 +415,7 @@ gimp_context_class_init (GimpContextClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpContextClass, background_changed),
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
gimp_marshal_VOID__POINTER,
G_TYPE_NONE, 1,
G_TYPE_POINTER);
......@@ -425,7 +425,7 @@ gimp_context_class_init (GimpContextClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpContextClass, opacity_changed),
NULL, NULL,
g_cclosure_marshal_VOID__DOUBLE,
gimp_marshal_VOID__DOUBLE,
G_TYPE_NONE, 1,
G_TYPE_DOUBLE);
......@@ -435,7 +435,7 @@ gimp_context_class_init (GimpContextClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpContextClass, paint_mode_changed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
......@@ -445,7 +445,7 @@ gimp_context_class_init (GimpContextClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpContextClass, brush_changed),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
gimp_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
GIMP_TYPE_BRUSH);
......@@ -455,7 +455,7 @@ gimp_context_class_init (GimpContextClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpContextClass, pattern_changed),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
gimp_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
GIMP_TYPE_PATTERN);
......@@ -465,7 +465,7 @@ gimp_context_class_init (GimpContextClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpContextClass, gradient_changed),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
gimp_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
GIMP_TYPE_GRADIENT);
......@@ -475,7 +475,7 @@ gimp_context_class_init (GimpContextClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpContextClass, palette_changed),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
gimp_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
GIMP_TYPE_PALETTE);
......@@ -485,7 +485,7 @@ gimp_context_class_init (GimpContextClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpContextClass, buffer_changed),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
gimp_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
GIMP_TYPE_BUFFER);
......@@ -495,7 +495,7 @@ gimp_context_class_init (GimpContextClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpContextClass, imagefile_changed),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
gimp_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
GIMP_TYPE_IMAGEFILE);
......
......@@ -161,7 +161,7 @@ struct _GimpContextClass
};
GType gimp_context_get_type (void);
GType gimp_context_get_type (void) G_GNUC_CONST;
GimpContext * gimp_context_new (Gimp *gimp,
const gchar *name,
......
......@@ -108,7 +108,7 @@ gimp_data_class_init (GimpDataClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpDataClass, dirty),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
data_signals[SAVE] =
......@@ -117,7 +117,7 @@ gimp_data_class_init (GimpDataClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GimpDataClass, save),
NULL, NULL,
gimp_cclosure_marshal_BOOLEAN__VOID,
gimp_marshal_BOOLEAN__VOID,
G_TYPE_BOOLEAN, 0);
data_signals[GET_EXTENSION] =
......@@ -126,7 +126,7 @@ gimp_data_class_init (GimpDataClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GimpDataClass, get_extension),
NULL, NULL,
gimp_cclosure_marshal_POINTER__VOID,
gimp_marshal_POINTER__VOID,
G_TYPE_POINTER, 0);
data_signals[DUPLICATE] =
......@@ -135,7 +135,7 @@ gimp_data_class_init (GimpDataClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GimpDataClass, duplicate),
NULL, NULL,
gimp_cclosure_marshal_POINTER__VOID,
gimp_marshal_POINTER__VOID,
G_TYPE_POINTER, 0);
object_class->finalize = gimp_data_finalize;
......
......@@ -55,7 +55,7 @@ struct _GimpDataClass
};
GType gimp_data_get_type (void);
GType gimp_data_get_type (void) G_GNUC_CONST;
gboolean gimp_data_save (GimpData *data);
......
......@@ -30,7 +30,6 @@
#include "gimpdatafactory.h"
#include "gimpdatafiles.h"
#include "gimpdatalist.h"
#include "gimpmarshal.h"
#include "libgimp/gimpintl.h"
......
......@@ -71,7 +71,7 @@ struct _GimpDataFactoryClass
};
GType gimp_data_factory_get_type (void);