callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Sven Neumann
2001-11-22 23:46:13 +00:00
committed by Sven Neumann
parent c3c429621e
commit 757017a8e2
337 changed files with 1255 additions and 2894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
ChangeLog
View File

@ -1,3 +1,65 @@
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.

14
HACKING
View File

@ -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

94
RELEASE-TO-CVS.patch
View File

@ -1,94 +0,0 @@
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);

14
app/app_procs.c
View File

@ -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

2
app/base/color-balance.h
View File

@ -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,

2
app/base/curves.h
View File

@ -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);

2
app/base/hue-saturation.h
View File

@ -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,

2
app/base/threshold.h
View File

@ -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,

7
app/core/Makefile.am
View File

@ -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~

2
app/core/gimp.h
View File

@ -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,

3
app/core/gimpbrush-load.c
View File

@ -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;

3
app/core/gimpbrush.c
View File

@ -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;

2
app/core/gimpbrush.h
View File

@ -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);

2
app/core/gimpbrushgenerated.h
View File

@ -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,

2
app/core/gimpbrushpipe.h
View File

@ -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);

2
app/core/gimpbuffer.h
View File

@ -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);

2
app/core/gimpchannel-combine.h
View File

@ -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,

2
app/core/gimpchannel.h
View File

@ -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,

10
app/core/gimpcontainer.c
View File

@ -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;

4
app/core/gimpcontainer.h
View File

@ -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);

26
app/core/gimpcontext.c
View File

@ -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);

2
app/core/gimpcontext.h
View File

@ -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,

8
app/core/gimpdata.c
View File

@ -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;

2
app/core/gimpdata.h
View File

@ -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);

1
app/core/gimpdatafactory.c
View File

@ -30,7 +30,6 @@
#include "gimpdatafactory.h"
#include "gimpdatafiles.h"
#include "gimpdatalist.h"
#include "gimpmarshal.h"
#include "libgimp/gimpintl.h"

2
app/core/gimpdatafactory.h
View File

@ -71,7 +71,7 @@ struct _GimpDataFactoryClass
};
GType gimp_data_factory_get_type (void);
GType gimp_data_factory_get_type (void) G_GNUC_CONST;
GimpDataFactory * gimp_data_factory_new (GType data_type,
const gchar **data_path,

2
app/core/gimpdatalist.h
View File

@ -47,7 +47,7 @@ struct _GimpDataListClass
};
GType gimp_data_list_get_type (void);
GType gimp_data_list_get_type (void) G_GNUC_CONST;
GimpContainer * gimp_data_list_new (GType children_type);

5
app/core/gimpdrawable.c
View File

@ -45,6 +45,7 @@
#include "gimpimage-mask.h"
#include "gimplayer.h"
#include "gimplist.h"
#include "gimpmarshal.h"
#include "gimpparasite.h"
#include "gimpparasitelist.h"
#include "gimppreviewcache.h"
@ -127,7 +128,7 @@ gimp_drawable_class_init (GimpDrawableClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpDrawableClass, visibility_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_drawable_signals[REMOVED] =
@ -136,7 +137,7 @@ gimp_drawable_class_init (GimpDrawableClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpDrawableClass, removed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
object_class->finalize = gimp_drawable_finalize;

2
app/core/gimpdrawable.h
View File

@ -67,7 +67,7 @@ struct _GimpDrawableClass
/* drawable access functions */
GType gimp_drawable_get_type (void);
GType gimp_drawable_get_type (void) G_GNUC_CONST;
void gimp_drawable_configure (GimpDrawable *drawable,
GimpImage *gimage,

2
app/core/gimpgradient.h
View File

@ -86,7 +86,7 @@ struct _GimpGradientClass
};
GType gimp_gradient_get_type (void);
GType gimp_gradient_get_type (void) G_GNUC_CONST;
GimpData * gimp_gradient_new (const gchar *name);
GimpData * gimp_gradient_get_standard (void);

36
app/core/gimpimage-guides.c
View File

@ -240,7 +240,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, mode_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[ALPHA_CHANGED] =
@ -249,7 +249,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, alpha_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[FLOATING_SELECTION_CHANGED] =
@ -258,7 +258,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, floating_selection_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[ACTIVE_LAYER_CHANGED] =
@ -267,7 +267,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, active_layer_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[ACTIVE_CHANNEL_CHANGED] =
@ -276,7 +276,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, active_channel_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[COMPONENT_VISIBILITY_CHANGED] =
@ -285,7 +285,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, component_visibility_changed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -295,7 +295,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, component_active_changed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -305,7 +305,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, mask_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[RESOLUTION_CHANGED] =
@ -314,7 +314,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, resolution_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[UNIT_CHANGED] =
@ -323,7 +323,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, unit_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[QMASK_CHANGED] =
@ -332,7 +332,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, qmask_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[SELECTION_CONTROL] =
@ -341,7 +341,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, selection_control),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -351,7 +351,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, clean),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[DIRTY] =
@ -360,7 +360,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, dirty),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[UPDATE] =
@ -369,7 +369,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, update),
NULL, NULL,
gimp_cclosure_marshal_VOID__INT_INT_INT_INT,
gimp_marshal_VOID__INT_INT_INT_INT,
G_TYPE_NONE, 4,
G_TYPE_INT,
G_TYPE_INT,
@ -382,7 +382,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, update_guide),
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
gimp_marshal_VOID__POINTER,
G_TYPE_NONE, 1,
G_TYPE_POINTER);
@ -392,7 +392,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, colormap_changed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -402,7 +402,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, undo_event),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);

2
app/core/gimpimage-guides.h
View File

@ -166,7 +166,7 @@ struct _GimpImageClass
/* function declarations */
GType gimp_image_get_type (void);
GType gimp_image_get_type (void) G_GNUC_CONST;
GimpImage * gimp_image_new (Gimp *gimp,
gint width,

36
app/core/gimpimage-merge.c
View File

@ -240,7 +240,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, mode_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[ALPHA_CHANGED] =
@ -249,7 +249,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, alpha_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[FLOATING_SELECTION_CHANGED] =
@ -258,7 +258,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, floating_selection_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[ACTIVE_LAYER_CHANGED] =
@ -267,7 +267,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, active_layer_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[ACTIVE_CHANNEL_CHANGED] =
@ -276,7 +276,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, active_channel_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[COMPONENT_VISIBILITY_CHANGED] =
@ -285,7 +285,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, component_visibility_changed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -295,7 +295,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, component_active_changed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -305,7 +305,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, mask_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[RESOLUTION_CHANGED] =
@ -314,7 +314,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, resolution_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[UNIT_CHANGED] =
@ -323,7 +323,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, unit_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[QMASK_CHANGED] =
@ -332,7 +332,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, qmask_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[SELECTION_CONTROL] =
@ -341,7 +341,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, selection_control),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -351,7 +351,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, clean),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[DIRTY] =
@ -360,7 +360,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, dirty),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[UPDATE] =
@ -369,7 +369,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, update),
NULL, NULL,
gimp_cclosure_marshal_VOID__INT_INT_INT_INT,
gimp_marshal_VOID__INT_INT_INT_INT,
G_TYPE_NONE, 4,
G_TYPE_INT,
G_TYPE_INT,
@ -382,7 +382,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, update_guide),
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
gimp_marshal_VOID__POINTER,
G_TYPE_NONE, 1,
G_TYPE_POINTER);
@ -392,7 +392,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, colormap_changed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -402,7 +402,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, undo_event),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);

2
app/core/gimpimage-merge.h
View File

@ -166,7 +166,7 @@ struct _GimpImageClass
/* function declarations */
GType gimp_image_get_type (void);
GType gimp_image_get_type (void) G_GNUC_CONST;
GimpImage * gimp_image_new (Gimp *gimp,
gint width,

36
app/core/gimpimage-projection.c
View File

@ -240,7 +240,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, mode_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[ALPHA_CHANGED] =
@ -249,7 +249,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, alpha_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[FLOATING_SELECTION_CHANGED] =
@ -258,7 +258,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, floating_selection_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[ACTIVE_LAYER_CHANGED] =
@ -267,7 +267,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, active_layer_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[ACTIVE_CHANNEL_CHANGED] =
@ -276,7 +276,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, active_channel_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[COMPONENT_VISIBILITY_CHANGED] =
@ -285,7 +285,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, component_visibility_changed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -295,7 +295,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, component_active_changed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -305,7 +305,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, mask_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[RESOLUTION_CHANGED] =
@ -314,7 +314,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, resolution_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[UNIT_CHANGED] =
@ -323,7 +323,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, unit_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[QMASK_CHANGED] =
@ -332,7 +332,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, qmask_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[SELECTION_CONTROL] =
@ -341,7 +341,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, selection_control),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -351,7 +351,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, clean),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[DIRTY] =
@ -360,7 +360,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, dirty),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[UPDATE] =
@ -369,7 +369,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, update),
NULL, NULL,
gimp_cclosure_marshal_VOID__INT_INT_INT_INT,
gimp_marshal_VOID__INT_INT_INT_INT,
G_TYPE_NONE, 4,
G_TYPE_INT,
G_TYPE_INT,
@ -382,7 +382,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, update_guide),
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
gimp_marshal_VOID__POINTER,
G_TYPE_NONE, 1,
G_TYPE_POINTER);
@ -392,7 +392,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, colormap_changed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -402,7 +402,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, undo_event),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);

2
app/core/gimpimage-projection.h
View File

@ -166,7 +166,7 @@ struct _GimpImageClass
/* function declarations */
GType gimp_image_get_type (void);
GType gimp_image_get_type (void) G_GNUC_CONST;
GimpImage * gimp_image_new (Gimp *gimp,
gint width,

36
app/core/gimpimage-resize.c
View File

@ -240,7 +240,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, mode_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[ALPHA_CHANGED] =
@ -249,7 +249,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, alpha_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[FLOATING_SELECTION_CHANGED] =
@ -258,7 +258,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, floating_selection_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[ACTIVE_LAYER_CHANGED] =
@ -267,7 +267,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, active_layer_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[ACTIVE_CHANNEL_CHANGED] =
@ -276,7 +276,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, active_channel_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[COMPONENT_VISIBILITY_CHANGED] =
@ -285,7 +285,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, component_visibility_changed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -295,7 +295,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, component_active_changed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -305,7 +305,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, mask_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[RESOLUTION_CHANGED] =
@ -314,7 +314,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, resolution_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[UNIT_CHANGED] =
@ -323,7 +323,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, unit_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[QMASK_CHANGED] =
@ -332,7 +332,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, qmask_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[SELECTION_CONTROL] =
@ -341,7 +341,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, selection_control),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -351,7 +351,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, clean),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[DIRTY] =
@ -360,7 +360,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, dirty),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[UPDATE] =
@ -369,7 +369,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, update),
NULL, NULL,
gimp_cclosure_marshal_VOID__INT_INT_INT_INT,
gimp_marshal_VOID__INT_INT_INT_INT,
G_TYPE_NONE, 4,
G_TYPE_INT,
G_TYPE_INT,
@ -382,7 +382,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, update_guide),
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
gimp_marshal_VOID__POINTER,
G_TYPE_NONE, 1,
G_TYPE_POINTER);
@ -392,7 +392,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, colormap_changed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -402,7 +402,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, undo_event),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);

2
app/core/gimpimage-resize.h
View File

@ -166,7 +166,7 @@ struct _GimpImageClass
/* function declarations */
GType gimp_image_get_type (void);
GType gimp_image_get_type (void) G_GNUC_CONST;
GimpImage * gimp_image_new (Gimp *gimp,
gint width,

36
app/core/gimpimage-scale.c
View File

@ -240,7 +240,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, mode_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[ALPHA_CHANGED] =
@ -249,7 +249,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, alpha_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[FLOATING_SELECTION_CHANGED] =
@ -258,7 +258,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, floating_selection_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[ACTIVE_LAYER_CHANGED] =
@ -267,7 +267,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, active_layer_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[ACTIVE_CHANNEL_CHANGED] =
@ -276,7 +276,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, active_channel_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[COMPONENT_VISIBILITY_CHANGED] =
@ -285,7 +285,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, component_visibility_changed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -295,7 +295,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, component_active_changed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -305,7 +305,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, mask_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[RESOLUTION_CHANGED] =
@ -314,7 +314,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, resolution_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[UNIT_CHANGED] =
@ -323,7 +323,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, unit_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[QMASK_CHANGED] =
@ -332,7 +332,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, qmask_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[SELECTION_CONTROL] =
@ -341,7 +341,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, selection_control),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -351,7 +351,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, clean),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[DIRTY] =
@ -360,7 +360,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, dirty),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[UPDATE] =
@ -369,7 +369,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, update),
NULL, NULL,
gimp_cclosure_marshal_VOID__INT_INT_INT_INT,
gimp_marshal_VOID__INT_INT_INT_INT,
G_TYPE_NONE, 4,
G_TYPE_INT,
G_TYPE_INT,
@ -382,7 +382,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, update_guide),
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
gimp_marshal_VOID__POINTER,
G_TYPE_NONE, 1,
G_TYPE_POINTER);
@ -392,7 +392,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, colormap_changed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -402,7 +402,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, undo_event),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);

2
app/core/gimpimage-scale.h
View File

@ -166,7 +166,7 @@ struct _GimpImageClass
/* function declarations */
GType gimp_image_get_type (void);
GType gimp_image_get_type (void) G_GNUC_CONST;
GimpImage * gimp_image_new (Gimp *gimp,
gint width,

36
app/core/gimpimage.c
View File

@ -240,7 +240,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, mode_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[ALPHA_CHANGED] =
@ -249,7 +249,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, alpha_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[FLOATING_SELECTION_CHANGED] =
@ -258,7 +258,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, floating_selection_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[ACTIVE_LAYER_CHANGED] =
@ -267,7 +267,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, active_layer_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[ACTIVE_CHANNEL_CHANGED] =
@ -276,7 +276,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, active_channel_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[COMPONENT_VISIBILITY_CHANGED] =
@ -285,7 +285,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, component_visibility_changed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -295,7 +295,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, component_active_changed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -305,7 +305,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, mask_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[RESOLUTION_CHANGED] =
@ -314,7 +314,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, resolution_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[UNIT_CHANGED] =
@ -323,7 +323,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, unit_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[QMASK_CHANGED] =
@ -332,7 +332,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, qmask_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[SELECTION_CONTROL] =
@ -341,7 +341,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, selection_control),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -351,7 +351,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, clean),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[DIRTY] =
@ -360,7 +360,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, dirty),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[UPDATE] =
@ -369,7 +369,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, update),
NULL, NULL,
gimp_cclosure_marshal_VOID__INT_INT_INT_INT,
gimp_marshal_VOID__INT_INT_INT_INT,
G_TYPE_NONE, 4,
G_TYPE_INT,
G_TYPE_INT,
@ -382,7 +382,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, update_guide),
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
gimp_marshal_VOID__POINTER,
G_TYPE_NONE, 1,
G_TYPE_POINTER);
@ -392,7 +392,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, colormap_changed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -402,7 +402,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, undo_event),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);

2
app/core/gimpimage.h
View File

@ -166,7 +166,7 @@ struct _GimpImageClass
/* function declarations */
GType gimp_image_get_type (void);
GType gimp_image_get_type (void) G_GNUC_CONST;
GimpImage * gimp_image_new (Gimp *gimp,
gint width,

6
app/core/gimpimagefile.c
View File

@ -142,6 +142,12 @@ gimp_imagefile_new (const gchar *filename)
return imagefile;
}
void
gimp_imagefile_update_thumbnail (GimpImagefile *imagefile)
{
g_return_if_fail (GIMP_IS_IMAGEFILE (imagefile));
}
static void
gimp_imagefile_set_info (GimpImagefile *imagefile,
gint width,

5
app/core/gimpimagefile.h
View File

@ -51,9 +51,10 @@ struct _GimpImagefileClass
};
GType gimp_imagefile_get_type (void);
GType gimp_imagefile_get_type (void) G_GNUC_CONST;
GimpImagefile * gimp_imagefile_new (const gchar *filename);
GimpImagefile * gimp_imagefile_new (const gchar *filename);
void gimp_imagefile_update_thumbnail (GimpImagefile *imagefile);
#endif /* __GIMP_IMAGEFILE_H__ */

11
app/core/gimplayer.c
View File

@ -41,6 +41,7 @@
#include "gimpimage.h"
#include "gimplayer.h"
#include "gimplayermask.h"
#include "gimpmarshal.h"
#include "gimpparasitelist.h"
#include "floating_sel.h"
@ -124,7 +125,7 @@ gimp_layer_class_init (GimpLayerClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpLayerClass, opacity_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
layer_signals[MODE_CHANGED] =
@ -133,7 +134,7 @@ gimp_layer_class_init (GimpLayerClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpLayerClass, mode_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
layer_signals[PRESERVE_TRANS_CHANGED] =
@ -142,7 +143,7 @@ gimp_layer_class_init (GimpLayerClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpLayerClass, preserve_trans_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
layer_signals[LINKED_CHANGED] =
@ -151,7 +152,7 @@ gimp_layer_class_init (GimpLayerClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpLayerClass, linked_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
layer_signals[MASK_CHANGED] =
@ -160,7 +161,7 @@ gimp_layer_class_init (GimpLayerClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpLayerClass, mask_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
object_class->finalize = gimp_layer_finalize;

2
app/core/gimplayer.h
View File

@ -88,7 +88,7 @@ struct _FStoLayerUndo
/* function declarations */
GType gimp_layer_get_type (void);
GType gimp_layer_get_type (void) G_GNUC_CONST;
GimpLayer * gimp_layer_new (GimpImage *gimage,
gint width,

7
app/core/gimplayermask.c
View File

@ -32,6 +32,7 @@
#include "paint-funcs/paint-funcs.h"
#include "gimplayermask.h"
#include "gimpmarshal.h"
#include "undo.h"
@ -95,7 +96,7 @@ gimp_layer_mask_class_init (GimpLayerMaskClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpLayerMaskClass, apply_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
layer_mask_signals[EDIT_CHANGED] =
@ -104,7 +105,7 @@ gimp_layer_mask_class_init (GimpLayerMaskClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpLayerMaskClass, edit_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
layer_mask_signals[SHOW_CHANGED] =
@ -113,7 +114,7 @@ gimp_layer_mask_class_init (GimpLayerMaskClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpLayerMaskClass, show_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
}

2
app/core/gimplayermask.h
View File

@ -66,7 +66,7 @@ struct _LayerMaskUndo
/* function declarations */
GType gimp_layer_mask_get_type (void);
GType gimp_layer_mask_get_type (void) G_GNUC_CONST;
GimpLayerMask * gimp_layer_mask_new (GimpImage *gimage,
gint width,

2
app/core/gimplist.h
View File

@ -49,7 +49,7 @@ struct _GimpListClass
};
GType gimp_list_get_type (void);
GType gimp_list_get_type (void) G_GNUC_CONST;
GimpContainer * gimp_list_new (GType children_type,
GimpContainerPolicy policy);

427
app/core/gimpmarshal.c
View File

@ -2,15 +2,17 @@
#include <glib-object.h>
#include "gimpmarshal.h"
#include <glib-object.h>
/* BOOLEAN:OBJECT (./gimpmarshal.list:25) */
void
gimp_cclosure_marshal_BOOLEAN__OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_BOOLEAN__OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef gboolean (*GMarshalFunc_BOOLEAN__OBJECT) (gpointer data1,
gpointer arg_1,
@ -44,12 +46,12 @@ gimp_cclosure_marshal_BOOLEAN__OBJECT (GClosure *closure,
/* BOOLEAN:POINTER (./gimpmarshal.list:26) */
void
gimp_cclosure_marshal_BOOLEAN__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_BOOLEAN__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER) (gpointer data1,
gpointer arg_1,
@ -83,12 +85,12 @@ gimp_cclosure_marshal_BOOLEAN__POINTER (GClosure *closure,
/* BOOLEAN:VOID (./gimpmarshal.list:27) */
void
gimp_cclosure_marshal_BOOLEAN__VOID (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_BOOLEAN__VOID (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef gboolean (*GMarshalFunc_BOOLEAN__VOID) (gpointer data1,
gpointer data2);
@ -120,12 +122,12 @@ gimp_cclosure_marshal_BOOLEAN__VOID (GClosure *closure,
/* INT:OBJECT (./gimpmarshal.list:29) */
void
gimp_cclosure_marshal_INT__OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_INT__OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef gint (*GMarshalFunc_INT__OBJECT) (gpointer data1,
gpointer arg_1,
@ -159,12 +161,12 @@ gimp_cclosure_marshal_INT__OBJECT (GClosure *closure,
/* INT:POINTER (./gimpmarshal.list:30) */
void
gimp_cclosure_marshal_INT__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_INT__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef gint (*GMarshalFunc_INT__POINTER) (gpointer data1,
gpointer arg_1,
@ -198,12 +200,12 @@ gimp_cclosure_marshal_INT__POINTER (GClosure *closure,
/* OBJECT:INT (./gimpmarshal.list:32) */
void
gimp_cclosure_marshal_OBJECT__INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_OBJECT__INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef GObject* (*GMarshalFunc_OBJECT__INT) (gpointer data1,
gint arg_1,
@ -239,12 +241,12 @@ gimp_cclosure_marshal_OBJECT__INT (GClosure *closure,
/* OBJECT:POINTER (./gimpmarshal.list:33) */
void
gimp_cclosure_marshal_OBJECT__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_OBJECT__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef GObject* (*GMarshalFunc_OBJECT__POINTER) (gpointer data1,
gpointer arg_1,
@ -280,12 +282,12 @@ gimp_cclosure_marshal_OBJECT__POINTER (GClosure *closure,
/* POINTER:INT (./gimpmarshal.list:35) */
void
gimp_cclosure_marshal_POINTER__INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_POINTER__INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef gpointer (*GMarshalFunc_POINTER__INT) (gpointer data1,
gint arg_1,
@ -319,12 +321,12 @@ gimp_cclosure_marshal_POINTER__INT (GClosure *closure,
/* POINTER:INT,INT (./gimpmarshal.list:36) */
void
gimp_cclosure_marshal_POINTER__INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_POINTER__INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef gpointer (*GMarshalFunc_POINTER__INT_INT) (gpointer data1,
gint arg_1,
@ -360,12 +362,12 @@ gimp_cclosure_marshal_POINTER__INT_INT (GClosure *closure,
/* POINTER:OBJECT,INT (./gimpmarshal.list:37) */
void
gimp_cclosure_marshal_POINTER__OBJECT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_POINTER__OBJECT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef gpointer (*GMarshalFunc_POINTER__OBJECT_INT) (gpointer data1,
gpointer arg_1,
@ -401,12 +403,12 @@ gimp_cclosure_marshal_POINTER__OBJECT_INT (GClosure *closure,
/* POINTER:POINTER (./gimpmarshal.list:38) */
void
gimp_cclosure_marshal_POINTER__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_POINTER__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef gpointer (*GMarshalFunc_POINTER__POINTER) (gpointer data1,
gpointer arg_1,
@ -440,12 +442,12 @@ gimp_cclosure_marshal_POINTER__POINTER (GClosure *closure,
/* POINTER:POINTER,INT (./gimpmarshal.list:39) */
void
gimp_cclosure_marshal_POINTER__POINTER_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_POINTER__POINTER_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef gpointer (*GMarshalFunc_POINTER__POINTER_INT) (gpointer data1,
gpointer arg_1,
@ -481,12 +483,12 @@ gimp_cclosure_marshal_POINTER__POINTER_INT (GClosure *closure,
/* POINTER:POINTER,INT,INT (./gimpmarshal.list:40) */
void
gimp_cclosure_marshal_POINTER__POINTER_INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_POINTER__POINTER_INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef gpointer (*GMarshalFunc_POINTER__POINTER_INT_INT) (gpointer data1,
gpointer arg_1,
@ -524,12 +526,12 @@ gimp_cclosure_marshal_POINTER__POINTER_INT_INT (GClosure *closure,
/* POINTER:VOID (./gimpmarshal.list:41) */
void
gimp_cclosure_marshal_POINTER__VOID (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_POINTER__VOID (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef gpointer (*GMarshalFunc_POINTER__VOID) (gpointer data1,
gpointer data2);
@ -560,48 +562,19 @@ gimp_cclosure_marshal_POINTER__VOID (GClosure *closure,
}
/* VOID:DOUBLE (./gimpmarshal.list:43) */
/* VOID:ENUM (./gimpmarshal.list:44) */
/* VOID:INT (./gimpmarshal.list:45) */
/* VOID:INT,BOOLEAN,INT,OBJECT (./gimpmarshal.list:46) */
void
gimp_cclosure_marshal_VOID__DOUBLE (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__DOUBLE) (gpointer data1,
gdouble arg_1,
gpointer data2);
register GMarshalFunc_VOID__DOUBLE callback;
register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2;
g_return_if_fail (n_param_values == 2);
if (G_CCLOSURE_SWAP_DATA (closure))
{
data1 = closure->data;
data2 = g_value_peek_pointer (param_values + 0);
}
else
{
data1 = g_value_peek_pointer (param_values + 0);
data2 = closure->data;
}
callback = (GMarshalFunc_VOID__DOUBLE) (marshal_data ? marshal_data : cc->callback);
callback (data1,
g_value_get_double (param_values + 1),
data2);
}
/* VOID:INT,BOOLEAN,INT,OBJECT (./gimpmarshal.list:44) */
void
gimp_cclosure_marshal_VOID__INT_BOOLEAN_INT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_VOID__INT_BOOLEAN_INT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__INT_BOOLEAN_INT_OBJECT) (gpointer data1,
gint arg_1,
@ -635,14 +608,14 @@ gimp_cclosure_marshal_VOID__INT_BOOLEAN_INT_OBJECT (GClosure *closure,
data2);
}
/* VOID:INT,INT (./gimpmarshal.list:45) */
/* VOID:INT,INT (./gimpmarshal.list:47) */
void
gimp_cclosure_marshal_VOID__INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_VOID__INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer data1,
gint arg_1,
@ -672,14 +645,14 @@ gimp_cclosure_marshal_VOID__INT_INT (GClosure *closure,
data2);
}
/* VOID:INT,INT,INT (./gimpmarshal.list:46) */
/* VOID:INT,INT,INT (./gimpmarshal.list:48) */
void
gimp_cclosure_marshal_VOID__INT_INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_VOID__INT_INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__INT_INT_INT) (gpointer data1,
gint arg_1,
@ -711,14 +684,14 @@ gimp_cclosure_marshal_VOID__INT_INT_INT (GClosure *closure,
data2);
}
/* VOID:INT,INT,INT,INT (./gimpmarshal.list:47) */
/* VOID:INT,INT,INT,INT (./gimpmarshal.list:49) */
void
gimp_cclosure_marshal_VOID__INT_INT_INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_VOID__INT_INT_INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__INT_INT_INT_INT) (gpointer data1,
gint arg_1,
@ -752,14 +725,14 @@ gimp_cclosure_marshal_VOID__INT_INT_INT_INT (GClosure *closure,
data2);
}
/* VOID:INT,OBJECT (./gimpmarshal.list:48) */
/* VOID:INT,OBJECT (./gimpmarshal.list:50) */
void
gimp_cclosure_marshal_VOID__INT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_VOID__INT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__INT_OBJECT) (gpointer data1,
gint arg_1,
@ -789,14 +762,14 @@ gimp_cclosure_marshal_VOID__INT_OBJECT (GClosure *closure,
data2);
}
/* VOID:INT,POINTER (./gimpmarshal.list:49) */
/* VOID:INT,POINTER (./gimpmarshal.list:51) */
void
gimp_cclosure_marshal_VOID__INT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_VOID__INT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__INT_POINTER) (gpointer data1,
gint arg_1,
@ -826,14 +799,14 @@ gimp_cclosure_marshal_VOID__INT_POINTER (GClosure *closure,
data2);
}
/* VOID:INT,POINTER,POINTER (./gimpmarshal.list:50) */
/* VOID:INT,POINTER,POINTER (./gimpmarshal.list:52) */
void
gimp_cclosure_marshal_VOID__INT_POINTER_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_VOID__INT_POINTER_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__INT_POINTER_POINTER) (gpointer data1,
gint arg_1,
@ -865,14 +838,16 @@ gimp_cclosure_marshal_VOID__INT_POINTER_POINTER (GClosure *closure,
data2);
}
/* VOID:OBJECT,INT (./gimpmarshal.list:51) */
/* VOID:OBJECT (./gimpmarshal.list:53) */
/* VOID:OBJECT,INT (./gimpmarshal.list:54) */
void
gimp_cclosure_marshal_VOID__OBJECT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_VOID__OBJECT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__OBJECT_INT) (gpointer data1,
gpointer arg_1,
@ -902,14 +877,14 @@ gimp_cclosure_marshal_VOID__OBJECT_INT (GClosure *closure,
data2);
}
/* VOID:OBJECT,INT,POINTER (./gimpmarshal.list:52) */
/* VOID:OBJECT,INT,POINTER (./gimpmarshal.list:55) */
void
gimp_cclosure_marshal_VOID__OBJECT_INT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_VOID__OBJECT_INT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__OBJECT_INT_POINTER) (gpointer data1,
gpointer arg_1,
@ -941,14 +916,14 @@ gimp_cclosure_marshal_VOID__OBJECT_INT_POINTER (GClosure *closure,
data2);
}
/* VOID:OBJECT,POINTER (./gimpmarshal.list:53) */
/* VOID:OBJECT,POINTER (./gimpmarshal.list:56) */
void
gimp_cclosure_marshal_VOID__OBJECT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_VOID__OBJECT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__OBJECT_POINTER) (gpointer data1,
gpointer arg_1,
@ -978,14 +953,16 @@ gimp_cclosure_marshal_VOID__OBJECT_POINTER (GClosure *closure,
data2);
}
/* VOID:POINTER,INT (./gimpmarshal.list:54) */
/* VOID:POINTER (./gimpmarshal.list:57) */
/* VOID:POINTER,INT (./gimpmarshal.list:58) */
void
gimp_cclosure_marshal_VOID__POINTER_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_VOID__POINTER_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__POINTER_INT) (gpointer data1,
gpointer arg_1,
@ -1015,14 +992,14 @@ gimp_cclosure_marshal_VOID__POINTER_INT (GClosure *closure,
data2);
}
/* VOID:POINTER,INT,OBJECT (./gimpmarshal.list:55) */
/* VOID:POINTER,INT,OBJECT (./gimpmarshal.list:59) */
void
gimp_cclosure_marshal_VOID__POINTER_INT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_VOID__POINTER_INT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__POINTER_INT_OBJECT) (gpointer data1,
gpointer arg_1,
@ -1054,14 +1031,14 @@ gimp_cclosure_marshal_VOID__POINTER_INT_OBJECT (GClosure *closure,
data2);
}
/* VOID:POINTER,OBJECT (./gimpmarshal.list:56) */
/* VOID:POINTER,OBJECT (./gimpmarshal.list:60) */
void
gimp_cclosure_marshal_VOID__POINTER_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_VOID__POINTER_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__POINTER_OBJECT) (gpointer data1,
gpointer arg_1,
@ -1091,14 +1068,14 @@ gimp_cclosure_marshal_VOID__POINTER_OBJECT (GClosure *closure,
data2);
}
/* VOID:POINTER,POINTER (./gimpmarshal.list:57) */
/* VOID:POINTER,POINTER (./gimpmarshal.list:61) */
void
gimp_cclosure_marshal_VOID__POINTER_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_VOID__POINTER_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__POINTER_POINTER) (gpointer data1,
gpointer arg_1,
@ -1128,14 +1105,14 @@ gimp_cclosure_marshal_VOID__POINTER_POINTER (GClosure *closure,
data2);
}
/* VOID:POINTER,UINT,INT,OBJECT (./gimpmarshal.list:58) */
/* VOID:POINTER,UINT,INT,OBJECT (./gimpmarshal.list:62) */
void
gimp_cclosure_marshal_VOID__POINTER_UINT_INT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
gimp_marshal_VOID__POINTER_UINT_INT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__POINTER_UINT_INT_OBJECT) (gpointer data1,
gpointer arg_1,
@ -1169,3 +1146,7 @@ gimp_cclosure_marshal_VOID__POINTER_UINT_INT_OBJECT (GClosure *closure,
data2);
}
/* VOID:UINT (./gimpmarshal.list:63) */
/* VOID:VOID (./gimpmarshal.list:64) */

385
app/core/gimpmarshal.h
View File

@ -1,248 +1,265 @@
#ifndef __GIMP_MARSHAL_H__
#define __GIMP_MARSHAL_H__
#ifndef __gimp_marshal_MARSHAL_H__
#define __gimp_marshal_MARSHAL_H__
#include <glib-object.h>
G_BEGIN_DECLS
/* BOOLEAN:OBJECT (./gimpmarshal.list:25) */
extern void gimp_cclosure_marshal_BOOLEAN__OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
extern void gimp_marshal_BOOLEAN__OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* BOOLEAN:POINTER (./gimpmarshal.list:26) */
extern void gimp_cclosure_marshal_BOOLEAN__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
extern void gimp_marshal_BOOLEAN__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* BOOLEAN:VOID (./gimpmarshal.list:27) */
extern void gimp_cclosure_marshal_BOOLEAN__VOID (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
extern void gimp_marshal_BOOLEAN__VOID (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* INT:OBJECT (./gimpmarshal.list:29) */
extern void gimp_cclosure_marshal_INT__OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
extern void gimp_marshal_INT__OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* INT:POINTER (./gimpmarshal.list:30) */
extern void gimp_cclosure_marshal_INT__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
extern void gimp_marshal_INT__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* OBJECT:INT (./gimpmarshal.list:32) */
extern void gimp_cclosure_marshal_OBJECT__INT (GClosure *closure,
extern void gimp_marshal_OBJECT__INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* OBJECT:POINTER (./gimpmarshal.list:33) */
extern void gimp_marshal_OBJECT__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* POINTER:INT (./gimpmarshal.list:35) */
extern void gimp_marshal_POINTER__INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* POINTER:INT,INT (./gimpmarshal.list:36) */
extern void gimp_marshal_POINTER__INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* POINTER:OBJECT,INT (./gimpmarshal.list:37) */
extern void gimp_marshal_POINTER__OBJECT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* POINTER:POINTER (./gimpmarshal.list:38) */
extern void gimp_marshal_POINTER__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* POINTER:POINTER,INT (./gimpmarshal.list:39) */
extern void gimp_marshal_POINTER__POINTER_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* OBJECT:POINTER (./gimpmarshal.list:33) */
extern void gimp_cclosure_marshal_OBJECT__POINTER (GClosure *closure,
/* POINTER:POINTER,INT,INT (./gimpmarshal.list:40) */
extern void gimp_marshal_POINTER__POINTER_INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* POINTER:INT (./gimpmarshal.list:35) */
extern void gimp_cclosure_marshal_POINTER__INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* POINTER:VOID (./gimpmarshal.list:41) */
extern void gimp_marshal_POINTER__VOID (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* POINTER:INT,INT (./gimpmarshal.list:36) */
extern void gimp_cclosure_marshal_POINTER__INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:DOUBLE (./gimpmarshal.list:43) */
#define gimp_marshal_VOID__DOUBLE g_cclosure_marshal_VOID__DOUBLE
/* POINTER:OBJECT,INT (./gimpmarshal.list:37) */
extern void gimp_cclosure_marshal_POINTER__OBJECT_INT (GClosure *closure,
/* VOID:ENUM (./gimpmarshal.list:44) */
#define gimp_marshal_VOID__ENUM g_cclosure_marshal_VOID__ENUM
/* VOID:INT (./gimpmarshal.list:45) */
#define gimp_marshal_VOID__INT g_cclosure_marshal_VOID__INT
/* VOID:INT,BOOLEAN,INT,OBJECT (./gimpmarshal.list:46) */
extern void gimp_marshal_VOID__INT_BOOLEAN_INT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* POINTER:POINTER (./gimpmarshal.list:38) */
extern void gimp_cclosure_marshal_POINTER__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:INT,INT (./gimpmarshal.list:47) */
extern void gimp_marshal_VOID__INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* POINTER:POINTER,INT (./gimpmarshal.list:39) */
extern void gimp_cclosure_marshal_POINTER__POINTER_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:INT,INT,INT (./gimpmarshal.list:48) */
extern void gimp_marshal_VOID__INT_INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* POINTER:POINTER,INT,INT (./gimpmarshal.list:40) */
extern void gimp_cclosure_marshal_POINTER__POINTER_INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* POINTER:VOID (./gimpmarshal.list:41) */
extern void gimp_cclosure_marshal_POINTER__VOID (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:DOUBLE (./gimpmarshal.list:43) */
extern void gimp_cclosure_marshal_VOID__DOUBLE (GClosure *closure,
/* VOID:INT,INT,INT,INT (./gimpmarshal.list:49) */
extern void gimp_marshal_VOID__INT_INT_INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:INT,BOOLEAN,INT,OBJECT (./gimpmarshal.list:44) */
extern void gimp_cclosure_marshal_VOID__INT_BOOLEAN_INT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:INT,OBJECT (./gimpmarshal.list:50) */
extern void gimp_marshal_VOID__INT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:INT,INT (./gimpmarshal.list:45) */
extern void gimp_cclosure_marshal_VOID__INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:INT,POINTER (./gimpmarshal.list:51) */
extern void gimp_marshal_VOID__INT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:INT,INT,INT (./gimpmarshal.list:46) */
extern void gimp_cclosure_marshal_VOID__INT_INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:INT,INT,INT,INT (./gimpmarshal.list:47) */
extern void gimp_cclosure_marshal_VOID__INT_INT_INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:INT,OBJECT (./gimpmarshal.list:48) */
extern void gimp_cclosure_marshal_VOID__INT_OBJECT (GClosure *closure,
/* VOID:INT,POINTER,POINTER (./gimpmarshal.list:52) */
extern void gimp_marshal_VOID__INT_POINTER_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:INT,POINTER (./gimpmarshal.list:49) */
extern void gimp_cclosure_marshal_VOID__INT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:OBJECT (./gimpmarshal.list:53) */
#define gimp_marshal_VOID__OBJECT g_cclosure_marshal_VOID__OBJECT
/* VOID:INT,POINTER,POINTER (./gimpmarshal.list:50) */
extern void gimp_cclosure_marshal_VOID__INT_POINTER_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:OBJECT,INT (./gimpmarshal.list:54) */
extern void gimp_marshal_VOID__OBJECT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:OBJECT,INT (./gimpmarshal.list:51) */
extern void gimp_cclosure_marshal_VOID__OBJECT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:OBJECT,INT,POINTER (./gimpmarshal.list:55) */
extern void gimp_marshal_VOID__OBJECT_INT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:OBJECT,INT,POINTER (./gimpmarshal.list:52) */
extern void gimp_cclosure_marshal_VOID__OBJECT_INT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:OBJECT,POINTER (./gimpmarshal.list:56) */
extern void gimp_marshal_VOID__OBJECT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:OBJECT,POINTER (./gimpmarshal.list:53) */
extern void gimp_cclosure_marshal_VOID__OBJECT_POINTER (GClosure *closure,
/* VOID:POINTER (./gimpmarshal.list:57) */
#define gimp_marshal_VOID__POINTER g_cclosure_marshal_VOID__POINTER
/* VOID:POINTER,INT (./gimpmarshal.list:58) */
extern void gimp_marshal_VOID__POINTER_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:POINTER,INT,OBJECT (./gimpmarshal.list:59) */
extern void gimp_marshal_VOID__POINTER_INT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:POINTER,OBJECT (./gimpmarshal.list:60) */
extern void gimp_marshal_VOID__POINTER_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:POINTER,POINTER (./gimpmarshal.list:61) */
extern void gimp_marshal_VOID__POINTER_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:POINTER,UINT,INT,OBJECT (./gimpmarshal.list:62) */
extern void gimp_marshal_VOID__POINTER_UINT_INT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:POINTER,INT (./gimpmarshal.list:54) */
extern void gimp_cclosure_marshal_VOID__POINTER_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:UINT (./gimpmarshal.list:63) */
#define gimp_marshal_VOID__UINT g_cclosure_marshal_VOID__UINT
/* VOID:POINTER,INT,OBJECT (./gimpmarshal.list:55) */
extern void gimp_cclosure_marshal_VOID__POINTER_INT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:POINTER,OBJECT (./gimpmarshal.list:56) */
extern void gimp_cclosure_marshal_VOID__POINTER_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:POINTER,POINTER (./gimpmarshal.list:57) */
extern void gimp_cclosure_marshal_VOID__POINTER_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:POINTER,UINT,INT,OBJECT (./gimpmarshal.list:58) */
extern void gimp_cclosure_marshal_VOID__POINTER_UINT_INT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:VOID (./gimpmarshal.list:64) */
#define gimp_marshal_VOID__VOID g_cclosure_marshal_VOID__VOID
G_END_DECLS
#endif /* __GIMP_MARSHAL_H__ */
#endif /* __gimp_marshal_MARSHAL_H__ */

6
app/core/gimpmarshal.list
View File

@ -41,6 +41,8 @@ POINTER: POINTER, INT, INT
POINTER: VOID
VOID: DOUBLE
VOID: ENUM
VOID: INT
VOID: INT, BOOLEAN, INT, OBJECT
VOID: INT, INT
VOID: INT, INT, INT
@ -48,11 +50,15 @@ VOID: INT, INT, INT, INT
VOID: INT, OBJECT
VOID: INT, POINTER
VOID: INT, POINTER, POINTER
VOID: OBJECT
VOID: OBJECT, INT
VOID: OBJECT, INT, POINTER
VOID: OBJECT, POINTER
VOID: POINTER
VOID: POINTER, INT
VOID: POINTER, INT, OBJECT
VOID: POINTER, OBJECT
VOID: POINTER, POINTER
VOID: POINTER, UINT, INT, OBJECT
VOID: UINT
VOID: VOID

3
app/core/gimpmoduleinfo.c
View File

@ -29,6 +29,7 @@
#include "core-types.h"
#include "gimpmarshal.h"
#include "gimpmoduleinfo.h"
#include "libgimp/gimpintl.h"
@ -95,7 +96,7 @@ gimp_module_info_class_init (GimpModuleInfoObjClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpModuleInfoObjClass, modified),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
object_class->finalize = gimp_module_info_finalize;

2
app/core/gimpmoduleinfo.h
View File

@ -83,7 +83,7 @@ struct _GimpModuleInfoObjClass
};
GType gimp_module_info_get_type (void);
GType gimp_module_info_get_type (void) G_GNUC_CONST;
GimpModuleInfoObj * gimp_module_info_new (const gchar *filename);

5
app/core/gimpobject.c
View File

@ -24,6 +24,7 @@
#include "core-types.h"
#include "gimpmarshal.h"
#include "gimpobject.h"
@ -105,7 +106,7 @@ gimp_object_class_init (GimpObjectClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpObjectClass, disconnect),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
object_signals[NAME_CHANGED] =
@ -114,7 +115,7 @@ gimp_object_class_init (GimpObjectClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpObjectClass, name_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
object_class->dispose = gimp_object_dispose;

2
app/core/gimpobject.h
View File

@ -46,7 +46,7 @@ struct _GimpObjectClass
};
GType gimp_object_get_type (void);
GType gimp_object_get_type (void) G_GNUC_CONST;
void gimp_object_set_name (GimpObject *object,
const gchar *name);

2
app/core/gimppalette.h
View File

@ -64,7 +64,7 @@ struct _GimpPaletteClass
};
GType gimp_palette_get_type (void);
GType gimp_palette_get_type (void) G_GNUC_CONST;
GimpData * gimp_palette_new (const gchar *name);
GimpData * gimp_palette_get_standard (void);

5
app/core/gimpparasitelist.c
View File

@ -25,6 +25,7 @@
#include "core-types.h"
#include "gimpmarshal.h"
#include "gimpparasitelist.h"
@ -94,7 +95,7 @@ gimp_parasite_list_class_init (GimpParasiteListClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpParasiteListClass, add),
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
gimp_marshal_VOID__POINTER,
G_TYPE_NONE, 1,
G_TYPE_POINTER);
@ -104,7 +105,7 @@ gimp_parasite_list_class_init (GimpParasiteListClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpParasiteListClass, remove),
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
gimp_marshal_VOID__POINTER,
G_TYPE_NONE, 1,
G_TYPE_POINTER);

2
app/core/gimpparasitelist.h
View File

@ -50,7 +50,7 @@ struct _GimpParasiteListClass
};
GType gimp_parasite_list_get_type (void);
GType gimp_parasite_list_get_type (void) G_GNUC_CONST;
GimpParasiteList * gimp_parasite_list_new (void);
GimpParasiteList * gimp_parasite_list_copy (const GimpParasiteList *list);

2
app/core/gimppattern.h
View File

@ -49,7 +49,7 @@ struct _GimpPatternClass
};
GType gimp_pattern_get_type (void);
GType gimp_pattern_get_type (void) G_GNUC_CONST;
GimpData * gimp_pattern_new (const gchar *name);
GimpData * gimp_pattern_get_standard (void);

36
app/core/gimpprojection-construct.c
View File

@ -240,7 +240,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, mode_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[ALPHA_CHANGED] =
@ -249,7 +249,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, alpha_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[FLOATING_SELECTION_CHANGED] =
@ -258,7 +258,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, floating_selection_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[ACTIVE_LAYER_CHANGED] =
@ -267,7 +267,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, active_layer_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[ACTIVE_CHANNEL_CHANGED] =
@ -276,7 +276,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, active_channel_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[COMPONENT_VISIBILITY_CHANGED] =
@ -285,7 +285,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, component_visibility_changed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -295,7 +295,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, component_active_changed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -305,7 +305,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, mask_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[RESOLUTION_CHANGED] =
@ -314,7 +314,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, resolution_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[UNIT_CHANGED] =
@ -323,7 +323,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, unit_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[QMASK_CHANGED] =
@ -332,7 +332,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, qmask_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[SELECTION_CONTROL] =
@ -341,7 +341,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, selection_control),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -351,7 +351,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, clean),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[DIRTY] =
@ -360,7 +360,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, dirty),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[UPDATE] =
@ -369,7 +369,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, update),
NULL, NULL,
gimp_cclosure_marshal_VOID__INT_INT_INT_INT,
gimp_marshal_VOID__INT_INT_INT_INT,
G_TYPE_NONE, 4,
G_TYPE_INT,
G_TYPE_INT,
@ -382,7 +382,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, update_guide),
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
gimp_marshal_VOID__POINTER,
G_TYPE_NONE, 1,
G_TYPE_POINTER);
@ -392,7 +392,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, colormap_changed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -402,7 +402,7 @@ gimp_image_class_init (GimpImageClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, undo_event),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
gimp_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);

2
app/core/gimpprojection-construct.h
View File

@ -166,7 +166,7 @@ struct _GimpImageClass
/* function declarations */
GType gimp_image_get_type (void);
GType gimp_image_get_type (void) G_GNUC_CONST;
GimpImage * gimp_image_new (Gimp *gimp,
gint width,

2
app/core/gimpprojection.h
View File

@ -109,7 +109,7 @@ struct _GimpDisplayClass
};
GType gimp_display_get_type (void);
GType gimp_display_get_type (void) G_GNUC_CONST;
GimpDisplay * gimp_display_new (GimpImage *gimage,
guint scale);

2
app/core/gimptoolinfo.h
View File

@ -67,7 +67,7 @@ struct _GimpToolInfoClass
};
GType gimp_tool_info_get_type (void);
GType gimp_tool_info_get_type (void) G_GNUC_CONST;
GimpToolInfo * gimp_tool_info_new (Gimp *gimp,
GimpContext *context,

5
app/core/gimpundo.c
View File

@ -25,6 +25,7 @@
#include "base/temp-buf.h"
#include "gimpimage.h"
#include "gimpmarshal.h"
#include "gimpundo.h"
@ -100,7 +101,7 @@ gimp_undo_class_init (GimpUndoClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpUndoClass, push),
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
gimp_marshal_VOID__POINTER,
G_TYPE_NONE, 1,
G_TYPE_POINTER);
@ -110,7 +111,7 @@ gimp_undo_class_init (GimpUndoClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpUndoClass, pop),
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
gimp_marshal_VOID__POINTER,
G_TYPE_NONE, 1,
G_TYPE_POINTER);

2
app/core/gimpundo.h
View File

@ -62,7 +62,7 @@ struct _GimpUndoClass
};
GType gimp_undo_get_type (void);
GType gimp_undo_get_type (void) G_GNUC_CONST;
GimpUndo * gimp_undo_new (const gchar *name,
gpointer data,
glong size,

2
app/core/gimpundostack.h
View File

@ -47,7 +47,7 @@ struct _GimpUndoStackClass
};
GType gimp_undo_stack_get_type (void);
GType gimp_undo_stack_get_type (void) G_GNUC_CONST;
GimpUndoStack * gimp_undo_stack_new (GimpImage *gimage);

4
app/core/gimpviewable.c
View File

@ -89,7 +89,7 @@ gimp_viewable_class_init (GimpViewableClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpViewableClass, invalidate_preview),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
viewable_signals[SIZE_CHANGED] =
@ -98,7 +98,7 @@ gimp_viewable_class_init (GimpViewableClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpViewableClass, size_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
klass->invalidate_preview = gimp_viewable_real_invalidate_preview;

2
app/core/gimpviewable.h
View File

@ -59,7 +59,7 @@ struct _GimpViewableClass
};
GType gimp_viewable_get_type (void);
GType gimp_viewable_get_type (void) G_GNUC_CONST;
void gimp_viewable_invalidate_preview (GimpViewable *viewable);
void gimp_viewable_size_changed (GimpViewable *viewable);

4
app/dialogs/about-dialog.c
View File

@ -352,7 +352,7 @@ about_dialog_load_logo (GtkWidget *window)
count = fread (pixelrow, sizeof (guchar), logo_width * 3, fp);
if (count != (logo_width * 3))
{
gtk_widget_destroy (preview);
gtk_object_sink (GTK_OBJECT (preview));
g_free (pixelrow);
fclose (fp);
return FALSE;
@ -370,7 +370,7 @@ about_dialog_load_logo (GtkWidget *window)
0, 0, 0, 0, logo_width, logo_height);
gdk_gc_unref (gc);
gtk_widget_unref (preview);
gtk_object_sink (GTK_OBJECT (preview));
g_free (pixelrow);
fclose (fp);

27
app/dialogs/tips-dialog.c
View File

@ -36,8 +36,6 @@
#include "libgimp/gimpintl.h"
#include "pixmaps/wilber3.xpm"
#define TIPS_DIR_NAME "tips"
@ -67,9 +65,9 @@ tips_dialog_create (void)
GtkWidget *vbox2;
GtkWidget *hbox;
GtkWidget *bbox;
GtkWidget *frame;
GtkWidget *pixmap;
GtkWidget *button;
GdkPixbuf *wilber;
gchar *filename;
if (tips_count == 0)
{
@ -125,14 +123,21 @@ tips_dialog_create (void)
gtk_box_pack_end (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
gtk_widget_show (vbox2);
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
gtk_box_pack_start (GTK_BOX (vbox2), frame, TRUE, FALSE, 0);
gtk_widget_show (frame);
filename = g_build_filename (gimp_data_directory(),
"images", "tips_wilber.png", NULL);
wilber = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename);
pixmap = gimp_pixmap_new (wilber3_xpm);
gtk_container_add (GTK_CONTAINER (frame), pixmap);
gtk_widget_show (pixmap);
if (wilber)
{
GtkWidget *image;
image = gtk_image_new_from_pixbuf (wilber);
g_object_unref (wilber);
gtk_box_pack_start (GTK_BOX (vbox2), image, TRUE, FALSE, 0);
gtk_widget_show (image);
}
hbox = gtk_hbox_new (FALSE, 15);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);

2
app/display/gimpdisplay.h
View File

@ -109,7 +109,7 @@ struct _GimpDisplayClass
};
GType gimp_display_get_type (void);
GType gimp_display_get_type (void) G_GNUC_CONST;
GimpDisplay * gimp_display_new (GimpImage *gimage,
guint scale);

2
app/display/gimpdisplayshell-draw.h
View File

@ -130,7 +130,7 @@ struct _GimpDisplayShellClass
};
GType gimp_display_shell_get_type (void);
GType gimp_display_shell_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_display_shell_new (GimpDisplay *gdisp);

2
app/display/gimpdisplayshell.h
View File

@ -130,7 +130,7 @@ struct _GimpDisplayShellClass
};
GType gimp_display_shell_get_type (void);
GType gimp_display_shell_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_display_shell_new (GimpDisplay *gdisp);

8
app/gimprc.c
View File

@ -647,7 +647,7 @@ save_gimprc_strings (const gchar *token,
fprintf (fp_new, "#- Next line modified %s\n",
timestamp);
}
str = gimp_strescape (value, NULL);
str = g_strescape (value, NULL);
if (!found)
{
fprintf (fp_new, "(%s \"%s\")\n", token, str);
@ -681,7 +681,7 @@ save_gimprc_strings (const gchar *token,
{
fprintf (fp_new, "#- Next line added %s\n",
timestamp);
str = gimp_strescape (value, NULL);
str = g_strescape (value, NULL);
fprintf (fp_new, "(%s \"%s\")\n\n", token, str);
g_free (str);
}
@ -2905,7 +2905,7 @@ static inline gchar *
string_to_str (gpointer val1p,
gpointer val2p)
{
gchar *str = gimp_strescape (*((char **)val1p), NULL);
gchar *str = g_strescape (*((char **)val1p), NULL);
gchar *retval;
retval = g_strdup_printf ("%c%s%c", '"', str, '"');
@ -3093,7 +3093,7 @@ comment_to_str (gpointer val1p,
{
gchar **str_array;
gchar *retval;
gchar *str = gimp_strescape (*((gchar **) val1p), NULL);
gchar *str = g_strescape (*((gchar **) val1p), NULL);
str_array = g_strsplit (str, "\n", 0);
g_free (str);

4
app/gui/about-dialog.c
View File

@ -352,7 +352,7 @@ about_dialog_load_logo (GtkWidget *window)
count = fread (pixelrow, sizeof (guchar), logo_width * 3, fp);
if (count != (logo_width * 3))
{
gtk_widget_destroy (preview);
gtk_object_sink (GTK_OBJECT (preview));
g_free (pixelrow);
fclose (fp);
return FALSE;
@ -370,7 +370,7 @@ about_dialog_load_logo (GtkWidget *window)
0, 0, 0, 0, logo_width, logo_height);
gdk_gc_unref (gc);
gtk_widget_unref (preview);
gtk_object_sink (GTK_OBJECT (preview));
g_free (pixelrow);
fclose (fp);

3
app/gui/colormap-dialog.c
View File

@ -33,6 +33,7 @@
#include "core/gimpcontainer.h"
#include "core/gimpimage.h"
#include "core/gimpmarshal.h"
#include "display/gimpdisplayshell-render.h"
@ -168,7 +169,7 @@ gimp_colormap_dialog_class_init (GimpColormapDialogClass* klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpColormapDialogClass, selected),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
klass->selected = NULL;

2
app/gui/colormap-dialog.h
View File

@ -63,7 +63,7 @@ struct _GimpColormapDialogClass
};
GType gimp_colormap_dialog_get_type (void);
GType gimp_colormap_dialog_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_colormap_dialog_new (GimpImage *gimage);

4
app/gui/menus.c
View File

@ -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)

300
app/gui/splash.c
View File

@ -23,46 +23,19 @@
#include <gtk/gtk.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "splash.h"
#include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "libgimp/gimpintl.h"
enum
{
SPLASH_SHOW_LOGO_NEVER,
SPLASH_SHOW_LOGO_LATER,
SPLASH_SHOW_LOGO_NOW
};
#define LOGO_WIDTH_MIN 300
#define LOGO_HEIGHT_MIN 110
static gboolean splash_logo_load_size (GtkWidget *window);
static void splash_logo_draw (GtkWidget *widget);
static void splash_text_draw (GtkWidget *widget);
static void splash_logo_expose (GtkWidget *widget);
static gint splash_show_logo = SPLASH_SHOW_LOGO_NEVER;
static GtkWidget *logo_area = NULL;
static GdkPixmap *logo_pixmap = NULL;
static gint logo_width = 0;
static gint logo_height = 0;
static gint logo_area_width = 0;
static gint logo_area_height = 0;
static PangoLayout *logo_layout = NULL;
#define DEFAULT_WIDTH 300
static gint max_label_length = 1024;
static GtkWidget *win_initstatus = NULL;
static GtkWidget *label1 = NULL;
static GtkWidget *label2 = NULL;
@ -75,9 +48,10 @@ void
splash_create (gboolean show_image)
{
GtkWidget *vbox;
GtkWidget *logo_hbox;
GdkPixbuf *pixbuf = NULL;
PangoFontMetrics *metrics;
PangoContext *context;
gint width;
gint char_width;
win_initstatus = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@ -91,43 +65,63 @@ splash_create (gboolean show_image)
gimp_dialog_set_icon (GTK_WINDOW (win_initstatus));
if (show_image && splash_logo_load_size (win_initstatus))
{
splash_show_logo = SPLASH_SHOW_LOGO_LATER;
}
vbox = gtk_vbox_new (FALSE, 4);
gtk_container_add (GTK_CONTAINER (win_initstatus), vbox);
gtk_widget_show (vbox);
logo_hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), logo_hbox, FALSE, TRUE, 0);
if (show_image)
{
gchar *filename;
logo_area = gtk_drawing_area_new ();
filename = g_build_filename (gimp_data_directory (),
"images", "gimp_splash.png", NULL);
pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename);
if (pixbuf)
{
GtkWidget *align;
GtkWidget *image;
g_signal_connect (G_OBJECT (logo_area), "expose_event",
G_CALLBACK (splash_logo_expose),
NULL);
image = gtk_image_new_from_pixbuf (pixbuf);
g_object_unref (pixbuf);
logo_area_width = MAX (logo_width, LOGO_WIDTH_MIN);
logo_area_height = MAX (logo_height, LOGO_HEIGHT_MIN);
align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, TRUE, 0);
gtk_widget_show (align);
gtk_container_add (GTK_CONTAINER (align), image);
gtk_widget_show (image);
}
}
gtk_drawing_area_size (GTK_DRAWING_AREA (logo_area),
logo_area_width, logo_area_height);
gtk_box_pack_start (GTK_BOX(logo_hbox), logo_area, TRUE, FALSE, 0);
if (!pixbuf)
{
GtkWidget *line;
label1 = gtk_label_new (_("The GIMP"));
gtk_box_pack_start_defaults (GTK_BOX (vbox), label1);
gtk_widget_show (label1);
label2 = gtk_label_new (GIMP_VERSION);
gtk_box_pack_start_defaults (GTK_BOX (vbox), label2);
gtk_widget_show (label2);
line = gtk_hseparator_new ();
gtk_box_pack_start_defaults (GTK_BOX (vbox), line);
gtk_widget_show (line);
}
label1 = gtk_label_new ("");
gtk_box_pack_start_defaults (GTK_BOX (vbox), label1);
gtk_widget_show (label1);
label2 = gtk_label_new ("");
gtk_box_pack_start_defaults (GTK_BOX (vbox), label2);
gtk_widget_show (label2);
progress = gtk_progress_bar_new ();
gtk_box_pack_start_defaults (GTK_BOX (vbox), progress);
gtk_widget_show (vbox);
gtk_widget_show (logo_hbox);
gtk_widget_show (logo_area);
gtk_widget_show (label1);
gtk_widget_show (label2);
gtk_widget_show (progress);
/* This is a hack: we try to compute a good guess for the maximum
@ -141,12 +135,18 @@ splash_create (gboolean show_image)
char_width = pango_font_metrics_get_approximate_char_width (metrics);
pango_font_metrics_unref (metrics);
max_label_length = (0.9 * (gdouble) logo_area_width /
(gdouble) PANGO_PIXELS (char_width));
if (pixbuf)
{
width = gdk_pixbuf_get_width (pixbuf);
}
else
{
width = DEFAULT_WIDTH;
gtk_widget_set_size_request (win_initstatus, width, -1);
}
logo_layout = gtk_widget_create_pango_layout (logo_area, NULL);
g_object_weak_ref (G_OBJECT (win_initstatus),
(GWeakNotify) g_object_unref, logo_layout);
max_label_length =
0.9 * (gdouble) width / (gdouble) PANGO_PIXELS (char_width);
gtk_widget_show (win_initstatus);
}
@ -157,11 +157,7 @@ splash_destroy (void)
if (win_initstatus)
{
gtk_widget_destroy (win_initstatus);
if (logo_pixmap != NULL)
gdk_drawable_unref (logo_pixmap);
win_initstatus = label1 = label2 = progress = logo_area = NULL;
logo_pixmap = NULL;
win_initstatus = NULL;
}
}
@ -197,181 +193,5 @@ splash_update (const gchar *text1,
while (gtk_events_pending ())
gtk_main_iteration ();
/* We sync here to make sure things get drawn before continuing,
* is the improved look worth the time? I'm not sure...
*/
gdk_flush ();
}
}
/* private functions */
static gboolean
splash_logo_load_size (GtkWidget *window)
{
gchar buf[1024];
gchar *filename;
FILE *fp;
if (logo_pixmap)
return TRUE;
filename = g_build_filename (gimp_data_directory (), "images",
"gimp_splash.ppm", NULL);
fp = fopen (filename, "rb");
g_free (filename);
if (! fp)
return FALSE;
fgets (buf, sizeof (buf), fp);
if (strcmp (buf, "P6\n") != 0)
{
fclose (fp);
return FALSE;
}
fgets (buf, sizeof (buf), fp);
fgets (buf, sizeof (buf), fp);
sscanf (buf, "%d %d", &logo_width, &logo_height);
fclose (fp);
return TRUE;
}
void
splash_logo_load (void)
{
GtkWidget *preview;
GdkGC *gc;
gchar buf[1024];
gchar *filename;
guchar *pixelrow;
FILE *fp;
gint count;
gint i;
if (! win_initstatus || logo_pixmap || ! splash_show_logo)
return;
filename = g_build_filename (gimp_data_directory (), "images",
"gimp_splash.ppm", NULL);
fp = fopen (filename, "rb");
g_free (filename);
if (! fp)
return;
fgets (buf, sizeof (buf), fp);
if (strcmp (buf, "P6\n") != 0)
{
fclose (fp);
return;
}
fgets (buf, sizeof (buf), fp);
fgets (buf, sizeof (buf), fp);
sscanf (buf, "%d %d", &logo_width, &logo_height);
fgets (buf, sizeof (buf), fp);
if (strcmp (buf, "255\n") != 0)
{
fclose (fp);
return;
}
preview = gtk_preview_new (GTK_PREVIEW_COLOR);
gtk_preview_size (GTK_PREVIEW (preview), logo_width, logo_height);
pixelrow = g_new (guchar, logo_width * 3);
for (i = 0; i < logo_height; i++)
{
count = fread (pixelrow, sizeof (guchar), logo_width * 3, fp);
if (count != (logo_width * 3))
{
gtk_object_sink (GTK_OBJECT (preview));
g_free (pixelrow);
fclose (fp);
return;
}
gtk_preview_draw_row (GTK_PREVIEW (preview), pixelrow, 0, i, logo_width);
}
gtk_widget_realize (win_initstatus);
logo_pixmap = gdk_pixmap_new (win_initstatus->window,
logo_width, logo_height,
gtk_preview_get_visual ()->depth);
gc = gdk_gc_new (logo_pixmap);
gtk_preview_put (GTK_PREVIEW (preview),
logo_pixmap, gc,
0, 0, 0, 0, logo_width, logo_height);
gdk_gc_unref (gc);
gtk_object_sink (GTK_OBJECT (preview));
g_free (pixelrow);
fclose (fp);
splash_show_logo = SPLASH_SHOW_LOGO_NOW;
splash_logo_draw (logo_area);
}
static void
splash_text_draw (GtkWidget *widget)
{
gint width;
pango_layout_set_text (logo_layout, _("The GIMP"), -1);
pango_layout_get_pixel_size (logo_layout, &width, NULL);
gdk_draw_layout (widget->window,
widget->style->fg_gc[GTK_STATE_NORMAL],
(logo_area_width - width) / 2,
0.25 * logo_area_height,
logo_layout);
pango_layout_set_text (logo_layout, GIMP_VERSION, -1);
pango_layout_get_pixel_size (logo_layout, &width, NULL);
gdk_draw_layout (widget->window,
widget->style->fg_gc[GTK_STATE_NORMAL],
(logo_area_width - width) / 2,
0.45 * logo_area_height,
logo_layout);
}
static void
splash_logo_draw (GtkWidget *widget)
{
gdk_draw_drawable (widget->window,
widget->style->black_gc,
logo_pixmap,
0, 0,
((logo_area_width - logo_width) / 2),
((logo_area_height - logo_height) / 2),
logo_width, logo_height);
}
static void
splash_logo_expose (GtkWidget *widget)
{
switch (splash_show_logo)
{
case SPLASH_SHOW_LOGO_NEVER:
case SPLASH_SHOW_LOGO_LATER:
splash_text_draw (widget);
break;
case SPLASH_SHOW_LOGO_NOW:
splash_logo_draw (widget);
break;
}
}

1
app/gui/splash.h
View File

@ -21,7 +21,6 @@
void splash_create (gboolean show_image);
void splash_logo_load (void);
void splash_destroy (void);
void splash_update (const gchar *label1,

27
app/gui/tips-dialog.c
View File

@ -36,8 +36,6 @@
#include "libgimp/gimpintl.h"
#include "pixmaps/wilber3.xpm"
#define TIPS_DIR_NAME "tips"
@ -67,9 +65,9 @@ tips_dialog_create (void)
GtkWidget *vbox2;
GtkWidget *hbox;
GtkWidget *bbox;
GtkWidget *frame;
GtkWidget *pixmap;
GtkWidget *button;
GdkPixbuf *wilber;
gchar *filename;
if (tips_count == 0)
{
@ -125,14 +123,21 @@ tips_dialog_create (void)
gtk_box_pack_end (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
gtk_widget_show (vbox2);
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
gtk_box_pack_start (GTK_BOX (vbox2), frame, TRUE, FALSE, 0);
gtk_widget_show (frame);
filename = g_build_filename (gimp_data_directory(),
"images", "tips_wilber.png", NULL);
wilber = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename);
pixmap = gimp_pixmap_new (wilber3_xpm);
gtk_container_add (GTK_CONTAINER (frame), pixmap);
gtk_widget_show (pixmap);
if (wilber)
{
GtkWidget *image;
image = gtk_image_new_from_pixbuf (wilber);
g_object_unref (wilber);
gtk_box_pack_start (GTK_BOX (vbox2), image, TRUE, FALSE, 0);
gtk_widget_show (image);
}
hbox = gtk_hbox_new (FALSE, 15);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);

4
app/menus/menus.c
View File

@ -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)

2
app/paint/gimpairbrush.h
View File

@ -48,7 +48,7 @@ struct _GimpAirbrushToolClass
void gimp_airbrush_tool_register (Gimp *gimp,
GimpToolRegisterCallback callback);
GType gimp_airbrush_tool_get_type (void);
GType gimp_airbrush_tool_get_type (void) G_GNUC_CONST;
gboolean airbrush_non_gui (GimpDrawable *drawable,

2
app/paint/gimpclone.h
View File

@ -55,7 +55,7 @@ struct _GimpCloneToolClass
void gimp_clone_tool_register (Gimp *gimp,
GimpToolRegisterCallback callback);
GType gimp_clone_tool_get_type (void);
GType gimp_clone_tool_get_type (void) G_GNUC_CONST;
/* FIXME: Old style functions in need of a replacement. The only

2
app/paint/gimpconvolve.h
View File

@ -56,7 +56,7 @@ struct _GimpConvolveToolClass
void gimp_convolve_tool_register (Gimp *gimp,
GimpToolRegisterCallback callback);
GType gimp_convolve_tool_get_type (void);
GType gimp_convolve_tool_get_type (void) G_GNUC_CONST;
/* FIXME: These need to disappear */

2
app/paint/gimpdodgeburn.h
View File

@ -54,7 +54,7 @@ struct _GimpDodgeBurnToolClass
void gimp_dodgeburn_tool_register (Gimp *gimp,
GimpToolRegisterCallback callback);
GType gimp_dodgeburn_tool_get_type (void);
GType gimp_dodgeburn_tool_get_type (void) G_GNUC_CONST;
gboolean gimp_dodgeburn_tool_non_gui (GimpDrawable *drawable,

2
app/paint/gimperaser.h
View File

@ -48,7 +48,7 @@ struct _GimpEraserToolClass
void gimp_eraser_tool_register (Gimp *gimp,
GimpToolRegisterCallback callback);
GType gimp_eraser_tool_get_type (void);
GType gimp_eraser_tool_get_type (void) G_GNUC_CONST;
gboolean eraser_non_gui (GimpDrawable *drawable,

2
app/paint/gimpink.h
View File

@ -71,7 +71,7 @@ struct _GimpInkToolClass
void gimp_ink_tool_register (Gimp *gimp,
GimpToolRegisterCallback callback);
GType gimp_ink_tool_get_type (void);
GType gimp_ink_tool_get_type (void) G_GNUC_CONST;
#endif /* __GIMP_INK_TOOL_H__ */

2
app/paint/gimppaintbrush.h
View File

@ -48,7 +48,7 @@ struct _GimpPaintbrushToolClass
void gimp_paintbrush_tool_register (Gimp *gimp,
GimpToolRegisterCallback callback);
GType gimp_paintbrush_tool_get_type (void);
GType gimp_paintbrush_tool_get_type (void) G_GNUC_CONST;
gboolean gimp_paintbrush_tool_non_gui (GimpDrawable *drawable,

2
app/paint/gimppaintcore.h
View File

@ -111,7 +111,7 @@ struct _PaintUndo
};
GType gimp_paint_tool_get_type (void);
GType gimp_paint_tool_get_type (void) G_GNUC_CONST;
void gimp_paint_tool_paint (GimpPaintTool *tool,
GimpDrawable *drawable,

2
app/paint/gimppencil.h
View File

@ -51,7 +51,7 @@ struct _GimpPencilToolClass
void gimp_pencil_tool_register (Gimp *gimp,
GimpToolRegisterCallback callback);
GType gimp_pencil_tool_get_type (void);
GType gimp_pencil_tool_get_type (void) G_GNUC_CONST;
/* FIXME: Get rid of this non_gui stuff someday. Preferably make

2
app/paint/gimpsmudge.h
View File

@ -55,7 +55,7 @@ struct _GimpSmudgeToolClass
void gimp_smudge_tool_register (Gimp *gimp,
GimpToolRegisterCallback callback);
GType gimp_smudge_tool_get_type (void);
GType gimp_smudge_tool_get_type (void) G_GNUC_CONST;
/* FIXME: this antique code doesn't follow the coding style */

2
app/paint/gimpsourcecore.h
View File

@ -55,7 +55,7 @@ struct _GimpCloneToolClass
void gimp_clone_tool_register (Gimp *gimp,
GimpToolRegisterCallback callback);
GType gimp_clone_tool_get_type (void);
GType gimp_clone_tool_get_type (void) G_GNUC_CONST;
/* FIXME: Old style functions in need of a replacement. The only

2
app/tools/gimpairbrushtool.h
View File

@ -48,7 +48,7 @@ struct _GimpAirbrushToolClass
void gimp_airbrush_tool_register (Gimp *gimp,
GimpToolRegisterCallback callback);
GType gimp_airbrush_tool_get_type (void);
GType gimp_airbrush_tool_get_type (void) G_GNUC_CONST;
gboolean airbrush_non_gui (GimpDrawable *drawable,

2
app/tools/gimpbezierselecttool.h
View File

@ -108,7 +108,7 @@ typedef struct
void gimp_bezier_select_tool_register (Gimp *gimp,
GimpToolRegisterCallback callback);
GType gimp_bezier_select_tool_get_type (void);
GType gimp_bezier_select_tool_get_type (void) G_GNUC_CONST;
gboolean bezier_tool_selected (void);

2
app/tools/gimpblendtool.h
View File

@ -55,7 +55,7 @@ struct _GimpBlendToolClass
void gimp_blend_tool_register (Gimp *gimp,
GimpToolRegisterCallback callback);
GType gimp_blend_tool_get_type (void);
GType gimp_blend_tool_get_type (void) G_GNUC_CONST;
#endif /* __GIMP_BLEND_TOOL_H__ */

2
app/tools/gimpbrightnesscontrasttool.h
View File

@ -48,7 +48,7 @@ struct _GimpBrightnessContrastToolClass
void gimp_brightness_contrast_tool_register (Gimp *gimp,
GimpToolRegisterCallback callback);
GType gimp_brightness_contrast_tool_get_type (void);
GType gimp_brightness_contrast_tool_get_type (void) G_GNUC_CONST;
#endif /* __GIMP_BRIGHTNESS_CONTRAST_TOOL_H__ */

2
app/tools/gimpbrushtool.h
View File

@ -111,7 +111,7 @@ struct _PaintUndo
};
GType gimp_paint_tool_get_type (void);
GType gimp_paint_tool_get_type (void) G_GNUC_CONST;
void gimp_paint_tool_paint (GimpPaintTool *tool,
GimpDrawable *drawable,

2
app/tools/gimpbucketfilltool.h
View File

@ -51,7 +51,7 @@ struct _GimpBucketFillToolClass
void gimp_bucket_fill_tool_register (Gimp *gimp,
GimpToolRegisterCallback callback);
GType gimp_bucket_fill_tool_get_type (void);
GType gimp_bucket_fill_tool_get_type (void) G_GNUC_CONST;
#endif /* __GIMP_BUCKET_FILL_TOOL_H__ */

Some files were not shown because too many files have changed in this diff Show More