diff --git a/app/core/gimpasync.c b/app/core/gimpasync.c index 322d57d317..0ed2708e4d 100644 --- a/app/core/gimpasync.c +++ b/app/core/gimpasync.c @@ -156,8 +156,7 @@ gimp_async_class_init (GimpAsyncClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpAsyncClass, waiting), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->finalize = gimp_async_finalize; diff --git a/app/core/gimpauxitem.c b/app/core/gimpauxitem.c index 5844a706a9..47562f835e 100644 --- a/app/core/gimpauxitem.c +++ b/app/core/gimpauxitem.c @@ -70,8 +70,7 @@ gimp_aux_item_class_init (GimpAuxItemClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpAuxItemClass, removed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->get_property = gimp_aux_item_get_property; diff --git a/app/core/gimpbrush.c b/app/core/gimpbrush.c index 8e151158ed..975b74487d 100644 --- a/app/core/gimpbrush.c +++ b/app/core/gimpbrush.c @@ -37,7 +37,6 @@ #include "gimpbrushcache.h" #include "gimpbrushgenerated.h" #include "gimpbrushpipe.h" -#include "gimpmarshal.h" #include "gimptagged.h" #include "gimptempbuf.h" @@ -122,8 +121,7 @@ gimp_brush_class_init (GimpBrushClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpBrushClass, spacing_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->finalize = gimp_brush_finalize; diff --git a/app/core/gimpchannel.c b/app/core/gimpchannel.c index 6ec93d3c12..1d97da764d 100644 --- a/app/core/gimpchannel.c +++ b/app/core/gimpchannel.c @@ -228,8 +228,7 @@ gimp_channel_class_init (GimpChannelClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpChannelClass, color_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->finalize = gimp_channel_finalize; diff --git a/app/core/gimpdata.c b/app/core/gimpdata.c index 8bbe2f5ae0..52e5bb53f0 100644 --- a/app/core/gimpdata.c +++ b/app/core/gimpdata.c @@ -131,8 +131,7 @@ gimp_data_class_init (GimpDataClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpDataClass, dirty), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->constructed = gimp_data_constructed; diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c index 43620b052f..6d9af71813 100644 --- a/app/core/gimpdrawable.c +++ b/app/core/gimpdrawable.c @@ -251,8 +251,7 @@ gimp_drawable_class_init (GimpDrawableClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpDrawableClass, format_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_drawable_signals[ALPHA_CHANGED] = @@ -260,8 +259,7 @@ gimp_drawable_class_init (GimpDrawableClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpDrawableClass, alpha_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_drawable_signals[BOUNDING_BOX_CHANGED] = @@ -269,8 +267,7 @@ gimp_drawable_class_init (GimpDrawableClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpDrawableClass, bounding_box_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->dispose = gimp_drawable_dispose; diff --git a/app/core/gimpdrawablefilter.c b/app/core/gimpdrawablefilter.c index dad6934390..357e173431 100644 --- a/app/core/gimpdrawablefilter.c +++ b/app/core/gimpdrawablefilter.c @@ -45,7 +45,6 @@ #include "gimpdrawablefilter.h" #include "gimpimage.h" #include "gimplayer.h" -#include "gimpmarshal.h" #include "gimpprogress.h" @@ -154,8 +153,7 @@ gimp_drawable_filter_class_init (GimpDrawableFilterClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpDrawableFilterClass, flush), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->dispose = gimp_drawable_filter_dispose; diff --git a/app/core/gimpextensionmanager.c b/app/core/gimpextensionmanager.c index e32eab5f17..ba5b232914 100644 --- a/app/core/gimpextensionmanager.c +++ b/app/core/gimpextensionmanager.c @@ -208,8 +208,7 @@ gimp_extension_manager_class_init (GimpExtensionManagerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpExtensionManagerClass, extension_removed), - NULL, NULL, - gimp_marshal_VOID__STRING, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRING); } diff --git a/app/core/gimpfilter.c b/app/core/gimpfilter.c index e776cd8f6a..d0a6cf343a 100644 --- a/app/core/gimpfilter.c +++ b/app/core/gimpfilter.c @@ -97,8 +97,7 @@ gimp_filter_class_init (GimpFilterClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpFilterClass, active_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->finalize = gimp_filter_finalize; diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c index 6682ebd117..4e57daad9f 100644 --- a/app/core/gimpimage.c +++ b/app/core/gimpimage.c @@ -352,8 +352,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, linked_items_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_image_signals[COMPONENT_VISIBILITY_CHANGED] = @@ -408,8 +407,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, unit_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_image_signals[QUICK_MASK_CHANGED] = @@ -417,8 +415,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, quick_mask_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_image_signals[SELECTION_INVALIDATE] = @@ -426,8 +423,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, selection_invalidate), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_image_signals[CLEAN] = @@ -435,8 +431,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, clean), - NULL, NULL, - gimp_marshal_VOID__FLAGS, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_DIRTY_MASK); @@ -445,8 +440,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, dirty), - NULL, NULL, - gimp_marshal_VOID__FLAGS, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_DIRTY_MASK); @@ -455,8 +449,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, saving), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_image_signals[SAVED] = @@ -464,8 +457,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, saved), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_FILE); @@ -474,8 +466,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, exported), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_FILE); @@ -484,8 +475,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, guide_added), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_GUIDE); @@ -494,8 +484,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, guide_removed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_GUIDE); @@ -504,8 +493,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, guide_moved), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_GUIDE); @@ -514,8 +502,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, sample_point_added), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_SAMPLE_POINT); @@ -524,8 +511,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, sample_point_removed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_SAMPLE_POINT); @@ -534,8 +520,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, sample_point_moved), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_SAMPLE_POINT); @@ -544,8 +529,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, parasite_attached), - NULL, NULL, - g_cclosure_marshal_VOID__STRING, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRING); @@ -554,8 +538,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, parasite_detached), - NULL, NULL, - g_cclosure_marshal_VOID__STRING, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRING); @@ -564,8 +547,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, colormap_changed), - NULL, NULL, - gimp_marshal_VOID__INT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_INT); diff --git a/app/core/gimpimagefile.c b/app/core/gimpimagefile.c index 5517551b5d..d698b9f246 100644 --- a/app/core/gimpimagefile.c +++ b/app/core/gimpimagefile.c @@ -136,8 +136,7 @@ gimp_imagefile_class_init (GimpImagefileClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImagefileClass, info_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->dispose = gimp_imagefile_dispose; diff --git a/app/core/gimplineart.c b/app/core/gimplineart.c index 0cd6192f46..ea28b6121d 100644 --- a/app/core/gimplineart.c +++ b/app/core/gimplineart.c @@ -318,16 +318,14 @@ gimp_line_art_class_init (GimpLineArtClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpLineArtClass, computing_start), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_line_art_signals[COMPUTING_END] = g_signal_new ("computing-end", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpLineArtClass, computing_end), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->finalize = gimp_line_art_finalize; diff --git a/app/core/gimpmarshal.list b/app/core/gimpmarshal.list index 2fb5fb6851..096a7fb371 100644 --- a/app/core/gimpmarshal.list +++ b/app/core/gimpmarshal.list @@ -34,42 +34,31 @@ BOOLEAN: STRING, FLAGS INT: DOUBLE -VOID: BOOLEAN VOID: BOOLEAN, INT, INT, INT, INT -VOID: BOXED VOID: BOXED, ENUM -VOID: DOUBLE VOID: DOUBLE, DOUBLE VOID: DOUBLE, DOUBLE, DOUBLE, DOUBLE -VOID: ENUM VOID: ENUM, DOUBLE VOID: ENUM, INT VOID: ENUM, INT, BOOLEAN VOID: ENUM, OBJECT VOID: ENUM, POINTER -VOID: FLAGS -VOID: INT VOID: INT, BOOLEAN VOID: INT, INT VOID: INT, INT, INT, INT VOID: INT, INT, BOOLEAN, BOOLEAN VOID: INT, OBJECT -VOID: OBJECT VOID: OBJECT, BOOLEAN VOID: OBJECT, INT VOID: OBJECT, OBJECT VOID: OBJECT, POINTER VOID: OBJECT, STRING, STRING -VOID: POINTER VOID: POINTER, BOXED VOID: POINTER, ENUM VOID: POINTER, FLAGS, BOOLEAN VOID: POINTER, OBJECT, ENUM, POINTER, POINTER, BOXED VOID: POINTER, UINT, FLAGS -VOID: STRING VOID: STRING, BOOLEAN, UINT, FLAGS VOID: STRING, DOUBLE, STRING, DOUBLE, STRING VOID: STRING, FLAGS VOID: STRING, STRING, STRING -VOID: VARIANT -VOID: VOID diff --git a/app/core/gimpparasitelist.c b/app/core/gimpparasitelist.c index 70a81fae42..e71e711c60 100644 --- a/app/core/gimpparasitelist.c +++ b/app/core/gimpparasitelist.c @@ -88,8 +88,7 @@ gimp_parasite_list_class_init (GimpParasiteListClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpParasiteListClass, add), - NULL, NULL, - gimp_marshal_VOID__POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); @@ -98,8 +97,7 @@ gimp_parasite_list_class_init (GimpParasiteListClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpParasiteListClass, remove), - NULL, NULL, - gimp_marshal_VOID__POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); diff --git a/app/core/gimpprogress.c b/app/core/gimpprogress.c index afc95fc16b..881ef78a79 100644 --- a/app/core/gimpprogress.c +++ b/app/core/gimpprogress.c @@ -58,8 +58,7 @@ gimp_progress_default_init (GimpProgressInterface *progress_iface) G_TYPE_FROM_INTERFACE (progress_iface), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpProgressInterface, cancel), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); } diff --git a/app/core/gimpprojectable.c b/app/core/gimpprojectable.c index 2990755621..660ac7a095 100644 --- a/app/core/gimpprojectable.c +++ b/app/core/gimpprojectable.c @@ -70,8 +70,7 @@ gimp_projectable_default_init (GimpProjectableInterface *iface) G_TYPE_FROM_CLASS (iface), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpProjectableInterface, flush), - NULL, NULL, - gimp_marshal_VOID__BOOLEAN, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); @@ -80,8 +79,7 @@ gimp_projectable_default_init (GimpProjectableInterface *iface) G_TYPE_FROM_CLASS (iface), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpProjectableInterface, structure_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); projectable_signals[BOUNDS_CHANGED] = diff --git a/app/core/gimpstrokeoptions.c b/app/core/gimpstrokeoptions.c index 3bb5c92115..ffe23ea72e 100644 --- a/app/core/gimpstrokeoptions.c +++ b/app/core/gimpstrokeoptions.c @@ -145,8 +145,7 @@ gimp_stroke_options_class_init (GimpStrokeOptionsClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpStrokeOptionsClass, dash_info_changed), - NULL, NULL, - gimp_marshal_VOID__ENUM, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_DASH_PRESET); diff --git a/app/core/gimptagged.c b/app/core/gimptagged.c index f102009843..0964a369ec 100644 --- a/app/core/gimptagged.c +++ b/app/core/gimptagged.c @@ -54,8 +54,7 @@ gimp_tagged_default_init (GimpTaggedInterface *iface) GIMP_TYPE_TAGGED, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpTaggedInterface, tag_added), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_TAG); @@ -64,8 +63,7 @@ gimp_tagged_default_init (GimpTaggedInterface *iface) GIMP_TYPE_TAGGED, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpTaggedInterface, tag_removed), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_TAG); } diff --git a/app/core/gimptaggedcontainer.c b/app/core/gimptaggedcontainer.c index 70258c9da7..d1ef353da4 100644 --- a/app/core/gimptaggedcontainer.c +++ b/app/core/gimptaggedcontainer.c @@ -102,8 +102,7 @@ gimp_tagged_container_class_init (GimpTaggedContainerClass *klass) GIMP_TYPE_TAGGED_CONTAINER, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpTaggedContainerClass, tag_count_changed), - NULL, NULL, - gimp_marshal_VOID__INT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_INT); } diff --git a/app/core/gimptoolgroup.c b/app/core/gimptoolgroup.c index aa8e3bca2a..a0edce5683 100644 --- a/app/core/gimptoolgroup.c +++ b/app/core/gimptoolgroup.c @@ -114,8 +114,7 @@ gimp_tool_group_class_init (GimpToolGroupClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpToolGroupClass, active_tool_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->finalize = gimp_tool_group_finalize; diff --git a/app/core/gimptoolitem.c b/app/core/gimptoolitem.c index 984597b963..3f6ce36de5 100644 --- a/app/core/gimptoolitem.c +++ b/app/core/gimptoolitem.c @@ -87,8 +87,7 @@ gimp_tool_item_class_init (GimpToolItemClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpToolItemClass, visible_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_tool_item_signals[SHOWN_CHANGED] = @@ -96,8 +95,7 @@ gimp_tool_item_class_init (GimpToolItemClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpToolItemClass, shown_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->get_property = gimp_tool_item_get_property; diff --git a/app/core/gimpundo.c b/app/core/gimpundo.c index b68476b124..14527c6ed1 100644 --- a/app/core/gimpundo.c +++ b/app/core/gimpundo.c @@ -125,8 +125,7 @@ gimp_undo_class_init (GimpUndoClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpUndoClass, free), - NULL, NULL, - gimp_marshal_VOID__ENUM, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_UNDO_MODE); diff --git a/app/display/gimpcanvasitem.c b/app/display/gimpcanvasitem.c index d349c8b388..d17bebb9cd 100644 --- a/app/display/gimpcanvasitem.c +++ b/app/display/gimpcanvasitem.c @@ -28,8 +28,6 @@ #include "display-types.h" -#include "core/gimpmarshal.h" - #include "gimpcanvas-style.h" #include "gimpcanvasitem.h" #include "gimpdisplay.h" @@ -124,8 +122,7 @@ gimp_canvas_item_class_init (GimpCanvasItemClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpCanvasItemClass, update), - NULL, NULL, - gimp_marshal_VOID__POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c index 4edca724e2..71d30d3c98 100644 --- a/app/display/gimpdisplayshell.c +++ b/app/display/gimpdisplayshell.c @@ -49,7 +49,6 @@ #include "core/gimppickable.h" #include "core/gimpprojectable.h" #include "core/gimpprojection.h" -#include "core/gimpmarshal.h" #include "core/gimptemplate.h" #include "widgets/gimpdevices.h" @@ -207,8 +206,7 @@ gimp_display_shell_class_init (GimpDisplayShellClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpDisplayShellClass, scaled), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); display_shell_signals[SCROLLED] = @@ -216,8 +214,7 @@ gimp_display_shell_class_init (GimpDisplayShellClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpDisplayShellClass, scrolled), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); display_shell_signals[ROTATED] = @@ -225,8 +222,7 @@ gimp_display_shell_class_init (GimpDisplayShellClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpDisplayShellClass, rotated), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); display_shell_signals[RECONNECT] = @@ -234,8 +230,7 @@ gimp_display_shell_class_init (GimpDisplayShellClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpDisplayShellClass, reconnect), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->constructed = gimp_display_shell_constructed; diff --git a/app/display/gimpscalecombobox.c b/app/display/gimpscalecombobox.c index 8ae8daef31..c9525267b3 100644 --- a/app/display/gimpscalecombobox.c +++ b/app/display/gimpscalecombobox.c @@ -31,8 +31,6 @@ #include "display-types.h" -#include "core/gimpmarshal.h" - #include "gimpscalecombobox.h" @@ -87,8 +85,7 @@ gimp_scale_combo_box_class_init (GimpScaleComboBoxClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpScaleComboBoxClass, entry_activated), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->constructed = gimp_scale_combo_box_constructed; diff --git a/app/display/gimptoolgui.c b/app/display/gimptoolgui.c index 2400ab3ba5..927a040810 100644 --- a/app/display/gimptoolgui.c +++ b/app/display/gimptoolgui.c @@ -129,8 +129,7 @@ gimp_tool_gui_class_init (GimpToolGuiClass *klass) G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpToolGuiClass, response), - NULL, NULL, - gimp_marshal_VOID__INT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_INT); } diff --git a/app/display/gimptoolline.c b/app/display/gimptoolline.c index 271f926617..3228ccdb19 100644 --- a/app/display/gimptoolline.c +++ b/app/display/gimptoolline.c @@ -274,8 +274,7 @@ gimp_tool_line_class_init (GimpToolLineClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpToolLineClass, remove_slider), - NULL, NULL, - gimp_marshal_VOID__INT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_INT); @@ -284,8 +283,7 @@ gimp_tool_line_class_init (GimpToolLineClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpToolLineClass, selection_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); line_signals[HANDLE_CLICKED] = diff --git a/app/display/gimptoolpath.c b/app/display/gimptoolpath.c index 9e2cf543ee..21d711ac20 100644 --- a/app/display/gimptoolpath.c +++ b/app/display/gimptoolpath.c @@ -233,8 +233,7 @@ gimp_tool_path_class_init (GimpToolPathClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpToolPathClass, begin_change), - NULL, NULL, - g_cclosure_marshal_VOID__STRING, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRING); @@ -243,8 +242,7 @@ gimp_tool_path_class_init (GimpToolPathClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpToolPathClass, end_change), - NULL, NULL, - g_cclosure_marshal_VOID__BOOLEAN, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); @@ -253,8 +251,7 @@ gimp_tool_path_class_init (GimpToolPathClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpToolPathClass, activate), - NULL, NULL, - g_cclosure_marshal_VOID__FLAGS, + NULL, NULL, NULL, G_TYPE_NONE, 1, GDK_TYPE_MODIFIER_TYPE); diff --git a/app/display/gimptoolpolygon.c b/app/display/gimptoolpolygon.c index 4f2c20b518..ba4508090d 100644 --- a/app/display/gimptoolpolygon.c +++ b/app/display/gimptoolpolygon.c @@ -237,8 +237,7 @@ gimp_tool_polygon_class_init (GimpToolPolygonClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpToolPolygonClass, change_complete), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); } diff --git a/app/display/gimptoolrectangle.c b/app/display/gimptoolrectangle.c index fd6e463000..0513f3da6d 100644 --- a/app/display/gimptoolrectangle.c +++ b/app/display/gimptoolrectangle.c @@ -469,8 +469,7 @@ gimp_tool_rectangle_class_init (GimpToolRectangleClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpToolRectangleClass, change_complete), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); g_object_class_install_property (object_class, PROP_X1, diff --git a/app/display/gimptoolwidget.c b/app/display/gimptoolwidget.c index 95e8e3b50f..2ee7fdfba3 100644 --- a/app/display/gimptoolwidget.c +++ b/app/display/gimptoolwidget.c @@ -128,8 +128,7 @@ gimp_tool_widget_class_init (GimpToolWidgetClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpToolWidgetClass, changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); widget_signals[RESPONSE] = @@ -137,8 +136,7 @@ gimp_tool_widget_class_init (GimpToolWidgetClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpToolWidgetClass, response), - NULL, NULL, - gimp_marshal_VOID__INT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_INT); @@ -160,8 +158,7 @@ gimp_tool_widget_class_init (GimpToolWidgetClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpToolWidgetClass, status), - NULL, NULL, - g_cclosure_marshal_VOID__STRING, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRING); @@ -184,8 +181,7 @@ gimp_tool_widget_class_init (GimpToolWidgetClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpToolWidgetClass, message), - NULL, NULL, - g_cclosure_marshal_VOID__STRING, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRING); @@ -194,8 +190,7 @@ gimp_tool_widget_class_init (GimpToolWidgetClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpToolWidgetClass, focus_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); g_object_class_install_property (object_class, PROP_SHELL, diff --git a/app/gimpcore.def b/app/gimpcore.def index 1da194f1f5..ca5d6cd8fa 100644 --- a/app/gimpcore.def +++ b/app/gimpcore.def @@ -452,21 +452,14 @@ EXPORTS gimp_marshal_BOOLEAN__OBJECT_POINTER gimp_marshal_BOOLEAN__OBJECT_POINTER_STRING gimp_marshal_VOID__DOUBLE_DOUBLE - gimp_marshal_VOID__ENUM gimp_marshal_VOID__ENUM_ENUM_BOXED_INT - gimp_marshal_VOID__FLAGS - gimp_marshal_VOID__INT gimp_marshal_VOID__INT_INT - gimp_marshal_VOID__OBJECT gimp_marshal_VOID__OBJECT_OBJECT gimp_marshal_VOID__OBJECT_POINTER - gimp_marshal_VOID__POINTER gimp_marshal_VOID__POINTER_BOXED gimp_marshal_VOID__POINTER_ENUM - gimp_marshal_VOID__STRING gimp_marshal_VOID__STRING_BOOLEAN_UINT_FLAGS gimp_marshal_VOID__STRING_FLAGS - gimp_marshal_VOID__VOID gimp_message gimp_modules_refresh gimp_new diff --git a/app/paint/gimpairbrush.c b/app/paint/gimpairbrush.c index b4bf5b4f20..6bd9fb2806 100644 --- a/app/paint/gimpairbrush.c +++ b/app/paint/gimpairbrush.c @@ -96,8 +96,7 @@ gimp_airbrush_class_init (GimpAirbrushClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpAirbrushClass, stamp), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); } diff --git a/app/paint/gimpbrushcore.c b/app/paint/gimpbrushcore.c index da4f26b9bd..bb08c729ba 100644 --- a/app/paint/gimpbrushcore.c +++ b/app/paint/gimpbrushcore.c @@ -129,8 +129,7 @@ gimp_brush_core_class_init (GimpBrushCoreClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpBrushCoreClass, set_brush), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_BRUSH); @@ -139,8 +138,7 @@ gimp_brush_core_class_init (GimpBrushCoreClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpBrushCoreClass, set_dynamics), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_DYNAMICS); diff --git a/app/pdb/gimppdb.c b/app/pdb/gimppdb.c index 001bf44c49..d7a10cf8a6 100644 --- a/app/pdb/gimppdb.c +++ b/app/pdb/gimppdb.c @@ -82,8 +82,7 @@ gimp_pdb_class_init (GimpPDBClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpPDBClass, register_procedure), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_PROCEDURE); @@ -92,8 +91,7 @@ gimp_pdb_class_init (GimpPDBClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpPDBClass, unregister_procedure), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_PROCEDURE); diff --git a/app/plug-in/gimppluginmanager.c b/app/plug-in/gimppluginmanager.c index d8952a289f..d403f0d97e 100644 --- a/app/plug-in/gimppluginmanager.c +++ b/app/plug-in/gimppluginmanager.c @@ -88,8 +88,7 @@ gimp_plug_in_manager_class_init (GimpPlugInManagerClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpPlugInManagerClass, plug_in_opened), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_PLUG_IN); @@ -99,8 +98,7 @@ gimp_plug_in_manager_class_init (GimpPlugInManagerClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpPlugInManagerClass, plug_in_closed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_PLUG_IN); diff --git a/app/plug-in/gimppluginprocedure.c b/app/plug-in/gimppluginprocedure.c index 21a6b524b9..91048ff087 100644 --- a/app/plug-in/gimppluginprocedure.c +++ b/app/plug-in/gimppluginprocedure.c @@ -113,8 +113,7 @@ gimp_plug_in_procedure_class_init (GimpPlugInProcedureClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpPlugInProcedureClass, menu_path_added), - NULL, NULL, - gimp_marshal_VOID__STRING, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRING); diff --git a/app/text/gimptext.c b/app/text/gimptext.c index fe671a42ba..ed2f041294 100644 --- a/app/text/gimptext.c +++ b/app/text/gimptext.c @@ -36,7 +36,6 @@ #include "core/gimp-memsize.h" #include "core/gimp-utils.h" -#include "core/gimpmarshal.h" #include "core/gimpstrokeoptions.h" #include "gimptext.h" @@ -118,8 +117,7 @@ gimp_text_class_init (GimpTextClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpTextClass, changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->finalize = gimp_text_finalize; diff --git a/app/tools/gimpalignoptions.c b/app/tools/gimpalignoptions.c index 555e63156a..4787c4a27a 100644 --- a/app/tools/gimpalignoptions.c +++ b/app/tools/gimpalignoptions.c @@ -26,8 +26,6 @@ #include "tools-types.h" -#include "core/gimpmarshal.h" - #include "gimpalignoptions.h" #include "gimptooloptions-gui.h" @@ -82,8 +80,7 @@ gimp_align_options_class_init (GimpAlignOptionsClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpAlignOptionsClass, align_button_clicked), - NULL, NULL, - gimp_marshal_VOID__ENUM, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_ALIGNMENT_TYPE); diff --git a/app/vectors/gimpvectors.c b/app/vectors/gimpvectors.c index 642b8c9dbe..10b764f29f 100644 --- a/app/vectors/gimpvectors.c +++ b/app/vectors/gimpvectors.c @@ -189,8 +189,7 @@ gimp_vectors_class_init (GimpVectorsClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpVectorsClass, freeze), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_vectors_signals[THAW] = @@ -198,8 +197,7 @@ gimp_vectors_class_init (GimpVectorsClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpVectorsClass, thaw), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->finalize = gimp_vectors_finalize; diff --git a/app/widgets/gimpaction.c b/app/widgets/gimpaction.c index ae960daf61..80e2a82fab 100644 --- a/app/widgets/gimpaction.c +++ b/app/widgets/gimpaction.c @@ -27,8 +27,6 @@ #include "widgets-types.h" -#include "core/gimpmarshal.h" - #include "gimpaction.h" @@ -63,8 +61,7 @@ gimp_action_default_init (GimpActionInterface *iface) G_TYPE_FROM_INTERFACE (iface), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpActionInterface, activate), - NULL, NULL, - gimp_marshal_VOID__VARIANT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_VARIANT); @@ -73,8 +70,7 @@ gimp_action_default_init (GimpActionInterface *iface) G_TYPE_FROM_INTERFACE (iface), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpActionInterface, change_state), - NULL, NULL, - gimp_marshal_VOID__VARIANT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_VARIANT); } diff --git a/app/widgets/gimpactiongroup.c b/app/widgets/gimpactiongroup.c index 04bd1b65e5..972b0cba0a 100644 --- a/app/widgets/gimpactiongroup.c +++ b/app/widgets/gimpactiongroup.c @@ -30,7 +30,6 @@ #include "core/gimp.h" #include "core/gimpcontext.h" -#include "core/gimpmarshal.h" #include "core/gimpviewable.h" #include "gimpaction.h" @@ -118,8 +117,7 @@ gimp_action_group_class_init (GimpActionGroupClass *klass) G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpActionGroupClass, action_added), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_ACTION); } diff --git a/app/widgets/gimpcolorhistory.c b/app/widgets/gimpcolorhistory.c index 2a9df5f899..087ec88f75 100644 --- a/app/widgets/gimpcolorhistory.c +++ b/app/widgets/gimpcolorhistory.c @@ -35,7 +35,6 @@ #include "core/gimpcontext.h" #include "core/gimpimage.h" #include "app/core/gimpimage-colormap.h" -#include "core/gimpmarshal.h" #include "core/gimppalettemru.h" #include "gimpcolorhistory.h" @@ -129,8 +128,7 @@ gimp_color_history_class_init (GimpColorHistoryClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpColorHistoryClass, color_selected), - NULL, NULL, - gimp_marshal_VOID__POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); diff --git a/app/widgets/gimpcolormapselection.c b/app/widgets/gimpcolormapselection.c index aa3a4dc946..7d582fac0c 100644 --- a/app/widgets/gimpcolormapselection.c +++ b/app/widgets/gimpcolormapselection.c @@ -142,8 +142,7 @@ gimp_colormap_selection_class_init (GimpColormapSelectionClass* klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpColormapSelectionClass, color_context), - NULL, NULL, - gimp_marshal_VOID__POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); signals[COLOR_CLICKED] = @@ -161,8 +160,7 @@ gimp_colormap_selection_class_init (GimpColormapSelectionClass* klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpColormapSelectionClass, color_activated), - NULL, NULL, - gimp_marshal_VOID__POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); diff --git a/app/widgets/gimpcolorpanel.c b/app/widgets/gimpcolorpanel.c index ad73530e86..6f28749f99 100644 --- a/app/widgets/gimpcolorpanel.c +++ b/app/widgets/gimpcolorpanel.c @@ -94,8 +94,7 @@ gimp_color_panel_class_init (GimpColorPanelClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpColorPanelClass, response), - NULL, NULL, - gimp_marshal_VOID__ENUM, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_COLOR_DIALOG_STATE); } diff --git a/app/widgets/gimpcontainertreeview.c b/app/widgets/gimpcontainertreeview.c index c152b6ee0e..feddfb5d67 100644 --- a/app/widgets/gimpcontainertreeview.c +++ b/app/widgets/gimpcontainertreeview.c @@ -179,8 +179,7 @@ gimp_container_tree_view_class_init (GimpContainerTreeViewClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GimpContainerTreeViewClass, edit_name), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); binding_set = gtk_binding_set_by_class (klass); diff --git a/app/widgets/gimpcurveview.c b/app/widgets/gimpcurveview.c index 3cdc2ce22a..0ed4ceab1d 100644 --- a/app/widgets/gimpcurveview.c +++ b/app/widgets/gimpcurveview.c @@ -34,7 +34,6 @@ #include "core/gimp.h" #include "core/gimpcurve.h" #include "core/gimpcurve-map.h" -#include "core/gimpmarshal.h" #include "gimpclipboard.h" #include "gimpcurveview.h" @@ -187,8 +186,7 @@ gimp_curve_view_class_init (GimpCurveViewClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpCurveViewClass, selection_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); curve_view_signals[CUT_CLIPBOARD] = @@ -196,8 +194,7 @@ gimp_curve_view_class_init (GimpCurveViewClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GimpCurveViewClass, cut_clipboard), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); curve_view_signals[COPY_CLIPBOARD] = @@ -205,8 +202,7 @@ gimp_curve_view_class_init (GimpCurveViewClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GimpCurveViewClass, copy_clipboard), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); curve_view_signals[PASTE_CLIPBOARD] = @@ -214,8 +210,7 @@ gimp_curve_view_class_init (GimpCurveViewClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GimpCurveViewClass, paste_clipboard), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); binding_set = gtk_binding_set_by_class (klass); diff --git a/app/widgets/gimpdialogfactory.c b/app/widgets/gimpdialogfactory.c index aa3084b62e..286c644624 100644 --- a/app/widgets/gimpdialogfactory.c +++ b/app/widgets/gimpdialogfactory.c @@ -35,7 +35,6 @@ #include "core/gimp.h" #include "core/gimpcontext.h" -#include "core/gimpmarshal.h" #include "gimpcursor.h" #include "gimpdialogfactory.h" @@ -126,8 +125,7 @@ gimp_dialog_factory_class_init (GimpDialogFactoryClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpDialogFactoryClass, dock_window_added), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_DOCK_WINDOW); @@ -136,8 +134,7 @@ gimp_dialog_factory_class_init (GimpDialogFactoryClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpDialogFactoryClass, dock_window_removed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_DOCK_WINDOW); } diff --git a/app/widgets/gimpdock.c b/app/widgets/gimpdock.c index dcfbda6ab1..cffec7692b 100644 --- a/app/widgets/gimpdock.c +++ b/app/widgets/gimpdock.c @@ -29,7 +29,6 @@ #include "core/gimp.h" #include "core/gimpcontext.h" -#include "core/gimpmarshal.h" #include "gimpdialogfactory.h" #include "gimpdock.h" @@ -99,8 +98,7 @@ gimp_dock_class_init (GimpDockClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpDockClass, book_added), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_DOCKBOOK); @@ -109,8 +107,7 @@ gimp_dock_class_init (GimpDockClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpDockClass, book_removed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_DOCKBOOK); @@ -119,8 +116,7 @@ gimp_dock_class_init (GimpDockClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpDockClass, description_invalidated), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); dock_signals[GEOMETRY_INVALIDATED] = @@ -128,8 +124,7 @@ gimp_dock_class_init (GimpDockClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpDockClass, geometry_invalidated), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->dispose = gimp_dock_dispose; diff --git a/app/widgets/gimpdockbook.c b/app/widgets/gimpdockbook.c index 79abb81f94..5e54818aec 100644 --- a/app/widgets/gimpdockbook.c +++ b/app/widgets/gimpdockbook.c @@ -35,7 +35,6 @@ #include "core/gimp.h" #include "core/gimpcontext.h" -#include "core/gimpmarshal.h" #include "gimpactiongroup.h" #include "gimpdialogfactory.h" @@ -161,8 +160,7 @@ gimp_dockbook_class_init (GimpDockbookClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpDockbookClass, dockable_added), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_DOCKABLE); @@ -171,8 +169,7 @@ gimp_dockbook_class_init (GimpDockbookClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpDockbookClass, dockable_removed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_DOCKABLE); @@ -181,8 +178,7 @@ gimp_dockbook_class_init (GimpDockbookClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpDockbookClass, dockable_reordered), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_DOCKABLE); diff --git a/app/widgets/gimpdockcolumns.c b/app/widgets/gimpdockcolumns.c index c86d3e32f1..128cb2603a 100644 --- a/app/widgets/gimpdockcolumns.c +++ b/app/widgets/gimpdockcolumns.c @@ -29,7 +29,6 @@ #include "core/gimp.h" #include "core/gimpcontext.h" -#include "core/gimpmarshal.h" #include "gimpdialogfactory.h" #include "gimpdock.h" @@ -139,8 +138,7 @@ gimp_dock_columns_class_init (GimpDockColumnsClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpDockColumnsClass, dock_added), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_DOCK); @@ -149,8 +147,7 @@ gimp_dock_columns_class_init (GimpDockColumnsClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpDockColumnsClass, dock_removed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_DOCK); } diff --git a/app/widgets/gimpdocked.c b/app/widgets/gimpdocked.c index 31859804e3..5506aae041 100644 --- a/app/widgets/gimpdocked.c +++ b/app/widgets/gimpdocked.c @@ -28,7 +28,6 @@ #include "widgets-types.h" #include "core/gimpcontext.h" -#include "core/gimpmarshal.h" #include "gimpdocked.h" #include "gimpsessioninfo-aux.h" @@ -65,8 +64,7 @@ gimp_docked_default_init (GimpDockedInterface *iface) GIMP_TYPE_DOCKED, G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpDockedInterface, title_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); iface->get_aux_info = gimp_docked_iface_get_aux_info; diff --git a/app/widgets/gimpextensionlist.c b/app/widgets/gimpextensionlist.c index 9605502cf2..c67f7d9d8f 100644 --- a/app/widgets/gimpextensionlist.c +++ b/app/widgets/gimpextensionlist.c @@ -29,7 +29,6 @@ #include "core/gimpextension.h" #include "core/gimpextensionmanager.h" -#include "core/gimpmarshal.h" #include "gimpextensionlist.h" @@ -91,8 +90,7 @@ gimp_extension_list_class_init (GimpExtensionListClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpExtensionListClass, extension_activated), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_OBJECT); } diff --git a/app/widgets/gimpfgbgeditor.c b/app/widgets/gimpfgbgeditor.c index 6c20547ddb..6a6dc10817 100644 --- a/app/widgets/gimpfgbgeditor.c +++ b/app/widgets/gimpfgbgeditor.c @@ -141,8 +141,7 @@ gimp_fg_bg_editor_class_init (GimpFgBgEditorClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpFgBgEditorClass, color_clicked), - NULL, NULL, - gimp_marshal_VOID__ENUM, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_ACTIVE_COLOR); diff --git a/app/widgets/gimpfileprocview.c b/app/widgets/gimpfileprocview.c index ce50f84fda..e508d7d229 100644 --- a/app/widgets/gimpfileprocview.c +++ b/app/widgets/gimpfileprocview.c @@ -87,8 +87,7 @@ gimp_file_proc_view_class_init (GimpFileProcViewClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpFileProcViewClass, changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); } diff --git a/app/widgets/gimpimageparasiteview.c b/app/widgets/gimpimageparasiteview.c index 76e060d97d..cf6ae4bdc1 100644 --- a/app/widgets/gimpimageparasiteview.c +++ b/app/widgets/gimpimageparasiteview.c @@ -32,7 +32,6 @@ #include "core/gimp.h" #include "core/gimpimage.h" -#include "core/gimpmarshal.h" #include "gimpimageparasiteview.h" @@ -84,8 +83,7 @@ gimp_image_parasite_view_class_init (GimpImageParasiteViewClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageParasiteViewClass, update), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->constructed = gimp_image_parasite_view_constructed; diff --git a/app/widgets/gimpitemtreeview.c b/app/widgets/gimpitemtreeview.c index 240b1fbc66..57f3d971b5 100644 --- a/app/widgets/gimpitemtreeview.c +++ b/app/widgets/gimpitemtreeview.c @@ -39,7 +39,6 @@ #include "core/gimpimage-undo-push.h" #include "core/gimpitem-exclusive.h" #include "core/gimpitemundo.h" -#include "core/gimpmarshal.h" #include "core/gimptreehandler.h" #include "core/gimpundostack.h" @@ -241,8 +240,7 @@ gimp_item_tree_view_class_init (GimpItemTreeViewClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpItemTreeViewClass, set_image), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_OBJECT); diff --git a/app/widgets/gimpnavigationview.c b/app/widgets/gimpnavigationview.c index d2524a38c9..beb206d1d6 100644 --- a/app/widgets/gimpnavigationview.c +++ b/app/widgets/gimpnavigationview.c @@ -161,8 +161,7 @@ gimp_navigation_view_class_init (GimpNavigationViewClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpNavigationViewClass, scroll), - NULL, NULL, - gimp_marshal_VOID__BOXED, + NULL, NULL, NULL, G_TYPE_NONE, 1, GDK_TYPE_EVENT); diff --git a/app/widgets/gimpoverlaydialog.c b/app/widgets/gimpoverlaydialog.c index 7c0dce088b..c91f0dcb73 100644 --- a/app/widgets/gimpoverlaydialog.c +++ b/app/widgets/gimpoverlaydialog.c @@ -29,7 +29,6 @@ #include "widgets-types.h" -#include "core/gimpmarshal.h" #include "core/gimptoolinfo.h" #include "gimpoverlaydialog.h" @@ -160,8 +159,7 @@ gimp_overlay_dialog_class_init (GimpOverlayDialogClass *klass) G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpOverlayDialogClass, response), - NULL, NULL, - gimp_marshal_VOID__INT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_INT); @@ -170,8 +168,7 @@ gimp_overlay_dialog_class_init (GimpOverlayDialogClass *klass) G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GimpOverlayDialogClass, detach), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); signals[CLOSE] = @@ -179,8 +176,7 @@ gimp_overlay_dialog_class_init (GimpOverlayDialogClass *klass) G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GimpOverlayDialogClass, close), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gtk_binding_entry_add_signal (gtk_binding_set_by_class (klass), diff --git a/app/widgets/gimppaletteview.c b/app/widgets/gimppaletteview.c index d2f53395c2..6b10d05056 100644 --- a/app/widgets/gimppaletteview.c +++ b/app/widgets/gimppaletteview.c @@ -106,8 +106,7 @@ gimp_palette_view_class_init (GimpPaletteViewClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpPaletteViewClass, entry_selected), - NULL, NULL, - gimp_marshal_VOID__POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); @@ -116,8 +115,7 @@ gimp_palette_view_class_init (GimpPaletteViewClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpPaletteViewClass, entry_activated), - NULL, NULL, - gimp_marshal_VOID__POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); @@ -126,8 +124,7 @@ gimp_palette_view_class_init (GimpPaletteViewClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpPaletteViewClass, entry_context), - NULL, NULL, - gimp_marshal_VOID__POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); diff --git a/app/widgets/gimppivotselector.c b/app/widgets/gimppivotselector.c index da27120b25..b7319f47d3 100644 --- a/app/widgets/gimppivotselector.c +++ b/app/widgets/gimppivotselector.c @@ -115,8 +115,7 @@ gimp_pivot_selector_class_init (GimpPivotSelectorClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpPivotSelectorClass, changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->get_property = gimp_pivot_selector_get_property; diff --git a/app/widgets/gimppluginview.c b/app/widgets/gimppluginview.c index 43058b3885..86ae14368f 100644 --- a/app/widgets/gimppluginview.c +++ b/app/widgets/gimppluginview.c @@ -78,8 +78,7 @@ gimp_plug_in_view_class_init (GimpPlugInViewClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpPlugInViewClass, changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); } diff --git a/app/widgets/gimppopup.c b/app/widgets/gimppopup.c index 6ddd03de9e..2514e9e286 100644 --- a/app/widgets/gimppopup.c +++ b/app/widgets/gimppopup.c @@ -70,8 +70,7 @@ gimp_popup_class_init (GimpPopupClass *klass) G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GimpPopupClass, cancel), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); popup_signals[CONFIRM] = @@ -79,8 +78,7 @@ gimp_popup_class_init (GimpPopupClass *klass) G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GimpPopupClass, confirm), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); widget_class->map_event = gimp_popup_map_event; diff --git a/app/widgets/gimpsettingsbox.c b/app/widgets/gimpsettingsbox.c index fe80d7932c..a0190b2c34 100644 --- a/app/widgets/gimpsettingsbox.c +++ b/app/widgets/gimpsettingsbox.c @@ -190,8 +190,7 @@ gimp_settings_box_class_init (GimpSettingsBoxClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpSettingsBoxClass, selected), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_CONFIG); diff --git a/app/widgets/gimptextbuffer.c b/app/widgets/gimptextbuffer.c index 4e02b4f3dd..0fbc0ac38a 100644 --- a/app/widgets/gimptextbuffer.c +++ b/app/widgets/gimptextbuffer.c @@ -79,8 +79,7 @@ gimp_text_buffer_class_init (GimpTextBufferClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpTextBufferClass, color_applied), - NULL, NULL, - g_cclosure_marshal_VOID__BOXED, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_RGB); } diff --git a/app/widgets/gimptexteditor.c b/app/widgets/gimptexteditor.c index b4a5f29a57..c52c45b704 100644 --- a/app/widgets/gimptexteditor.c +++ b/app/widgets/gimptexteditor.c @@ -29,7 +29,6 @@ #include "core/gimp.h" #include "core/gimpdatafactory.h" -#include "core/gimpmarshal.h" #include "text/gimptext.h" @@ -81,8 +80,7 @@ gimp_text_editor_class_init (GimpTextEditorClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpTextEditorClass, text_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); text_editor_signals[DIR_CHANGED] = @@ -90,8 +88,7 @@ gimp_text_editor_class_init (GimpTextEditorClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpTextEditorClass, dir_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); } diff --git a/app/widgets/gimptextproxy.c b/app/widgets/gimptextproxy.c index d2b57d16e4..5d1c5cb9e5 100644 --- a/app/widgets/gimptextproxy.c +++ b/app/widgets/gimptextproxy.c @@ -80,8 +80,7 @@ gimp_text_proxy_class_init (GimpTextProxyClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GimpTextProxyClass, change_size), - NULL, NULL, - gimp_marshal_VOID__DOUBLE, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_DOUBLE); @@ -90,8 +89,7 @@ gimp_text_proxy_class_init (GimpTextProxyClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GimpTextProxyClass, change_baseline), - NULL, NULL, - gimp_marshal_VOID__DOUBLE, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_DOUBLE); @@ -100,8 +98,7 @@ gimp_text_proxy_class_init (GimpTextProxyClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GimpTextProxyClass, change_kerning), - NULL, NULL, - gimp_marshal_VOID__DOUBLE, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_DOUBLE); diff --git a/app/widgets/gimpuimanager.c b/app/widgets/gimpuimanager.c index ac8900867c..be7cd4ad46 100644 --- a/app/widgets/gimpuimanager.c +++ b/app/widgets/gimpuimanager.c @@ -32,7 +32,6 @@ #include "widgets-types.h" #include "core/gimp.h" -#include "core/gimpmarshal.h" #include "gimpaction.h" #include "gimpactiongroup.h" @@ -144,8 +143,7 @@ gimp_ui_manager_class_init (GimpUIManagerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpUIManagerClass, update), - NULL, NULL, - gimp_marshal_VOID__POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); @@ -154,8 +152,7 @@ gimp_ui_manager_class_init (GimpUIManagerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpUIManagerClass, show_tooltip), - NULL, NULL, - gimp_marshal_VOID__STRING, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRING); @@ -164,8 +161,7 @@ gimp_ui_manager_class_init (GimpUIManagerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpUIManagerClass, hide_tooltip), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0, G_TYPE_NONE); diff --git a/app/widgets/gimpview.c b/app/widgets/gimpview.c index 57467a9d7a..5631760629 100644 --- a/app/widgets/gimpview.c +++ b/app/widgets/gimpview.c @@ -123,8 +123,7 @@ gimp_view_class_init (GimpViewClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpViewClass, clicked), - NULL, NULL, - gimp_marshal_VOID__FLAGS, + NULL, NULL, NULL, G_TYPE_NONE, 1, GDK_TYPE_MODIFIER_TYPE); @@ -133,8 +132,7 @@ gimp_view_class_init (GimpViewClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpViewClass, double_clicked), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); view_signals[CONTEXT] = @@ -142,8 +140,7 @@ gimp_view_class_init (GimpViewClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpViewClass, context), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->dispose = gimp_view_dispose; diff --git a/app/widgets/gimpviewrenderer.c b/app/widgets/gimpviewrenderer.c index 68ec9045ef..f43637f3a4 100644 --- a/app/widgets/gimpviewrenderer.c +++ b/app/widgets/gimpviewrenderer.c @@ -138,8 +138,7 @@ gimp_view_renderer_class_init (GimpViewRendererClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpViewRendererClass, update), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->dispose = gimp_view_renderer_dispose; diff --git a/app/widgets/gimpwindow.c b/app/widgets/gimpwindow.c index c0a0f1ba5f..d9bc728c9e 100644 --- a/app/widgets/gimpwindow.c +++ b/app/widgets/gimpwindow.c @@ -27,8 +27,6 @@ #include "widgets-types.h" -#include "core/gimpmarshal.h" - #include "display/display-types.h" #include "display/gimpcanvas.h" @@ -79,8 +77,7 @@ gimp_window_class_init (GimpWindowClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpWindowClass, monitor_changed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GDK_TYPE_MONITOR); diff --git a/devel-docs/app/app-sections.txt b/devel-docs/app/app-sections.txt index 5ccb9a4736..e6beb7d34d 100644 --- a/devel-docs/app/app-sections.txt +++ b/devel-docs/app/app-sections.txt @@ -11566,38 +11566,28 @@ gimp_marshal_BOOLEAN__OBJECT_POINTER gimp_marshal_BOOLEAN__OBJECT_POINTER_STRING gimp_marshal_BOOLEAN__STRING gimp_marshal_BOOLEAN__STRING_FLAGS -gimp_marshal_VOID__BOOLEAN gimp_marshal_VOID__BOOLEAN_INT_INT_INT_INT -gimp_marshal_VOID__BOXED gimp_marshal_VOID__BOXED_ENUM -gimp_marshal_VOID__DOUBLE gimp_marshal_VOID__DOUBLE_DOUBLE gimp_marshal_VOID__DOUBLE_DOUBLE_DOUBLE_DOUBLE -gimp_marshal_VOID__ENUM gimp_marshal_VOID__ENUM_ENUM_BOXED_INT gimp_marshal_VOID__ENUM_INT gimp_marshal_VOID__ENUM_INT_BOOLEAN gimp_marshal_VOID__ENUM_OBJECT gimp_marshal_VOID__ENUM_POINTER -gimp_marshal_VOID__FLAGS -gimp_marshal_VOID__INT gimp_marshal_VOID__INT_INT gimp_marshal_VOID__INT_INT_INT_INT -gimp_marshal_VOID__OBJECT gimp_marshal_VOID__OBJECT_BOOLEAN gimp_marshal_VOID__OBJECT_INT gimp_marshal_VOID__OBJECT_OBJECT gimp_marshal_VOID__OBJECT_POINTER -gimp_marshal_VOID__POINTER gimp_marshal_VOID__POINTER_BOXED gimp_marshal_VOID__POINTER_ENUM gimp_marshal_VOID__POINTER_FLAGS_BOOLEAN -gimp_marshal_VOID__STRING gimp_marshal_VOID__STRING_BOOLEAN_UINT_FLAGS gimp_marshal_VOID__STRING_FLAGS gimp_marshal_VOID__STRING_STRING_STRING gimp_marshal_VOID__POINTER_UINT_FLAGS -gimp_marshal_VOID__VOID
diff --git a/libgimp/gimpprocbrowserdialog.c b/libgimp/gimpprocbrowserdialog.c index f5f66fac30..90e781da02 100644 --- a/libgimp/gimpprocbrowserdialog.c +++ b/libgimp/gimpprocbrowserdialog.c @@ -122,8 +122,7 @@ gimp_proc_browser_dialog_class_init (GimpProcBrowserDialogClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpProcBrowserDialogClass, selection_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); /** @@ -138,8 +137,7 @@ gimp_proc_browser_dialog_class_init (GimpProcBrowserDialogClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpProcBrowserDialogClass, row_activated), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); klass->selection_changed = NULL; diff --git a/libgimpcolor/gimpcolormanaged.c b/libgimpcolor/gimpcolormanaged.c index 9f724f98f1..17cf733b38 100644 --- a/libgimpcolor/gimpcolormanaged.c +++ b/libgimpcolor/gimpcolormanaged.c @@ -64,8 +64,7 @@ gimp_color_managed_default_init (GimpColorManagedInterface *iface) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpColorManagedInterface, profile_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); } diff --git a/libgimpcolor/gimpcolortransform.c b/libgimpcolor/gimpcolortransform.c index 867246c68f..7826844401 100644 --- a/libgimpcolor/gimpcolortransform.c +++ b/libgimpcolor/gimpcolortransform.c @@ -124,8 +124,7 @@ gimp_color_transform_class_init (GimpColorTransformClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpColorTransformClass, progress), - NULL, NULL, - g_cclosure_marshal_VOID__DOUBLE, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_DOUBLE); diff --git a/libgimpmodule/gimpmodule.c b/libgimpmodule/gimpmodule.c index 919af51a9e..c057f3c225 100644 --- a/libgimpmodule/gimpmodule.c +++ b/libgimpmodule/gimpmodule.c @@ -112,8 +112,7 @@ gimp_module_class_init (GimpModuleClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpModuleClass, modified), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->finalize = gimp_module_finalize; diff --git a/libgimpmodule/gimpmoduledb.c b/libgimpmodule/gimpmoduledb.c index 9758229361..eb118e9eb6 100644 --- a/libgimpmodule/gimpmoduledb.c +++ b/libgimpmodule/gimpmoduledb.c @@ -95,8 +95,7 @@ gimp_module_db_class_init (GimpModuleDBClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpModuleDBClass, add), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_MODULE); @@ -105,8 +104,7 @@ gimp_module_db_class_init (GimpModuleDBClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpModuleDBClass, remove), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_MODULE); @@ -115,8 +113,7 @@ gimp_module_db_class_init (GimpModuleDBClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpModuleDBClass, module_modified), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_MODULE); diff --git a/libgimpwidgets/gimpbutton.c b/libgimpwidgets/gimpbutton.c index 365a9b83d7..bff0d8c467 100644 --- a/libgimpwidgets/gimpbutton.c +++ b/libgimpwidgets/gimpbutton.c @@ -85,8 +85,7 @@ gimp_button_class_init (GimpButtonClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpButtonClass, extended_clicked), - NULL, NULL, - g_cclosure_marshal_VOID__FLAGS, + NULL, NULL, NULL, G_TYPE_NONE, 1, GDK_TYPE_MODIFIER_TYPE); diff --git a/libgimpwidgets/gimpchainbutton.c b/libgimpwidgets/gimpchainbutton.c index a072d565fa..3e188dfeea 100644 --- a/libgimpwidgets/gimpchainbutton.c +++ b/libgimpwidgets/gimpchainbutton.c @@ -136,8 +136,7 @@ gimp_chain_button_class_init (GimpChainButtonClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpChainButtonClass, toggled), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); klass->toggled = NULL; diff --git a/libgimpwidgets/gimpcolorarea.c b/libgimpwidgets/gimpcolorarea.c index 1f4b87ed37..e4913a0c00 100644 --- a/libgimpwidgets/gimpcolorarea.c +++ b/libgimpwidgets/gimpcolorarea.c @@ -154,8 +154,7 @@ gimp_color_area_class_init (GimpColorAreaClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpColorAreaClass, color_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->dispose = gimp_color_area_dispose; diff --git a/libgimpwidgets/gimpcolorbutton.c b/libgimpwidgets/gimpcolorbutton.c index 97f620021a..8bd5f6219a 100644 --- a/libgimpwidgets/gimpcolorbutton.c +++ b/libgimpwidgets/gimpcolorbutton.c @@ -190,8 +190,7 @@ gimp_color_button_class_init (GimpColorButtonClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpColorButtonClass, color_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->constructed = gimp_color_button_constructed; diff --git a/libgimpwidgets/gimpcolordisplay.c b/libgimpwidgets/gimpcolordisplay.c index e3b19f6e0c..de3b6a103d 100644 --- a/libgimpwidgets/gimpcolordisplay.c +++ b/libgimpwidgets/gimpcolordisplay.c @@ -138,8 +138,7 @@ gimp_color_display_class_init (GimpColorDisplayClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpColorDisplayClass, changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); klass->name = "Unnamed"; diff --git a/libgimpwidgets/gimpcolordisplaystack.c b/libgimpwidgets/gimpcolordisplaystack.c index d5776e8a29..c3e3c9bddf 100644 --- a/libgimpwidgets/gimpcolordisplaystack.c +++ b/libgimpwidgets/gimpcolordisplaystack.c @@ -90,8 +90,7 @@ gimp_color_display_stack_class_init (GimpColorDisplayStackClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpColorDisplayStackClass, changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); stack_signals[ADDED] = diff --git a/libgimpwidgets/gimpcolorhexentry.c b/libgimpwidgets/gimpcolorhexentry.c index ba6a560c2e..5c6e057f2a 100644 --- a/libgimpwidgets/gimpcolorhexentry.c +++ b/libgimpwidgets/gimpcolorhexentry.c @@ -101,8 +101,7 @@ gimp_color_hex_entry_class_init (GimpColorHexEntryClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpColorHexEntryClass, color_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->constructed = gimp_color_hex_entry_constructed; diff --git a/libgimpwidgets/gimpcolorselection.c b/libgimpwidgets/gimpcolorselection.c index 397f2fb8af..16874c58cc 100644 --- a/libgimpwidgets/gimpcolorselection.c +++ b/libgimpwidgets/gimpcolorselection.c @@ -164,8 +164,7 @@ gimp_color_selection_class_init (GimpColorSelectionClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpColorSelectionClass, color_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (klass), "GimpColorSelection"); diff --git a/libgimpwidgets/gimpfileentry.c b/libgimpwidgets/gimpfileentry.c index ac910985f1..0cafe0bf0a 100644 --- a/libgimpwidgets/gimpfileentry.c +++ b/libgimpwidgets/gimpfileentry.c @@ -109,8 +109,7 @@ gimp_file_entry_class_init (GimpFileEntryClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpFileEntryClass, filename_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->dispose = gimp_file_entry_dispose; diff --git a/libgimpwidgets/gimpmemsizeentry.c b/libgimpwidgets/gimpmemsizeentry.c index 442561f161..5e8ba3bbd7 100644 --- a/libgimpwidgets/gimpmemsizeentry.c +++ b/libgimpwidgets/gimpmemsizeentry.c @@ -91,8 +91,7 @@ gimp_memsize_entry_class_init (GimpMemsizeEntryClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpMemsizeEntryClass, value_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); } diff --git a/libgimpwidgets/gimpnumberpairentry.c b/libgimpwidgets/gimpnumberpairentry.c index dc5fc99b4e..1b4dd99755 100644 --- a/libgimpwidgets/gimpnumberpairentry.c +++ b/libgimpwidgets/gimpnumberpairentry.c @@ -187,8 +187,7 @@ gimp_number_pair_entry_class_init (GimpNumberPairEntryClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpNumberPairEntryClass, numbers_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); entry_signals[RATIO_CHANGED] = @@ -196,8 +195,7 @@ gimp_number_pair_entry_class_init (GimpNumberPairEntryClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpNumberPairEntryClass, ratio_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->set_property = gimp_number_pair_entry_set_property; diff --git a/libgimpwidgets/gimppageselector.c b/libgimpwidgets/gimppageselector.c index 1c0c765fe4..a37daadf41 100644 --- a/libgimpwidgets/gimppageselector.c +++ b/libgimpwidgets/gimppageselector.c @@ -152,8 +152,7 @@ gimp_page_selector_class_init (GimpPageSelectorClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpPageSelectorClass, selection_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); /** @@ -170,8 +169,7 @@ gimp_page_selector_class_init (GimpPageSelectorClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GimpPageSelectorClass, activate), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); widget_class->activate_signal = selector_signals[ACTIVATE]; diff --git a/libgimpwidgets/gimppatheditor.c b/libgimpwidgets/gimppatheditor.c index 4d88e67d7d..ddcde9dafa 100644 --- a/libgimpwidgets/gimppatheditor.c +++ b/libgimpwidgets/gimppatheditor.c @@ -112,8 +112,7 @@ gimp_path_editor_class_init (GimpPathEditorClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpPathEditorClass, path_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); /** @@ -128,8 +127,7 @@ gimp_path_editor_class_init (GimpPathEditorClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpPathEditorClass, writable_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); klass->path_changed = NULL; diff --git a/libgimpwidgets/gimppickbutton.c b/libgimpwidgets/gimppickbutton.c index b4bd5a681b..f5891204c7 100644 --- a/libgimpwidgets/gimppickbutton.c +++ b/libgimpwidgets/gimppickbutton.c @@ -88,8 +88,7 @@ gimp_pick_button_class_init (GimpPickButtonClass* klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpPickButtonClass, color_picked), - NULL, NULL, - g_cclosure_marshal_VOID__POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); diff --git a/libgimpwidgets/gimppreview.c b/libgimpwidgets/gimppreview.c index 2403c5adc8..04ba73e253 100644 --- a/libgimpwidgets/gimppreview.c +++ b/libgimpwidgets/gimppreview.c @@ -147,8 +147,7 @@ gimp_preview_class_init (GimpPreviewClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpPreviewClass, invalidated), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->dispose = gimp_preview_dispose; diff --git a/libgimpwidgets/gimpsizeentry.c b/libgimpwidgets/gimpsizeentry.c index aea53f72f1..cc080d163f 100644 --- a/libgimpwidgets/gimpsizeentry.c +++ b/libgimpwidgets/gimpsizeentry.c @@ -161,8 +161,7 @@ gimp_size_entry_class_init (GimpSizeEntryClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpSizeEntryClass, value_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_size_entry_signals[REFVAL_CHANGED] = @@ -170,8 +169,7 @@ gimp_size_entry_class_init (GimpSizeEntryClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpSizeEntryClass, refval_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_size_entry_signals[UNIT_CHANGED] = @@ -179,8 +177,7 @@ gimp_size_entry_class_init (GimpSizeEntryClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpSizeEntryClass, unit_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->finalize = gimp_size_entry_finalize; diff --git a/modules/gimpcolorwheel.c b/modules/gimpcolorwheel.c index a7652376e3..e65a294ebe 100644 --- a/modules/gimpcolorwheel.c +++ b/modules/gimpcolorwheel.c @@ -175,8 +175,7 @@ gimp_color_wheel_class_init (GimpColorWheelClass *class) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpColorWheelClass, changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); wheel_signals[MOVE] = @@ -184,8 +183,7 @@ gimp_color_wheel_class_init (GimpColorWheelClass *class) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GimpColorWheelClass, move), - NULL, NULL, - g_cclosure_marshal_VOID__ENUM, + NULL, NULL, NULL, G_TYPE_NONE, 1, GTK_TYPE_DIRECTION_TYPE); diff --git a/modules/gimpinputdevicestore-dx.c b/modules/gimpinputdevicestore-dx.c index 7c455818f9..75b438f80b 100644 --- a/modules/gimpinputdevicestore-dx.c +++ b/modules/gimpinputdevicestore-dx.c @@ -114,8 +114,7 @@ gimp_input_device_store_class_init (GimpInputDeviceStoreClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpInputDeviceStoreClass, device_added), - NULL, NULL, - g_cclosure_marshal_VOID__STRING, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRING); store_signals[DEVICE_REMOVED] = @@ -123,8 +122,7 @@ gimp_input_device_store_class_init (GimpInputDeviceStoreClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpInputDeviceStoreClass, device_removed), - NULL, NULL, - g_cclosure_marshal_VOID__STRING, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRING); object_class->finalize = gimp_input_device_store_finalize; diff --git a/modules/gimpinputdevicestore-gudev.c b/modules/gimpinputdevicestore-gudev.c index 4c54474cfb..d035bc0f5c 100644 --- a/modules/gimpinputdevicestore-gudev.c +++ b/modules/gimpinputdevicestore-gudev.c @@ -113,8 +113,7 @@ gimp_input_device_store_class_init (GimpInputDeviceStoreClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpInputDeviceStoreClass, device_added), - NULL, NULL, - g_cclosure_marshal_VOID__STRING, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRING); store_signals[DEVICE_REMOVED] = @@ -122,8 +121,7 @@ gimp_input_device_store_class_init (GimpInputDeviceStoreClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpInputDeviceStoreClass, device_removed), - NULL, NULL, - g_cclosure_marshal_VOID__STRING, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRING); object_class->finalize = gimp_input_device_store_finalize; diff --git a/plug-ins/common/file-pdf-load.c b/plug-ins/common/file-pdf-load.c index b450a0e274..771f633597 100644 --- a/plug-ins/common/file-pdf-load.c +++ b/plug-ins/common/file-pdf-load.c @@ -1217,8 +1217,7 @@ gimp_resolution_entry_class_init (GimpResolutionEntryClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpResolutionEntryClass, value_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_resolution_entry_signals[WIDTH_CHANGED] = @@ -1226,8 +1225,7 @@ gimp_resolution_entry_class_init (GimpResolutionEntryClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpResolutionEntryClass, value_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_resolution_entry_signals[X_CHANGED] = @@ -1235,8 +1233,7 @@ gimp_resolution_entry_class_init (GimpResolutionEntryClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpResolutionEntryClass, value_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_resolution_entry_signals[Y_CHANGED] = @@ -1244,8 +1241,7 @@ gimp_resolution_entry_class_init (GimpResolutionEntryClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpResolutionEntryClass, refval_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_resolution_entry_signals[UNIT_CHANGED] = @@ -1253,8 +1249,7 @@ gimp_resolution_entry_class_init (GimpResolutionEntryClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpResolutionEntryClass, unit_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); klass->value_changed = NULL; diff --git a/plug-ins/help-browser/gimpthrobber.c b/plug-ins/help-browser/gimpthrobber.c index 81866f3d0b..35482a5e84 100644 --- a/plug-ins/help-browser/gimpthrobber.c +++ b/plug-ins/help-browser/gimpthrobber.c @@ -137,8 +137,7 @@ gimp_throbber_class_init (GimpThrobberClass *klass) G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpThrobberClass, clicked), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); g_type_class_add_private (object_class, sizeof (GimpThrobberPrivate));