summaryrefslogtreecommitdiff
path: root/libpeas
diff options
context:
space:
mode:
authorChristian Hergert <chergert@redhat.com>2023-03-16 17:58:37 -0700
committerChristian Hergert <chergert@redhat.com>2023-03-22 16:44:35 -0700
commitc86039156c8afa90bd34425f0fe0d30a8a49b242 (patch)
tree6ce8e72dac8556e332a51cce04bd706b857b8d4e /libpeas
parent51de48d27084f7df71c7b5558fea76a3b547e5f0 (diff)
downloadlibpeas-c86039156c8afa90bd34425f0fe0d30a8a49b242.tar.gz
janitorial: set va marshallers for signals
Diffstat (limited to 'libpeas')
-rw-r--r--libpeas/meson.build1
-rw-r--r--libpeas/peas-engine.c32
-rw-r--r--libpeas/peas-extension-set.c8
-rw-r--r--libpeas/peas-marshal.list1
4 files changed, 28 insertions, 14 deletions
diff --git a/libpeas/meson.build b/libpeas/meson.build
index 37f6e4d..b20caf2 100644
--- a/libpeas/meson.build
+++ b/libpeas/meson.build
@@ -76,6 +76,7 @@ libpeas_marshal = gnome.genmarshal(
sources: 'peas-marshal.list',
prefix: 'peas_cclosure_marshal',
install_header: false,
+ valist_marshallers: true,
)
libpeas_marshals_h = libpeas_marshal.get(1)
diff --git a/libpeas/peas-engine.c b/libpeas/peas-engine.c
index d2ff71d..975a30b 100644
--- a/libpeas/peas-engine.c
+++ b/libpeas/peas-engine.c
@@ -28,16 +28,17 @@
#include <stdlib.h>
#include <string.h>
-#include "peas-i18n-priv.h"
-#include "peas-engine.h"
+#include "peas-debug.h"
+#include "peas-dirs.h"
#include "peas-engine-priv.h"
+#include "peas-engine.h"
+#include "peas-extension.h"
+#include "peas-i18n-priv.h"
+#include "peas-marshal.h"
+#include "peas-object-module.h"
#include "peas-plugin-info-priv.h"
-#include "peas-plugin-loader.h"
#include "peas-plugin-loader-c.h"
-#include "peas-object-module.h"
-#include "peas-extension.h"
-#include "peas-dirs.h"
-#include "peas-debug.h"
+#include "peas-plugin-loader.h"
#include "peas-utils.h"
/**
@@ -793,11 +794,13 @@ peas_engine_class_init (PeasEngineClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (PeasEngineClass, load_plugin),
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ peas_cclosure_marshal_VOID__BOXED,
G_TYPE_NONE,
1,
- PEAS_TYPE_PLUGIN_INFO |
- G_SIGNAL_TYPE_STATIC_SCOPE);
+ PEAS_TYPE_PLUGIN_INFO | G_SIGNAL_TYPE_STATIC_SCOPE);
+ g_signal_set_va_marshaller (signals[LOAD_PLUGIN],
+ G_TYPE_FROM_CLASS (klass),
+ peas_cclosure_marshal_VOID__BOXEDv);
/**
* PeasEngine::unload-plugin:
@@ -818,10 +821,13 @@ peas_engine_class_init (PeasEngineClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (PeasEngineClass, unload_plugin),
NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ peas_cclosure_marshal_VOID__BOXED,
G_TYPE_NONE,
- 1, PEAS_TYPE_PLUGIN_INFO |
- G_SIGNAL_TYPE_STATIC_SCOPE);
+ 1,
+ PEAS_TYPE_PLUGIN_INFO | G_SIGNAL_TYPE_STATIC_SCOPE);
+ g_signal_set_va_marshaller (signals[UNLOAD_PLUGIN],
+ G_TYPE_FROM_CLASS (klass),
+ peas_cclosure_marshal_VOID__BOXEDv);
g_object_class_install_properties (object_class, N_PROPERTIES, properties);
diff --git a/libpeas/peas-extension-set.c b/libpeas/peas-extension-set.c
index b6a471d..d2ef929 100644
--- a/libpeas/peas-extension-set.c
+++ b/libpeas/peas-extension-set.c
@@ -29,8 +29,8 @@
#include "peas-engine-priv.h"
#include "peas-i18n-priv.h"
-#include "peas-plugin-info.h"
#include "peas-marshal.h"
+#include "peas-plugin-info.h"
#include "peas-utils.h"
/**
@@ -378,6 +378,9 @@ peas_extension_set_class_init (PeasExtensionSetClass *klass)
2,
PEAS_TYPE_PLUGIN_INFO | G_SIGNAL_TYPE_STATIC_SCOPE,
PEAS_TYPE_EXTENSION);
+ g_signal_set_va_marshaller (signals[EXTENSION_ADDED],
+ G_TYPE_FROM_CLASS (klass),
+ peas_cclosure_marshal_VOID__BOXED_OBJECTv);
/**
* PeasExtensionSet::extension-removed:
@@ -407,6 +410,9 @@ peas_extension_set_class_init (PeasExtensionSetClass *klass)
2,
PEAS_TYPE_PLUGIN_INFO | G_SIGNAL_TYPE_STATIC_SCOPE,
PEAS_TYPE_EXTENSION);
+ g_signal_set_va_marshaller (signals[EXTENSION_REMOVED],
+ G_TYPE_FROM_CLASS (klass),
+ peas_cclosure_marshal_VOID__BOXED_OBJECTv);
properties[PROP_ENGINE] =
g_param_spec_object ("engine",
diff --git a/libpeas/peas-marshal.list b/libpeas/peas-marshal.list
index 82e029e..ed801e0 100644
--- a/libpeas/peas-marshal.list
+++ b/libpeas/peas-marshal.list
@@ -1 +1,2 @@
+VOID:BOXED
VOID:BOXED,OBJECT