From 4729fc8dec3cd0e3874ecbd84af07d3a077f571d Mon Sep 17 00:00:00 2001 From: Niels De Graef Date: Mon, 4 May 2020 21:33:37 +0200 Subject: [PATCH] Use GIMP_TYPE_RGB instead of G_TYPE_POINTER That way, bindings can set the correct signature for callbacks. --- libgimpwidgets/gimpcolorselector.c | 6 +++--- libgimpwidgets/gimppickbutton.c | 4 ++-- libgimpwidgets/gimpwidgetsmarshal.list | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libgimpwidgets/gimpcolorselector.c b/libgimpwidgets/gimpcolorselector.c index 2215e14616..c03b01d7db 100644 --- a/libgimpwidgets/gimpcolorselector.c +++ b/libgimpwidgets/gimpcolorselector.c @@ -90,10 +90,10 @@ gimp_color_selector_class_init (GimpColorSelectorClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpColorSelectorClass, color_changed), NULL, NULL, - _gimp_widgets_marshal_VOID__POINTER_POINTER, + _gimp_widgets_marshal_VOID__BOXED_BOXED, G_TYPE_NONE, 2, - G_TYPE_POINTER, - G_TYPE_POINTER); + GIMP_TYPE_RGB, + GIMP_TYPE_RGB); selector_signals[CHANNEL_CHANGED] = g_signal_new ("channel-changed", diff --git a/libgimpwidgets/gimppickbutton.c b/libgimpwidgets/gimppickbutton.c index f5891204c7..43ab6ae9ad 100644 --- a/libgimpwidgets/gimppickbutton.c +++ b/libgimpwidgets/gimppickbutton.c @@ -79,7 +79,7 @@ gimp_pick_button_class_init (GimpPickButtonClass* klass) /** * GimpPickButton::color-picked: * @gimppickbutton: the object which received the signal. - * @arg1: pointer to a #GimpRGB structure that holds the picked color + * @color: pointer to a #GimpRGB structure that holds the picked color * * This signal is emitted when the user has picked a color. **/ @@ -90,7 +90,7 @@ gimp_pick_button_class_init (GimpPickButtonClass* klass) G_STRUCT_OFFSET (GimpPickButtonClass, color_picked), NULL, NULL, NULL, G_TYPE_NONE, 1, - G_TYPE_POINTER); + GIMP_TYPE_RGB); object_class->dispose = gimp_pick_button_dispose; diff --git a/libgimpwidgets/gimpwidgetsmarshal.list b/libgimpwidgets/gimpwidgetsmarshal.list index 8983fa8bf4..b52f2baae2 100644 --- a/libgimpwidgets/gimpwidgetsmarshal.list +++ b/libgimpwidgets/gimpwidgetsmarshal.list @@ -27,7 +27,7 @@ VOID: ENUM, BOOLEAN VOID: INT, INT VOID: OBJECT VOID: OBJECT, INT -VOID: POINTER, POINTER +VOID: BOXED, BOXED VOID: STRING, FLAGS VOID: STRING, INT VOID: DOUBLE, DOUBLE