diff options
author | Matthias Clasen <mclasen@redhat.com> | 2023-05-13 19:46:30 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2023-05-13 19:46:30 +0000 |
commit | e72b4ae6e26acf72ee11edf5b01cccf70f693979 (patch) | |
tree | 96b91e827d4c8384f417b258b5c158397dc51ce9 | |
parent | 9f1f4850fe0253afceff51568936475bd5ebc7dc (diff) | |
parent | 0b9e5e6db48fc3baed2bee9fad7ec6cca03a5196 (diff) | |
download | gtk+-e72b4ae6e26acf72ee11edf5b01cccf70f693979.tar.gz |
Merge branch 'more-marshaller-cleanup' into 'main'
Add missing va marshallers
See merge request GNOME/gtk!5963
-rw-r--r-- | gdk/x11/gdkdisplay-x11.c | 7 | ||||
-rw-r--r-- | gtk/gtkaboutdialog.c | 3 | ||||
-rw-r--r-- | gtk/gtkcssnode.c | 12 | ||||
-rw-r--r-- | gtk/gtkcssprovider.c | 3 | ||||
-rw-r--r-- | gtk/gtkdragsource.c | 3 | ||||
-rw-r--r-- | gtk/gtkdrawingarea.c | 5 | ||||
-rw-r--r-- | gtk/gtkdroptarget.c | 5 | ||||
-rw-r--r-- | gtk/gtkdroptargetasync.c | 5 | ||||
-rw-r--r-- | gtk/gtkeditable.c | 5 | ||||
-rw-r--r-- | gtk/gtkentrybuffer.c | 6 | ||||
-rw-r--r-- | gtk/gtkeventcontrollerlegacy.c | 5 | ||||
-rw-r--r-- | gtk/gtkglarea.c | 10 | ||||
-rw-r--r-- | gtk/gtklabel.c | 90 | ||||
-rw-r--r-- | gtk/gtklinkbutton.c | 4 | ||||
-rw-r--r-- | gtk/gtkmarshalers.list | 3 | ||||
-rw-r--r-- | gtk/gtkpaned.c | 18 | ||||
-rw-r--r-- | gtk/gtkpathbar.c | 19 | ||||
-rw-r--r-- | gtk/gtkplacessidebar.c | 21 | ||||
-rw-r--r-- | gtk/gtkplacesview.c | 3 | ||||
-rw-r--r-- | gtk/gtkprintoperation.c | 50 | ||||
-rw-r--r-- | gtk/gtkprintoperationpreview.c | 23 | ||||
-rw-r--r-- | gtk/gtkrange.c | 3 | ||||
-rw-r--r-- | gtk/gtkscrolledwindow.c | 3 | ||||
-rw-r--r-- | gtk/gtkshortcutssection.c | 3 | ||||
-rw-r--r-- | gtk/gtkspinbutton.c | 6 | ||||
-rw-r--r-- | gtk/gtktext.c | 6 | ||||
-rw-r--r-- | gtk/gtktexthandle.c | 28 | ||||
-rw-r--r-- | gtk/gtktextlayout.c | 2 | ||||
-rw-r--r-- | gtk/gtkwindow.c | 3 |
29 files changed, 237 insertions, 117 deletions
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index f93941d359..4dec10d1de 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -3089,12 +3089,15 @@ G_GNUC_END_IGNORE_DEPRECATIONS */ signals[XEVENT] = g_signal_new (g_intern_static_string ("xevent"), - G_OBJECT_CLASS_TYPE (object_class), + G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GdkX11DisplayClass, xevent), + G_STRUCT_OFFSET (GdkX11DisplayClass, xevent), gdk_boolean_handled_accumulator, NULL, _gdk_marshal_BOOLEAN__POINTER, G_TYPE_BOOLEAN, 1, G_TYPE_POINTER); + g_signal_set_va_marshaller (signals[XEVENT], + G_OBJECT_CLASS_TYPE (object_class), + _gdk_marshal_BOOLEAN__POINTERv); _gdk_x11_surfaceing_init (); } diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index 823c58a7ae..1626baeef6 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -366,6 +366,9 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass) _gtk_boolean_handled_accumulator, NULL, _gtk_marshal_BOOLEAN__STRING, G_TYPE_BOOLEAN, 1, G_TYPE_STRING); + g_signal_set_va_marshaller (signals[ACTIVATE_LINK], + G_TYPE_FROM_CLASS (object_class), + _gtk_marshal_BOOLEAN__STRINGv); /** * GtkAboutDialog:program-name: (attributes org.gtk.Property.get=gtk_about_dialog_get_program_name org.gtk.Property.set=gtk_about_dialog_set_program_name) diff --git a/gtk/gtkcssnode.c b/gtk/gtkcssnode.c index 483b1e7ef4..6ff8f1a26d 100644 --- a/gtk/gtkcssnode.c +++ b/gtk/gtkcssnode.c @@ -564,13 +564,13 @@ gtk_css_node_class_init (GtkCssNodeClass *klass) cssnode_signals[STYLE_CHANGED] = g_signal_new (I_("style-changed"), - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkCssNodeClass, style_changed), - NULL, NULL, - NULL, - G_TYPE_NONE, 1, - G_TYPE_POINTER); + NULL, NULL, + NULL, + G_TYPE_NONE, 1, + G_TYPE_POINTER); cssnode_properties[PROP_CLASSES] = g_param_spec_boxed ("classes", NULL, NULL, diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index 5ace762e7a..89f5fd9e93 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -233,6 +233,9 @@ gtk_css_provider_class_init (GtkCssProviderClass *klass) NULL, NULL, _gtk_marshal_VOID__BOXED_BOXED, G_TYPE_NONE, 2, GTK_TYPE_CSS_SECTION, G_TYPE_ERROR); + g_signal_set_va_marshaller (css_provider_signals[PARSING_ERROR], + G_TYPE_FROM_CLASS (object_class), + _gtk_marshal_VOID__BOXED_BOXEDv); object_class->finalize = gtk_css_provider_finalize; diff --git a/gtk/gtkdragsource.c b/gtk/gtkdragsource.c index 0bd8ba1ffa..bb7d279cb2 100644 --- a/gtk/gtkdragsource.c +++ b/gtk/gtkdragsource.c @@ -456,6 +456,9 @@ gtk_drag_source_class_init (GtkDragSourceClass *class) G_TYPE_BOOLEAN, 2, GDK_TYPE_DRAG, GDK_TYPE_DRAG_CANCEL_REASON); + g_signal_set_va_marshaller (signals[DRAG_CANCEL], + G_TYPE_FROM_CLASS (class), + _gtk_marshal_BOOLEAN__OBJECT_ENUMv); } static GdkContentProvider * diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c index 0b39bbe905..860723dd78 100644 --- a/gtk/gtkdrawingarea.c +++ b/gtk/gtkdrawingarea.c @@ -25,6 +25,7 @@ #include "config.h" #include "gtkdrawingarea.h" #include "gtkmarshalers.h" +#include "gdk/gdkmarshalers.h" #include "gtkprivate.h" #include "gtksnapshot.h" #include "gtkwidgetprivate.h" @@ -320,11 +321,11 @@ gtk_drawing_area_class_init (GtkDrawingAreaClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkDrawingAreaClass, resize), NULL, NULL, - _gtk_marshal_VOID__INT_INT, + _gdk_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); g_signal_set_va_marshaller (signals[RESIZE], G_TYPE_FROM_CLASS (class), - _gtk_marshal_VOID__INT_INTv); + _gdk_marshal_VOID__INT_INTv); } static void diff --git a/gtk/gtkdroptarget.c b/gtk/gtkdroptarget.c index 8a04f5773c..e5f34ac629 100644 --- a/gtk/gtkdroptarget.c +++ b/gtk/gtkdroptarget.c @@ -29,6 +29,7 @@ #include "gtkdropprivate.h" #include "gtkeventcontrollerprivate.h" #include "gtkmarshalers.h" +#include "gdk/gdkmarshalers.h" #include "gtknative.h" #include "gtkprivate.h" #include "gtktypebuiltins.h" @@ -754,12 +755,12 @@ gtk_drop_target_class_init (GtkDropTargetClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkDropTargetClass, accept), g_signal_accumulator_first_wins, NULL, - _gtk_marshal_BOOLEAN__OBJECT, + _gdk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, GDK_TYPE_DROP); g_signal_set_va_marshaller (signals[ACCEPT], GTK_TYPE_DROP_TARGET, - _gtk_marshal_BOOLEAN__OBJECTv); + _gdk_marshal_BOOLEAN__OBJECTv); /** * GtkDropTarget::enter: diff --git a/gtk/gtkdroptargetasync.c b/gtk/gtkdroptargetasync.c index 577837e04f..0fbab88d31 100644 --- a/gtk/gtkdroptargetasync.c +++ b/gtk/gtkdroptargetasync.c @@ -29,6 +29,7 @@ #include "gtkdropprivate.h" #include "gtkeventcontrollerprivate.h" #include "gtkmarshalers.h" +#include "gdk/gdkmarshalers.h" #include "gtknative.h" #include "gtktypebuiltins.h" #include "gtkprivate.h" @@ -430,12 +431,12 @@ gtk_drop_target_async_class_init (GtkDropTargetAsyncClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkDropTargetAsyncClass, accept), g_signal_accumulator_first_wins, NULL, - _gtk_marshal_BOOLEAN__OBJECT, + _gdk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, GDK_TYPE_DROP); g_signal_set_va_marshaller (signals[ACCEPT], GTK_TYPE_DROP_TARGET_ASYNC, - _gtk_marshal_BOOLEAN__OBJECTv); + _gdk_marshal_BOOLEAN__OBJECTv); /** * GtkDropTargetAsync::drag-enter: diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c index ce2e9a9b5a..242a5c8d8a 100644 --- a/gtk/gtkeditable.c +++ b/gtk/gtkeditable.c @@ -161,6 +161,7 @@ #include "gtkeditable.h" #include "gtkentrybuffer.h" #include "gtkmarshalers.h" +#include "gdk/gdkmarshalers.h" #include "gtkprivate.h" G_DEFINE_INTERFACE (GtkEditable, gtk_editable, GTK_TYPE_WIDGET) @@ -342,13 +343,13 @@ gtk_editable_default_init (GtkEditableInterface *iface) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkEditableInterface, delete_text), NULL, NULL, - _gtk_marshal_VOID__INT_INT, + _gdk_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); g_signal_set_va_marshaller (signals[DELETE_TEXT], G_TYPE_FROM_INTERFACE (iface), - _gtk_marshal_VOID__INT_INTv); + _gdk_marshal_VOID__INT_INTv); /** * GtkEditable::changed: diff --git a/gtk/gtkentrybuffer.c b/gtk/gtkentrybuffer.c index dd4d47b2c7..536eee048b 100644 --- a/gtk/gtkentrybuffer.c +++ b/gtk/gtkentrybuffer.c @@ -388,6 +388,9 @@ gtk_entry_buffer_class_init (GtkEntryBufferClass *klass) G_TYPE_UINT, G_TYPE_STRING, G_TYPE_UINT); + g_signal_set_va_marshaller (signals[INSERTED_TEXT], + GTK_TYPE_ENTRY_BUFFER, + _gtk_marshal_VOID__UINT_STRING_UINTv); /** * GtkEntryBuffer::deleted-text: @@ -409,6 +412,9 @@ gtk_entry_buffer_class_init (GtkEntryBufferClass *klass) G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); + g_signal_set_va_marshaller (signals[DELETED_TEXT], + GTK_TYPE_ENTRY_BUFFER, + _gtk_marshal_VOID__UINT_UINTv); } /* -------------------------------------------------------------------------------- diff --git a/gtk/gtkeventcontrollerlegacy.c b/gtk/gtkeventcontrollerlegacy.c index 46ddee24d6..8df55ce0bc 100644 --- a/gtk/gtkeventcontrollerlegacy.c +++ b/gtk/gtkeventcontrollerlegacy.c @@ -32,6 +32,7 @@ #include "gtkeventcontrollerlegacy.h" #include "gtkeventcontrollerprivate.h" #include "gtkmarshalers.h" +#include "gdk/gdkmarshalers.h" #include "gtkprivate.h" struct _GtkEventControllerLegacy @@ -89,12 +90,12 @@ gtk_event_controller_legacy_class_init (GtkEventControllerLegacyClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__POINTER, + _gdk_marshal_BOOLEAN__POINTER, G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT); g_signal_set_va_marshaller (signals[EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__POINTERv); + _gdk_marshal_BOOLEAN__POINTERv); } static void diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c index f547a4995f..c6b23a8b1a 100644 --- a/gtk/gtkglarea.c +++ b/gtk/gtkglarea.c @@ -24,7 +24,7 @@ #include "gtkglarea.h" #include <glib/gi18n-lib.h> #include "gtkmarshalers.h" -#include "gtkmarshalers.h" +#include "gdk/gdkmarshalers.h" #include "gtkprivate.h" #include "gtksnapshot.h" #include "gtknative.h" @@ -964,12 +964,12 @@ gtk_gl_area_class_init (GtkGLAreaClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkGLAreaClass, render), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__OBJECT, + _gdk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, GDK_TYPE_GL_CONTEXT); g_signal_set_va_marshaller (area_signals[RENDER], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__OBJECTv); + _gdk_marshal_BOOLEAN__OBJECTv); /** * GtkGLArea::resize: @@ -995,11 +995,11 @@ gtk_gl_area_class_init (GtkGLAreaClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkGLAreaClass, resize), NULL, NULL, - _gtk_marshal_VOID__INT_INT, + _gdk_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); g_signal_set_va_marshaller (area_signals[RESIZE], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_VOID__INT_INTv); + _gdk_marshal_VOID__INT_INTv); /** * GtkGLArea::create-context: diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index ecb48a8d07..bac28d66f5 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -2254,6 +2254,9 @@ gtk_label_class_init (GtkLabelClass *class) GTK_TYPE_MOVEMENT_STEP, G_TYPE_INT, G_TYPE_BOOLEAN); + g_signal_set_va_marshaller (signals[MOVE_CURSOR], + G_OBJECT_CLASS_TYPE (gobject_class), + _gtk_marshal_VOID__ENUM_INT_BOOLEANv); /** * GtkLabel::copy-clipboard: @@ -2274,48 +2277,51 @@ gtk_label_class_init (GtkLabelClass *class) NULL, G_TYPE_NONE, 0); - /** - * GtkLabel::activate-current-link: - * @self: The label on which the signal was emitted - * - * Gets emitted when the user activates a link in the label. - * - * The ::activate-current-link is a [keybinding signal](class.SignalAction.html). - * - * Applications may also emit the signal with g_signal_emit_by_name() - * if they need to control activation of URIs programmatically. - * - * The default bindings for this signal are all forms of the <kbd>Enter</kbd> key. - */ - signals[ACTIVATE_CURRENT_LINK] = - g_signal_new_class_handler (I_("activate-current-link"), - G_TYPE_FROM_CLASS (gobject_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_CALLBACK (gtk_label_activate_current_link), - NULL, NULL, - NULL, - G_TYPE_NONE, 0); - - /** - * GtkLabel::activate-link: - * @self: The label on which the signal was emitted - * @uri: the URI that is activated - * - * Gets emitted to activate a URI. - * - * Applications may connect to it to override the default behaviour, - * which is to call [method@Gtk.FileLauncher.launch]. - * - * Returns: %TRUE if the link has been activated - */ - signals[ACTIVATE_LINK] = - g_signal_new (I_("activate-link"), - G_TYPE_FROM_CLASS (gobject_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkLabelClass, activate_link), - _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__STRING, - G_TYPE_BOOLEAN, 1, G_TYPE_STRING); + /** + * GtkLabel::activate-current-link: + * @self: The label on which the signal was emitted + * + * Gets emitted when the user activates a link in the label. + * + * The ::activate-current-link is a [keybinding signal](class.SignalAction.html). + * + * Applications may also emit the signal with g_signal_emit_by_name() + * if they need to control activation of URIs programmatically. + * + * The default bindings for this signal are all forms of the <kbd>Enter</kbd> key. + */ + signals[ACTIVATE_CURRENT_LINK] = + g_signal_new_class_handler (I_("activate-current-link"), + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_CALLBACK (gtk_label_activate_current_link), + NULL, NULL, + NULL, + G_TYPE_NONE, 0); + + /** + * GtkLabel::activate-link: + * @self: The label on which the signal was emitted + * @uri: the URI that is activated + * + * Gets emitted to activate a URI. + * + * Applications may connect to it to override the default behaviour, + * which is to call [method@Gtk.FileLauncher.launch]. + * + * Returns: %TRUE if the link has been activated + */ + signals[ACTIVATE_LINK] = + g_signal_new (I_("activate-link"), + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkLabelClass, activate_link), + _gtk_boolean_handled_accumulator, NULL, + _gtk_marshal_BOOLEAN__STRING, + G_TYPE_BOOLEAN, 1, G_TYPE_STRING); + g_signal_set_va_marshaller (signals[ACTIVATE_LINK], + G_TYPE_FROM_CLASS (gobject_class), + _gtk_marshal_BOOLEAN__STRINGv); /** * GtkLabel:label: (attributes org.gtk.Property.get=gtk_label_get_label org.gtk.Property.set=gtk_label_set_label) diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c index 4e058b31ed..5c87e4b24b 100644 --- a/gtk/gtklinkbutton.c +++ b/gtk/gtklinkbutton.c @@ -216,6 +216,10 @@ gtk_link_button_class_init (GtkLinkButtonClass *klass) _gtk_boolean_handled_accumulator, NULL, _gtk_marshal_BOOLEAN__VOID, G_TYPE_BOOLEAN, 0); + g_signal_set_va_marshaller (link_signals[ACTIVATE_LINK], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_BOOLEAN__VOIDv); + gtk_widget_class_set_css_name (widget_class, I_("button")); gtk_widget_class_set_accessible_role (widget_class, GTK_ACCESSIBLE_ROLE_LINK); diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list index c8cb009743..10536eff73 100644 --- a/gtk/gtkmarshalers.list +++ b/gtk/gtkmarshalers.list @@ -35,12 +35,10 @@ BOOLEAN:FLAGS BOOLEAN:INT BOOLEAN:INT,INT BOOLEAN:INT,INT,BOOLEAN,OBJECT -BOOLEAN:OBJECT BOOLEAN:OBJECT,BOXED BOOLEAN:OBJECT,DOUBLE,DOUBLE BOOLEAN:OBJECT,ENUM BOOLEAN:OBJECT,OBJECT,OBJECT -BOOLEAN:POINTER BOOLEAN:STRING BOOLEAN:UINT,UINT,FLAGS BOOLEAN:VOID @@ -66,7 +64,6 @@ VOID:ENUM,INT VOID:ENUM,INT,BOOLEAN VOID:ENUM,INT,BOOLEAN,BOOLEAN VOID:INT,DOUBLE,DOUBLE -VOID:INT,INT VOID:INT,INT,INT VOID:OBJECT,BOOLEAN VOID:OBJECT,BOXED,BOOLEAN,BOOLEAN diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index 88aed6675e..154f2f2863 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -568,6 +568,9 @@ gtk_paned_class_init (GtkPanedClass *class) _gtk_marshal_BOOLEAN__BOOLEAN, G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN); + g_signal_set_va_marshaller (signals[CYCLE_CHILD_FOCUS], + G_TYPE_FROM_CLASS (object_class), + _gtk_marshal_BOOLEAN__BOOLEANv); /** * GtkPaned::toggle-handle-focus: @@ -588,6 +591,9 @@ gtk_paned_class_init (GtkPanedClass *class) NULL, NULL, _gtk_marshal_BOOLEAN__VOID, G_TYPE_BOOLEAN, 0); + g_signal_set_va_marshaller (signals[TOGGLE_HANDLE_FOCUS], + G_TYPE_FROM_CLASS (object_class), + _gtk_marshal_BOOLEAN__VOIDv); /** * GtkPaned::move-handle: @@ -607,6 +613,9 @@ gtk_paned_class_init (GtkPanedClass *class) _gtk_marshal_BOOLEAN__ENUM, G_TYPE_BOOLEAN, 1, GTK_TYPE_SCROLL_TYPE); + g_signal_set_va_marshaller (signals[MOVE_HANDLE], + G_TYPE_FROM_CLASS (object_class), + _gtk_marshal_BOOLEAN__ENUMv); /** * GtkPaned::cycle-handle-focus: @@ -629,6 +638,9 @@ gtk_paned_class_init (GtkPanedClass *class) _gtk_marshal_BOOLEAN__BOOLEAN, G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN); + g_signal_set_va_marshaller (signals[CYCLE_HANDLE_FOCUS], + G_TYPE_FROM_CLASS (object_class), + _gtk_marshal_BOOLEAN__BOOLEANv); /** * GtkPaned::accept-position: @@ -650,6 +662,9 @@ gtk_paned_class_init (GtkPanedClass *class) NULL, NULL, _gtk_marshal_BOOLEAN__VOID, G_TYPE_BOOLEAN, 0); + g_signal_set_va_marshaller (signals[ACCEPT_POSITION], + G_TYPE_FROM_CLASS (object_class), + _gtk_marshal_BOOLEAN__VOIDv); /** * GtkPaned::cancel-position: @@ -673,6 +688,9 @@ gtk_paned_class_init (GtkPanedClass *class) NULL, NULL, _gtk_marshal_BOOLEAN__VOID, G_TYPE_BOOLEAN, 0); + g_signal_set_va_marshaller (signals[CANCEL_POSITION], + G_TYPE_FROM_CLASS (object_class), + _gtk_marshal_BOOLEAN__VOIDv); /* F6 and friends */ gtk_widget_class_add_binding_signal (widget_class, diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c index bdd4987b30..e8a3b2fc06 100644 --- a/gtk/gtkpathbar.c +++ b/gtk/gtkpathbar.c @@ -244,15 +244,16 @@ gtk_path_bar_class_init (GtkPathBarClass *path_bar_class) path_bar_signals [PATH_CLICKED] = g_signal_new (I_("path-clicked"), - G_OBJECT_CLASS_TYPE (gobject_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GtkPathBarClass, path_clicked), - NULL, NULL, - _gtk_marshal_VOID__OBJECT_OBJECT_BOOLEAN, - G_TYPE_NONE, 3, - G_TYPE_FILE, - G_TYPE_FILE, - G_TYPE_BOOLEAN); + G_OBJECT_CLASS_TYPE (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GtkPathBarClass, path_clicked), + NULL, NULL, + _gtk_marshal_VOID__OBJECT_OBJECT_BOOLEAN, + G_TYPE_NONE, 3, + G_TYPE_FILE, G_TYPE_FILE, G_TYPE_BOOLEAN); + g_signal_set_va_marshaller (path_bar_signals[PATH_CLICKED], + G_OBJECT_CLASS_TYPE (gobject_class), + _gtk_marshal_VOID__OBJECT_OBJECT_BOOLEANv); gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT); gtk_widget_class_set_css_name (widget_class, "pathbar"); diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c index 6f6747c6e7..3eb8aa816d 100644 --- a/gtk/gtkplacessidebar.c +++ b/gtk/gtkplacessidebar.c @@ -4141,8 +4141,10 @@ gtk_places_sidebar_class_init (GtkPlacesSidebarClass *class) NULL, NULL, _gtk_marshal_VOID__OBJECT_FLAGS, G_TYPE_NONE, 2, - G_TYPE_OBJECT, - GTK_TYPE_PLACES_OPEN_FLAGS); + G_TYPE_OBJECT, GTK_TYPE_PLACES_OPEN_FLAGS); + g_signal_set_va_marshaller (places_sidebar_signals[OPEN_LOCATION], + G_OBJECT_CLASS_TYPE (gobject_class), + _gtk_marshal_VOID__OBJECT_FLAGSv); /* * GtkPlacesSidebar::show-error-message: @@ -4163,8 +4165,10 @@ gtk_places_sidebar_class_init (GtkPlacesSidebarClass *class) NULL, NULL, _gtk_marshal_VOID__STRING_STRING, G_TYPE_NONE, 2, - G_TYPE_STRING, - G_TYPE_STRING); + G_TYPE_STRING, G_TYPE_STRING); + g_signal_set_va_marshaller (places_sidebar_signals[SHOW_ERROR_MESSAGE], + G_OBJECT_CLASS_TYPE (gobject_class), + _gtk_marshal_VOID__STRING_STRINGv); /* * GtkPlacesSidebar::show-enter-location: @@ -4216,6 +4220,9 @@ gtk_places_sidebar_class_init (GtkPlacesSidebarClass *class) GDK_TYPE_DRAG_ACTION, 2, G_TYPE_OBJECT, GDK_TYPE_FILE_LIST); + g_signal_set_va_marshaller (places_sidebar_signals[DRAG_ACTION_REQUESTED], + G_OBJECT_CLASS_TYPE (gobject_class), + _gtk_marshal_INT__OBJECT_OBJECT_POINTERv); /* * GtkPlacesSidebar::drag-action-ask: @@ -4237,6 +4244,9 @@ gtk_places_sidebar_class_init (GtkPlacesSidebarClass *class) _gtk_marshal_INT__INT, GDK_TYPE_DRAG_ACTION, 1, GDK_TYPE_DRAG_ACTION); + g_signal_set_va_marshaller (places_sidebar_signals[DRAG_ACTION_ASK], + G_OBJECT_CLASS_TYPE (gobject_class), + _gtk_marshal_INT__INTv); /* * GtkPlacesSidebar::drag-perform-drop: @@ -4263,6 +4273,9 @@ gtk_places_sidebar_class_init (GtkPlacesSidebarClass *class) G_TYPE_OBJECT, GDK_TYPE_FILE_LIST, GDK_TYPE_DRAG_ACTION); + g_signal_set_va_marshaller (places_sidebar_signals[DRAG_PERFORM_DROP], + G_OBJECT_CLASS_TYPE (gobject_class), + _gtk_marshal_VOID__OBJECT_POINTER_INTv); /* * GtkPlacesSidebar::show-other-locations-with-flags: diff --git a/gtk/gtkplacesview.c b/gtk/gtkplacesview.c index 1478d5e581..1a477999e7 100644 --- a/gtk/gtkplacesview.c +++ b/gtk/gtkplacesview.c @@ -2266,6 +2266,9 @@ gtk_places_view_class_init (GtkPlacesViewClass *klass) G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); + g_signal_set_va_marshaller (places_view_signals [SHOW_ERROR_MESSAGE], + G_TYPE_FROM_CLASS (object_class), + _gtk_marshal_VOID__STRING_STRINGv); properties[PROP_LOADING] = g_param_spec_boolean ("loading", NULL, NULL, diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c index adaf307249..c4b0fab467 100644 --- a/gtk/gtkprintoperation.c +++ b/gtk/gtkprintoperation.c @@ -27,6 +27,7 @@ #include "gtkprintoperation-private.h" #include "gtkmarshalers.h" +#include "gdk/gdkmarshalers.h" #include <glib/gi18n-lib.h> #include "gtkprivate.h" #include "deprecated/gtkmessagedialog.h" @@ -821,13 +822,15 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class) */ signals[PAGINATE] = g_signal_new (I_("paginate"), - G_TYPE_FROM_CLASS (gobject_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkPrintOperationClass, paginate), - paginate_accumulator, NULL, - _gtk_marshal_BOOLEAN__OBJECT, - G_TYPE_BOOLEAN, 1, GTK_TYPE_PRINT_CONTEXT); - + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkPrintOperationClass, paginate), + paginate_accumulator, NULL, + _gdk_marshal_BOOLEAN__OBJECT, + G_TYPE_BOOLEAN, 1, GTK_TYPE_PRINT_CONTEXT); + g_signal_set_va_marshaller (signals[PAGINATE], + G_TYPE_FROM_CLASS (gobject_class), + _gdk_marshal_BOOLEAN__OBJECTv); /** * GtkPrintOperation::request-page-setup: @@ -844,15 +847,18 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class) */ signals[REQUEST_PAGE_SETUP] = g_signal_new (I_("request-page-setup"), - G_TYPE_FROM_CLASS (gobject_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkPrintOperationClass, request_page_setup), - NULL, NULL, - _gtk_marshal_VOID__OBJECT_INT_OBJECT, - G_TYPE_NONE, 3, - GTK_TYPE_PRINT_CONTEXT, - G_TYPE_INT, - GTK_TYPE_PAGE_SETUP); + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkPrintOperationClass, request_page_setup), + NULL, NULL, + _gtk_marshal_VOID__OBJECT_INT_OBJECT, + G_TYPE_NONE, 3, + GTK_TYPE_PRINT_CONTEXT, + G_TYPE_INT, + GTK_TYPE_PAGE_SETUP); + g_signal_set_va_marshaller (signals[REQUEST_PAGE_SETUP], + G_TYPE_FROM_CLASS (gobject_class), + _gtk_marshal_VOID__OBJECT_INT_OBJECTv); /** * GtkPrintOperation::draw-page: @@ -922,6 +928,9 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class) G_TYPE_NONE, 2, GTK_TYPE_PRINT_CONTEXT, G_TYPE_INT); + g_signal_set_va_marshaller (signals[DRAW_PAGE], + G_TYPE_FROM_CLASS (gobject_class), + _gtk_marshal_VOID__OBJECT_INTv); /** * GtkPrintOperation::end-print: @@ -989,6 +998,9 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class) custom_widget_accumulator, NULL, _gtk_marshal_OBJECT__VOID, G_TYPE_OBJECT, 0); + g_signal_set_va_marshaller (signals[CREATE_CUSTOM_WIDGET], + G_TYPE_FROM_CLASS (gobject_class), + _gtk_marshal_OBJECT__VOIDv); /** * GtkPrintOperation::update-custom-widget: @@ -1010,6 +1022,9 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class) NULL, NULL, _gtk_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, GTK_TYPE_WIDGET, GTK_TYPE_PAGE_SETUP, GTK_TYPE_PRINT_SETTINGS); + g_signal_set_va_marshaller (signals[UPDATE_CUSTOM_WIDGET], + G_TYPE_FROM_CLASS (gobject_class), + _gtk_marshal_VOID__OBJECT_OBJECT_OBJECTv); /** * GtkPrintOperation::custom-widget-apply: @@ -1070,6 +1085,9 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class) GTK_TYPE_PRINT_OPERATION_PREVIEW, GTK_TYPE_PRINT_CONTEXT, GTK_TYPE_WINDOW); + g_signal_set_va_marshaller (signals[PREVIEW], + G_TYPE_FROM_CLASS (gobject_class), + _gtk_marshal_BOOLEAN__OBJECT_OBJECT_OBJECTv); /** * GtkPrintOperation:default-page-setup: (attributes org.gtk.Property.get=gtk_print_operation_get_default_page_setup org.gtk.Property.set=gtk_print_operation_set_default_page_setup) diff --git a/gtk/gtkprintoperationpreview.c b/gtk/gtkprintoperationpreview.c index 14b4350421..423e352390 100644 --- a/gtk/gtkprintoperationpreview.c +++ b/gtk/gtkprintoperationpreview.c @@ -73,6 +73,8 @@ gtk_print_operation_preview_base_init (gpointer g_iface) if (!initialized) { + unsigned int id; + /** * GtkPrintOperationPreview::ready: * @preview: the object on which the signal is emitted @@ -104,15 +106,18 @@ gtk_print_operation_preview_base_init (gpointer g_iface) * according to @page_setup and set up a suitable cairo * context, using [method@Gtk.PrintContext.set_cairo_context]. */ - g_signal_new (I_("got-page-size"), - GTK_TYPE_PRINT_OPERATION_PREVIEW, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkPrintOperationPreviewIface, got_page_size), - NULL, NULL, - _gtk_marshal_VOID__OBJECT_OBJECT, - G_TYPE_NONE, 2, - GTK_TYPE_PRINT_CONTEXT, - GTK_TYPE_PAGE_SETUP); + id = g_signal_new (I_("got-page-size"), + GTK_TYPE_PRINT_OPERATION_PREVIEW, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkPrintOperationPreviewIface, got_page_size), + NULL, NULL, + _gtk_marshal_VOID__OBJECT_OBJECT, + G_TYPE_NONE, 2, + GTK_TYPE_PRINT_CONTEXT, + GTK_TYPE_PAGE_SETUP); + g_signal_set_va_marshaller (id, + GTK_TYPE_PRINT_OPERATION_PREVIEW, + _gtk_marshal_VOID__OBJECT_OBJECTv); initialized = TRUE; } diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index cf7a0a5bcd..a6042b8f01 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -365,6 +365,9 @@ gtk_range_class_init (GtkRangeClass *class) G_TYPE_BOOLEAN, 2, GTK_TYPE_SCROLL_TYPE, G_TYPE_DOUBLE); + g_signal_set_va_marshaller (signals[CHANGE_VALUE], + G_TYPE_FROM_CLASS (gobject_class), + _gtk_marshal_BOOLEAN__ENUM_DOUBLEv); g_object_class_override_property (gobject_class, PROP_ORIENTATION, "orientation"); diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index e3a7c347a1..8573f8240e 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -781,6 +781,9 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class) G_TYPE_BOOLEAN, 2, GTK_TYPE_SCROLL_TYPE, G_TYPE_BOOLEAN); + g_signal_set_va_marshaller (signals[SCROLL_CHILD], + G_TYPE_FROM_CLASS (gobject_class), + _gtk_marshal_BOOLEAN__ENUM_BOOLEANv); /** * GtkScrolledWindow::move-focus-out: diff --git a/gtk/gtkshortcutssection.c b/gtk/gtkshortcutssection.c index e7731f0718..6bcda8f4bd 100644 --- a/gtk/gtkshortcutssection.c +++ b/gtk/gtkshortcutssection.c @@ -352,6 +352,9 @@ gtk_shortcuts_section_class_init (GtkShortcutsSectionClass *klass) _gtk_marshal_BOOLEAN__INT, G_TYPE_BOOLEAN, 1, G_TYPE_INT); + g_signal_set_va_marshaller (signals[CHANGE_CURRENT_PAGE], + G_TYPE_FROM_CLASS (object_class), + _gtk_marshal_BOOLEAN__INTv); gtk_widget_class_add_binding_signal (widget_class, GDK_KEY_Page_Up, 0, diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index f7ef127cc5..b9a2aab2ee 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -479,6 +479,9 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class) _gtk_marshal_INT__POINTER, G_TYPE_INT, 1, G_TYPE_POINTER); + g_signal_set_va_marshaller (spinbutton_signals[INPUT], + G_TYPE_FROM_CLASS (gobject_class), + _gtk_marshal_INT__POINTERv); /** * GtkSpinButton::output: @@ -516,6 +519,9 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class) _gtk_boolean_handled_accumulator, NULL, _gtk_marshal_BOOLEAN__VOID, G_TYPE_BOOLEAN, 0); + g_signal_set_va_marshaller (spinbutton_signals[OUTPUT], + G_TYPE_FROM_CLASS (gobject_class), + _gtk_marshal_BOOLEAN__VOIDv); /** * GtkSpinButton::value-changed: diff --git a/gtk/gtktext.c b/gtk/gtktext.c index 3c30844531..6682bf3d5e 100644 --- a/gtk/gtktext.c +++ b/gtk/gtktext.c @@ -1038,6 +1038,9 @@ gtk_text_class_init (GtkTextClass *class) GTK_TYPE_MOVEMENT_STEP, G_TYPE_INT, G_TYPE_BOOLEAN); + g_signal_set_va_marshaller (signals[MOVE_CURSOR], + G_OBJECT_CLASS_TYPE (gobject_class), + _gtk_marshal_VOID__ENUM_INT_BOOLEANv); /** * GtkText::insert-at-cursor: @@ -1089,6 +1092,9 @@ gtk_text_class_init (GtkTextClass *class) G_TYPE_NONE, 2, GTK_TYPE_DELETE_TYPE, G_TYPE_INT); + g_signal_set_va_marshaller (signals[DELETE_FROM_CURSOR], + G_OBJECT_CLASS_TYPE (gobject_class), + _gtk_marshal_VOID__ENUM_INTv); /** * GtkText::backspace: diff --git a/gtk/gtktexthandle.c b/gtk/gtktexthandle.c index 898e08f3b6..c1ad9f7224 100644 --- a/gtk/gtktexthandle.c +++ b/gtk/gtktexthandle.c @@ -25,6 +25,7 @@ #include "gtkgesturedrag.h" #include "gtkgizmoprivate.h" #include "gtkmarshalers.h" +#include "gdk/gdkmarshalers.h" #include "gtknativeprivate.h" #include "gtkprivatetypebuiltins.h" #include "gtkrendericonprivate.h" @@ -362,24 +363,29 @@ gtk_text_handle_class_init (GtkTextHandleClass *klass) signals[HANDLE_DRAGGED] = g_signal_new (I_("handle-dragged"), - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - _gtk_marshal_VOID__INT_INT, - G_TYPE_NONE, 2, + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, 0, + NULL, NULL, + _gdk_marshal_VOID__INT_INT, + G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); + g_signal_set_va_marshaller (signals[HANDLE_DRAGGED], + G_OBJECT_CLASS_TYPE (object_class), + _gdk_marshal_VOID__INT_INTv); + signals[DRAG_STARTED] = g_signal_new (I_("drag-started"), - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, 0, - NULL, NULL, + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, 0, + NULL, NULL, NULL, G_TYPE_NONE, 0, G_TYPE_NONE); + signals[DRAG_FINISHED] = g_signal_new (I_("drag-finished"), - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, 0, - NULL, NULL, + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, 0, + NULL, NULL, NULL, G_TYPE_NONE, 0, G_TYPE_NONE); diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index 7e6915cc22..10e9562c48 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -272,6 +272,8 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass) G_TYPE_OBJECT, G_TYPE_INT, G_TYPE_INT); + g_signal_set_va_marshaller (signals[ALLOCATE_CHILD], G_TYPE_FROM_CLASS (klass), + _gtk_marshal_VOID__OBJECT_INT_INTv); } static void diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 1b7b975201..42f1765cd0 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -1131,6 +1131,9 @@ gtk_window_class_init (GtkWindowClass *klass) _gtk_marshal_BOOLEAN__BOOLEAN, G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN); + g_signal_set_va_marshaller (window_signals[ENABLE_DEBUGGING], + G_TYPE_FROM_CLASS (gobject_class), + _gtk_marshal_BOOLEAN__BOOLEANv); /** * GtkWindow::close-request: |