[gtk/wip/carlosg/key-controller-fixes: 2/3] keycontroller: Fix ::key-released signal argument
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/carlosg/key-controller-fixes: 2/3] keycontroller: Fix ::key-released signal argument
- Date: Mon, 21 Oct 2019 21:45:37 +0000 (UTC)
commit 85f86d153347a5291d8981dfdd2babdf5ae10197
Author: Carlos Garnacho <carlosg gnome org>
Date: Mon Oct 21 23:40:52 2019 +0200
keycontroller: Fix ::key-released signal argument
It uses the same signature than ::key-pressed, but this signal
doesn't expose a boolean return value. Use a distinct marshaller
and fix this signal emission.
gtk/gtkeventcontrollerkey.c | 4 ++--
gtk/gtkmarshalers.list | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkeventcontrollerkey.c b/gtk/gtkeventcontrollerkey.c
index d32ac28aa8..0d98ec903e 100644
--- a/gtk/gtkeventcontrollerkey.c
+++ b/gtk/gtkeventcontrollerkey.c
@@ -200,11 +200,11 @@ gtk_event_controller_key_class_init (GtkEventControllerKeyClass *klass)
GTK_TYPE_EVENT_CONTROLLER_KEY,
G_SIGNAL_RUN_LAST,
0, NULL, NULL,
- _gtk_marshal_BOOLEAN__UINT_UINT_FLAGS,
+ _gtk_marshal_VOID__UINT_UINT_FLAGS,
G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, GDK_TYPE_MODIFIER_TYPE);
g_signal_set_va_marshaller (signals[KEY_RELEASED],
G_TYPE_FROM_CLASS (klass),
- _gtk_marshal_BOOLEAN__UINT_UINT_FLAGSv);
+ _gtk_marshal_VOID__UINT_UINT_FLAGSv);
signals[MODIFIERS] =
g_signal_new (I_("modifiers"),
diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list
index 54dd71f205..5734b65648 100644
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@ -115,6 +115,7 @@ VOID:STRING,UINT,FLAGS
VOID:STRING,UINT,FLAGS,UINT
VOID:UINT,FLAGS,BOXED
VOID:UINT,UINT
+VOID:UINT,UINT,FLAGS
VOID:UINT,STRING
VOID:UINT,BOXED,UINT,FLAGS,FLAGS
VOID:UINT,OBJECT,UINT,FLAGS,FLAGS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]