From 41e373f10cd727a9d87ca23ee5f72086451074e9 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Sun, 2 Jun 2019 14:07:27 -0700 Subject: gtk: fix all uses of g_cclosure_marshal_generic This adds specific marshallers for all of the locations where a generic marshaller is being used. It also provides va_marshallers to reduce the chances that we get stack traces from perf going through ffi_call_unix64. This is forward ported from gtk-3-24. # Conflicts: # gtk/gtkeventcontrollerkey.c # gtk/gtkeventcontrollermotion.c # gtk/gtkgesture.c # gtk/gtkgesturemultipress.c --- gtk/gtkgesturepan.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gtk/gtkgesturepan.c') diff --git a/gtk/gtkgesturepan.c b/gtk/gtkgesturepan.c index cfd5eeb8c0..fa656084c1 100644 --- a/gtk/gtkgesturepan.c +++ b/gtk/gtkgesturepan.c @@ -44,6 +44,7 @@ #include "gtktypebuiltins.h" #include "gtkprivate.h" #include "gtkintl.h" +#include "gtkmarshalers.h" typedef struct _GtkGesturePanPrivate GtkGesturePanPrivate; @@ -252,9 +253,13 @@ gtk_gesture_pan_class_init (GtkGesturePanClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkGesturePanClass, pan), - NULL, NULL, NULL, + NULL, NULL, + _gtk_marshal_VOID__ENUM_DOUBLE, G_TYPE_NONE, 2, GTK_TYPE_PAN_DIRECTION, G_TYPE_DOUBLE); + g_signal_set_va_marshaller (signals[PAN], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_VOID__ENUM_DOUBLEv); } static void -- cgit v1.2.1