diff options
| author | Christian Hergert <chergert@redhat.com> | 2019-06-02 14:07:27 -0700 |
|---|---|---|
| committer | Christian Hergert <chergert@redhat.com> | 2019-06-02 14:24:51 -0700 |
| commit | 41e373f10cd727a9d87ca23ee5f72086451074e9 (patch) | |
| tree | 661274425a52b77454e19ac0b6c8ca36d86d25cf /gtk/gtkgestureclick.c | |
| parent | 1a4e360c2c289a4e3cb229310f24817234cd052b (diff) | |
| download | gtk+-41e373f10cd727a9d87ca23ee5f72086451074e9.tar.gz | |
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
Diffstat (limited to 'gtk/gtkgestureclick.c')
| -rw-r--r-- | gtk/gtkgestureclick.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/gtk/gtkgestureclick.c b/gtk/gtkgestureclick.c index 4fa713109a..8814540b18 100644 --- a/gtk/gtkgestureclick.c +++ b/gtk/gtkgestureclick.c @@ -40,6 +40,7 @@ #include "gtkgestureclickprivate.h" #include "gtkprivate.h" #include "gtkintl.h" +#include "gtkmarshalers.h" typedef struct _GtkGestureClickPrivate GtkGestureClickPrivate; @@ -365,9 +366,13 @@ gtk_gesture_click_class_init (GtkGestureClickClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkGestureClickClass, pressed), - NULL, NULL, NULL, + NULL, NULL, + _gtk_marshal_VOID__INT_DOUBLE_DOUBLE, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_DOUBLE, G_TYPE_DOUBLE); + g_signal_set_va_marshaller (signals[PRESSED], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_VOID__INT_DOUBLE_DOUBLEv); /** * GtkGestureClick::released: @@ -386,9 +391,13 @@ gtk_gesture_click_class_init (GtkGestureClickClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkGestureClickClass, released), - NULL, NULL, NULL, + NULL, NULL, + _gtk_marshal_VOID__INT_DOUBLE_DOUBLE, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_DOUBLE, G_TYPE_DOUBLE); + g_signal_set_va_marshaller (signals[RELEASED], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_VOID__INT_DOUBLE_DOUBLEv); /** * GtkGestureClick::stopped: * @gesture: the object which received the signal @@ -422,10 +431,14 @@ gtk_gesture_click_class_init (GtkGestureClickClass *klass) g_signal_new (I_("unpaired-release"), G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, NULL, + 0, NULL, NULL, + _gtk_marshal_VOID__DOUBLE_DOUBLE_UINT_BOXED, G_TYPE_NONE, 4, G_TYPE_DOUBLE, G_TYPE_DOUBLE, G_TYPE_UINT, GDK_TYPE_EVENT_SEQUENCE); + g_signal_set_va_marshaller (signals[UNPAIRED_RELEASE], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_VOID__DOUBLE_DOUBLE_UINT_BOXEDv); } static void |