[gtksourceview] marshallers: explicity set c_marshaller and va_marshaller
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview] marshallers: explicity set c_marshaller and va_marshaller
- Date: Wed, 29 May 2019 21:15:47 +0000 (UTC)
commit 845e543bcbe0009c40461e6835f23efbe3ebfe86
Author: Christian Hergert <chergert redhat com>
Date: Wed May 29 14:12:52 2019 -0700
marshallers: explicity set c_marshaller and va_marshaller
Since we only require GLib-2.48, we need to be explicit about both the
c_marshaller and va_marshaller to get the benefits. We might as well just
set them everywhere so it is easy to be sure they are always in use.
gtksourceview/gtksourcebufferinternal.c | 7 ++++++-
gtksourceview/gtksourcecompletion.c | 18 +++++++++++++++---
gtksourceview/gtksourcecompletioncontext.c | 6 +++++-
gtksourceview/gtksourcecompletionproposal.c | 6 +++++-
gtksourceview/gtksourcegutterrenderer.c | 29 ++++++++++++++++++++++++-----
gtksourceview/gtksourcemarkattributes.c | 13 +++++++++++--
gtksourceview/gtksourcemarshalers.list | 7 ++++++-
gtksourceview/gtksourceundomanager.c | 12 ++++++++++--
8 files changed, 82 insertions(+), 16 deletions(-)
---
diff --git a/gtksourceview/gtksourcebufferinternal.c b/gtksourceview/gtksourcebufferinternal.c
index d9511fc3..a41d17c8 100644
--- a/gtksourceview/gtksourcebufferinternal.c
+++ b/gtksourceview/gtksourcebufferinternal.c
@@ -24,6 +24,7 @@
#include "gtksourcebufferinternal.h"
#include "gtksourcebuffer.h"
+#include "gtksource-marshal.h"
#include "gtksourcesearchcontext.h"
/* A private extension of GtkSourceBuffer, to add private signals and
@@ -64,9 +65,13 @@ _gtk_source_buffer_internal_class_init (GtkSourceBufferInternalClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
0,
- NULL, NULL, NULL,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE,
1, GTK_SOURCE_TYPE_SEARCH_CONTEXT);
+ g_signal_set_va_marshaller (signals[SIGNAL_SEARCH_START],
+ G_TYPE_FROM_CLASS (klass),
+ g_cclosure_marshal_VOID__OBJECTv);
}
static void
diff --git a/gtksourceview/gtksourcecompletion.c b/gtksourceview/gtksourcecompletion.c
index 6a94d71d..06886e3d 100644
--- a/gtksourceview/gtksourcecompletion.c
+++ b/gtksourceview/gtksourcecompletion.c
@@ -2466,8 +2466,12 @@ gtk_source_completion_class_init (GtkSourceCompletionClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSourceCompletionClass, show),
- NULL, NULL, NULL,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+ g_signal_set_va_marshaller (signals[SHOW],
+ G_TYPE_FROM_CLASS (klass),
+ g_cclosure_marshal_VOID__VOIDv);
/**
@@ -2482,8 +2486,12 @@ gtk_source_completion_class_init (GtkSourceCompletionClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSourceCompletionClass, hide),
- NULL, NULL, NULL,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+ g_signal_set_va_marshaller (signals[HIDE],
+ G_TYPE_FROM_CLASS (klass),
+ g_cclosure_marshal_VOID__VOIDv);
/**
* GtkSourceCompletion::populate-context:
@@ -2498,10 +2506,14 @@ gtk_source_completion_class_init (GtkSourceCompletionClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSourceCompletionClass, populate_context),
- NULL, NULL, NULL,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE,
1,
GTK_SOURCE_TYPE_COMPLETION_CONTEXT);
+ g_signal_set_va_marshaller (signals[POPULATE_CONTEXT],
+ G_TYPE_FROM_CLASS (klass),
+ g_cclosure_marshal_VOID__OBJECTv);
/* Actions */
diff --git a/gtksourceview/gtksourcecompletioncontext.c b/gtksourceview/gtksourcecompletioncontext.c
index 148556d6..0c31956e 100644
--- a/gtksourceview/gtksourcecompletioncontext.c
+++ b/gtksourceview/gtksourcecompletioncontext.c
@@ -233,8 +233,12 @@ gtk_source_completion_context_class_init (GtkSourceCompletionContextClass *klass
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSourceCompletionContextClass, cancelled),
- NULL, NULL, NULL,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+ g_signal_set_va_marshaller (context_signals[CANCELLED],
+ G_TYPE_FROM_CLASS (klass),
+ g_cclosure_marshal_VOID__VOIDv);
/**
* GtkSourceCompletionContext:completion:
diff --git a/gtksourceview/gtksourcecompletionproposal.c b/gtksourceview/gtksourcecompletionproposal.c
index c99180ad..54417c7b 100644
--- a/gtksourceview/gtksourcecompletionproposal.c
+++ b/gtksourceview/gtksourcecompletionproposal.c
@@ -142,8 +142,12 @@ gtk_source_completion_proposal_default_init (GtkSourceCompletionProposalIface *i
G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSourceCompletionProposalIface, changed),
- NULL, NULL, NULL,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+ g_signal_set_va_marshaller (signals[CHANGED],
+ G_TYPE_FROM_INTERFACE (iface),
+ g_cclosure_marshal_VOID__VOIDv);
initialized = TRUE;
}
diff --git a/gtksourceview/gtksourcegutterrenderer.c b/gtksourceview/gtksourcegutterrenderer.c
index daa1a9fb..5ef7fba9 100644
--- a/gtksourceview/gtksourcegutterrenderer.c
+++ b/gtksourceview/gtksourcegutterrenderer.c
@@ -27,6 +27,7 @@
#include "gtksourcestylescheme.h"
#include "gtksourceview.h"
#include "gtksource-enumtypes.h"
+#include "gtksource-marshal.h"
/**
* SECTION:gutterrenderer
@@ -615,12 +616,16 @@ gtk_source_gutter_renderer_class_init (GtkSourceGutterRendererClass *klass)
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkSourceGutterRendererClass, activate),
- NULL, NULL, NULL,
+ NULL, NULL,
+ _gtk_source_marshal_VOID__BOXED_BOXED_BOXED,
G_TYPE_NONE,
3,
GTK_TYPE_TEXT_ITER,
GDK_TYPE_RECTANGLE,
GDK_TYPE_EVENT);
+ g_signal_set_va_marshaller (signals[ACTIVATE],
+ G_TYPE_FROM_CLASS (klass),
+ _gtk_source_marshal_VOID__BOXED_BOXED_BOXEDv);
/**
* GtkSourceGutterRenderer::queue-draw:
@@ -636,8 +641,12 @@ gtk_source_gutter_renderer_class_init (GtkSourceGutterRendererClass *klass)
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkSourceGutterRendererClass, queue_draw),
- NULL, NULL, NULL,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+ g_signal_set_va_marshaller (signals[QUEUE_DRAW],
+ G_TYPE_FROM_CLASS (klass),
+ g_cclosure_marshal_VOID__VOIDv);
/**
* GtkSourceGutterRenderer::query-tooltip:
@@ -659,7 +668,7 @@ gtk_source_gutter_renderer_class_init (GtkSourceGutterRendererClass *klass)
G_STRUCT_OFFSET (GtkSourceGutterRendererClass, query_tooltip),
g_signal_accumulator_true_handled,
NULL,
- NULL,
+ _gtk_source_marshal_BOOLEAN__BOXED_BOXED_INT_INT_OBJECT,
G_TYPE_BOOLEAN,
5,
GTK_TYPE_TEXT_ITER,
@@ -667,6 +676,9 @@ gtk_source_gutter_renderer_class_init (GtkSourceGutterRendererClass *klass)
G_TYPE_INT,
G_TYPE_INT,
GTK_TYPE_TOOLTIP);
+ g_signal_set_va_marshaller (signals[QUERY_TOOLTIP],
+ G_TYPE_FROM_CLASS (klass),
+ _gtk_source_marshal_BOOLEAN__BOXED_BOXED_INT_INT_OBJECTv);
/**
* GtkSourceGutterRenderer::query-data:
@@ -686,12 +698,16 @@ gtk_source_gutter_renderer_class_init (GtkSourceGutterRendererClass *klass)
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkSourceGutterRendererClass, query_data),
- NULL, NULL, NULL,
+ NULL, NULL,
+ _gtk_source_marshal_VOID__BOXED_BOXED_FLAGS,
G_TYPE_NONE,
3,
GTK_TYPE_TEXT_ITER,
GTK_TYPE_TEXT_ITER,
GTK_SOURCE_TYPE_GUTTER_RENDERER_STATE);
+ g_signal_set_va_marshaller (signals[QUERY_DATA],
+ G_TYPE_FROM_CLASS (klass),
+ _gtk_source_marshal_VOID__BOXED_BOXED_FLAGSv);
/**
* GtkSourceGutterRenderer::query-activatable:
@@ -711,12 +727,15 @@ gtk_source_gutter_renderer_class_init (GtkSourceGutterRendererClass *klass)
G_STRUCT_OFFSET (GtkSourceGutterRendererClass, query_activatable),
g_signal_accumulator_true_handled,
NULL,
- NULL,
+ _gtk_source_marshal_BOOLEAN__BOXED_BOXED_BOXED,
G_TYPE_BOOLEAN,
3,
GTK_TYPE_TEXT_ITER,
GDK_TYPE_RECTANGLE,
GDK_TYPE_EVENT);
+ g_signal_set_va_marshaller (signals[QUERY_ACTIVATABLE],
+ G_TYPE_FROM_CLASS (klass),
+ _gtk_source_marshal_BOOLEAN__BOXED_BOXED_BOXEDv);
/**
* GtkSourceGutterRenderer:view:
diff --git a/gtksourceview/gtksourcemarkattributes.c b/gtksourceview/gtksourcemarkattributes.c
index 34a25af3..8f96d9e3 100644
--- a/gtksourceview/gtksourcemarkattributes.c
+++ b/gtksourceview/gtksourcemarkattributes.c
@@ -25,6 +25,7 @@
#include "gtksourcemarkattributes.h"
#include "gtksourcemark.h"
+#include "gtksource-marshal.h"
#include "gtksourcepixbufhelper.h"
/**
@@ -323,10 +324,14 @@ gtk_source_mark_attributes_class_init (GtkSourceMarkAttributesClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,
- NULL, NULL, NULL,
+ NULL, NULL,
+ _gtk_source_marshal_STRING__OBJECT,
G_TYPE_STRING,
1,
GTK_SOURCE_TYPE_MARK);
+ g_signal_set_va_marshaller (signals[QUERY_TOOLTIP_TEXT],
+ G_TYPE_FROM_CLASS (klass),
+ _gtk_source_marshal_STRING__OBJECTv);
/**
* GtkSourceMarkAttributes::query-tooltip-markup:
@@ -344,10 +349,14 @@ gtk_source_mark_attributes_class_init (GtkSourceMarkAttributesClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,
- NULL, NULL, NULL,
+ NULL, NULL,
+ _gtk_source_marshal_STRING__OBJECT,
G_TYPE_STRING,
1,
GTK_SOURCE_TYPE_MARK);
+ g_signal_set_va_marshaller (signals[QUERY_TOOLTIP_TEXT],
+ G_TYPE_FROM_CLASS (klass),
+ _gtk_source_marshal_STRING__OBJECTv);
}
static void
diff --git a/gtksourceview/gtksourcemarshalers.list b/gtksourceview/gtksourcemarshalers.list
index da9016b7..de20fb82 100644
--- a/gtksourceview/gtksourcemarshalers.list
+++ b/gtksourceview/gtksourcemarshalers.list
@@ -1,4 +1,9 @@
+BOOLEAN:BOXED,BOXED,INT,INT,OBJECT
+BOOLEAN:BOXED,BOXED,BOXED
+STRING:OBJECT
VOID:BOXED,BOXED
-VOID:BOXED,INT
+VOID:BOXED,BOXED,BOXED
VOID:BOXED,ENUM
+VOID:BOXED,INT
VOID:ENUM,INT
+VOID:BOXED,BOXED,FLAGS
diff --git a/gtksourceview/gtksourceundomanager.c b/gtksourceview/gtksourceundomanager.c
index e753fa80..de00b97b 100644
--- a/gtksourceview/gtksourceundomanager.c
+++ b/gtksourceview/gtksourceundomanager.c
@@ -121,9 +121,13 @@ gtk_source_undo_manager_default_init (GtkSourceUndoManagerIface *iface)
G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSourceUndoManagerIface, can_undo_changed),
- NULL, NULL, NULL,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0);
+ g_signal_set_va_marshaller (signals[CAN_UNDO_CHANGED],
+ G_TYPE_FROM_INTERFACE (iface),
+ g_cclosure_marshal_VOID__VOIDv);
/**
* GtkSourceUndoManager::can-redo-changed:
@@ -139,9 +143,13 @@ gtk_source_undo_manager_default_init (GtkSourceUndoManagerIface *iface)
G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSourceUndoManagerIface, can_redo_changed),
- NULL, NULL, NULL,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0);
+ g_signal_set_va_marshaller (signals[CAN_REDO_CHANGED],
+ G_TYPE_FROM_INTERFACE (iface),
+ g_cclosure_marshal_VOID__VOIDv);
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
