Remove pluma-marshal.

These days we can use the automatic ffi marshalling.

See:

- https://developer.gnome.org/gobject/stable/gobject-Signals.html#g-signal-new
- http://sourceware.org/libffi/
- https://gitlab.gnome.org/GNOME/gedit/-/commit/373adb7d041b0559953d0ac8cf2213ecc44db956

21 files changed, 90 insertions, 218 deletions

diff --git a/configure.ac b/configure.ac
index 93e58dfe..11907909 100644
--- a/configure.ac
+++ b/configure.ac
@@ -205,7 +205,6 @@ GLIB_GSETTINGS
 dnl ================================================================
 dnl Misc
 dnl ================================================================
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
 
 AC_ARG_ENABLE([tests],
diff --git a/plugins/filebrowser/Makefile.am b/plugins/filebrowser/Makefile.am
index 095cdc1d..ecc55088 100644
--- a/plugins/filebrowser/Makefile.am
+++ b/plugins/filebrowser/Makefile.am
@@ -9,9 +9,7 @@ AM_CPPFLAGS = \
 
 BUILT_SOURCES = \
 	pluma-file-browser-enum-types.h		\
-	pluma-file-browser-enum-types.c		\
-	pluma-file-browser-marshal.h 		\
-	pluma-file-browser-marshal.c
+	pluma-file-browser-enum-types.c
 
 plugin_LTLIBRARIES = libfilebrowser.la
 
@@ -57,13 +55,6 @@ pluma-file-browser-enum-types.c: pluma-file-browser-enum-types.c.template pluma-
 	$(GLIB_MKENUMS) --template pluma-file-browser-enum-types.c.template $(NOINST_H_FILES) && \
 	$(GLIB_MKENUMS) --template pluma-file-browser-enum-register.c.template $(NOINST_H_FILES)) > $@
 
-pluma-file-browser-marshal.h: pluma-file-browser-marshal.list $(GLIB_GENMARSHAL)
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=pluma_file_browser_marshal > $@
-
-pluma-file-browser-marshal.c: pluma-file-browser-marshal.list $(GLIB_GENMARSHAL)
-	$(AM_V_GEN) echo "#include \"pluma-file-browser-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) $< --body --prefix=pluma_file_browser_marshal >> $@
-
 filebrowser_gschema_in = org.mate.pluma.plugins.filebrowser.gschema.xml.in
 gsettings_SCHEMAS = $(filebrowser_gschema_in:.xml.in=.xml)
 @GSETTINGS_RULES@
@@ -74,8 +65,7 @@ EXTRA_DIST = \
 	$(filebrowser_gschema_in)			\
 	pluma-file-browser-enum-types.h.template	\
 	pluma-file-browser-enum-types.c.template	\
-	pluma-file-browser-enum-register.c.template	\
-	pluma-file-browser-marshal.list
+	pluma-file-browser-enum-register.c.template
 
 CLEANFILES = \
 	$(plugin_DATA)		\
diff --git a/plugins/filebrowser/pluma-file-browser-marshal.list b/plugins/filebrowser/pluma-file-browser-marshal.list
deleted file mode 100644
index f9349d22..00000000
--- a/plugins/filebrowser/pluma-file-browser-marshal.list
+++ /dev/null
@@ -1,5 +0,0 @@
-VOID:UINT,STRING
-VOID:STRING,STRING
-BOOLEAN:OBJECT,POINTER
-BOOLEAN:POINTER
-BOOLEAN:VOID
diff --git a/plugins/filebrowser/pluma-file-browser-store.c b/plugins/filebrowser/pluma-file-browser-store.c
index ae100379..642f9e71 100644
--- a/plugins/filebrowser/pluma-file-browser-store.c
+++ b/plugins/filebrowser/pluma-file-browser-store.c
@@ -28,7 +28,6 @@
 #include <gio/gio.h>
 
 #include "pluma-file-browser-store.h"
-#include "pluma-file-browser-marshal.h"
 #include "pluma-file-browser-enum-types.h"
 #include "pluma-file-browser-error.h"
 #include "pluma-file-browser-utils.h"
@@ -356,67 +355,60 @@ pluma_file_browser_store_class_init (PlumaFileBrowserStoreClass * klass)
 	    g_signal_new ("begin-loading",
 			  G_OBJECT_CLASS_TYPE (object_class),
 			  G_SIGNAL_RUN_LAST,
-			  G_STRUCT_OFFSET (PlumaFileBrowserStoreClass,
-					   begin_loading), NULL, NULL,
-			  g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1,
-			  GTK_TYPE_TREE_ITER);
+			  G_STRUCT_OFFSET (PlumaFileBrowserStoreClass, begin_loading),
+			  NULL, NULL, NULL,
+			  G_TYPE_NONE, 1, GTK_TYPE_TREE_ITER);
 	model_signals[END_LOADING] =
 	    g_signal_new ("end-loading",
 			  G_OBJECT_CLASS_TYPE (object_class),
 			  G_SIGNAL_RUN_LAST,
-			  G_STRUCT_OFFSET (PlumaFileBrowserStoreClass,
-					   end_loading), NULL, NULL,
-			  g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1,
+			  G_STRUCT_OFFSET (PlumaFileBrowserStoreClass, end_loading),
+			  NULL, NULL, NULL,
+			  G_TYPE_NONE, 1,
 			  GTK_TYPE_TREE_ITER);
 	model_signals[ERROR] =
 	    g_signal_new ("error", G_OBJECT_CLASS_TYPE (object_class),
 			  G_SIGNAL_RUN_LAST,
-			  G_STRUCT_OFFSET (PlumaFileBrowserStoreClass,
-					   error), NULL, NULL,
-			  pluma_file_browser_marshal_VOID__UINT_STRING,
+			  G_STRUCT_OFFSET (PlumaFileBrowserStoreClass, error),
+			  NULL, NULL, NULL,
 			  G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
 	model_signals[NO_TRASH] =
 	    g_signal_new ("no-trash", G_OBJECT_CLASS_TYPE (object_class),
 			  G_SIGNAL_RUN_LAST,
-			  G_STRUCT_OFFSET (PlumaFileBrowserStoreClass,
-					   no_trash), g_signal_accumulator_true_handled, NULL,
-			  pluma_file_browser_marshal_BOOLEAN__POINTER,
+			  G_STRUCT_OFFSET (PlumaFileBrowserStoreClass, no_trash),
+			  g_signal_accumulator_true_handled, NULL, NULL,
 			  G_TYPE_BOOLEAN, 1, G_TYPE_POINTER);
 	model_signals[RENAME] =
 	    g_signal_new ("rename",
 			  G_OBJECT_CLASS_TYPE (object_class),
 			  G_SIGNAL_RUN_LAST,
-			  G_STRUCT_OFFSET (PlumaFileBrowserStoreClass,
-					   rename), NULL, NULL,
-			  pluma_file_browser_marshal_VOID__STRING_STRING,
+			  G_STRUCT_OFFSET (PlumaFileBrowserStoreClass, rename),
+			  NULL, NULL, NULL,
 			  G_TYPE_NONE, 2,
 			  G_TYPE_STRING,
 			  G_TYPE_STRING);
 	model_signals[BEGIN_REFRESH] =
 	    g_signal_new ("begin-refresh",
-	    		  G_OBJECT_CLASS_TYPE (object_class),
-	    		  G_SIGNAL_RUN_LAST,
-	    		  G_STRUCT_OFFSET (PlumaFileBrowserStoreClass,
-	    		  		   begin_refresh), NULL, NULL,
-	    		  g_cclosure_marshal_VOID__VOID,
-	    		  G_TYPE_NONE, 0);
+			  G_OBJECT_CLASS_TYPE (object_class),
+			  G_SIGNAL_RUN_LAST,
+			  G_STRUCT_OFFSET (PlumaFileBrowserStoreClass, begin_refresh),
+			  NULL, NULL, NULL,
+			  G_TYPE_NONE, 0);
 	model_signals[END_REFRESH] =
 	    g_signal_new ("end-refresh",
-	    		  G_OBJECT_CLASS_TYPE (object_class),
-	    		  G_SIGNAL_RUN_LAST,
-	    		  G_STRUCT_OFFSET (PlumaFileBrowserStoreClass,
-	    		  		   end_refresh), NULL, NULL,
-	    		  g_cclosure_marshal_VOID__VOID,
-	    		  G_TYPE_NONE, 0);
+			  G_OBJECT_CLASS_TYPE (object_class),
+			  G_SIGNAL_RUN_LAST,
+			  G_STRUCT_OFFSET (PlumaFileBrowserStoreClass, end_refresh),
+			  NULL, NULL, NULL,
+			  G_TYPE_NONE, 0);
 	model_signals[UNLOAD] =
 	    g_signal_new ("unload",
-	    		  G_OBJECT_CLASS_TYPE (object_class),
-	    		  G_SIGNAL_RUN_LAST,
-	    		  G_STRUCT_OFFSET (PlumaFileBrowserStoreClass,
-	    		  		   unload), NULL, NULL,
-	    		  g_cclosure_marshal_VOID__STRING,
-	    		  G_TYPE_NONE, 1,
-	    		  G_TYPE_STRING);
+			  G_OBJECT_CLASS_TYPE (object_class),
+			  G_SIGNAL_RUN_LAST,
+			  G_STRUCT_OFFSET (PlumaFileBrowserStoreClass, unload),
+			  NULL, NULL, NULL,
+			  G_TYPE_NONE, 1,
+			  G_TYPE_STRING);
 }
 
 static void
diff --git a/plugins/filebrowser/pluma-file-browser-view.c b/plugins/filebrowser/pluma-file-browser-view.c
index 5fae1745..7652d2be 100644
--- a/plugins/filebrowser/pluma-file-browser-view.c
+++ b/plugins/filebrowser/pluma-file-browser-view.c
@@ -27,7 +27,6 @@
 #include "pluma-file-browser-store.h"
 #include "pluma-file-bookmarks-store.h"
 #include "pluma-file-browser-view.h"
-#include "pluma-file-browser-marshal.h"
 #include "pluma-file-browser-enum-types.h"
 
 struct _PlumaFileBrowserViewPrivate
@@ -876,33 +875,29 @@ pluma_file_browser_view_class_init (PlumaFileBrowserViewClass * klass)
 	    g_signal_new ("error",
 			  G_OBJECT_CLASS_TYPE (object_class),
 			  G_SIGNAL_RUN_LAST,
-			  G_STRUCT_OFFSET (PlumaFileBrowserViewClass,
-					   error), NULL, NULL,
-			  pluma_file_browser_marshal_VOID__UINT_STRING,
+			  G_STRUCT_OFFSET (PlumaFileBrowserViewClass, error),
+			  NULL, NULL, NULL,
 			  G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
 	signals[FILE_ACTIVATED] =
 	    g_signal_new ("file-activated",
 			  G_OBJECT_CLASS_TYPE (object_class),
 			  G_SIGNAL_RUN_LAST,
-			  G_STRUCT_OFFSET (PlumaFileBrowserViewClass,
-					   file_activated), NULL, NULL,
-			  g_cclosure_marshal_VOID__BOXED,
+			  G_STRUCT_OFFSET (PlumaFileBrowserViewClass, file_activated),
+			  NULL, NULL, NULL,
 			  G_TYPE_NONE, 1, GTK_TYPE_TREE_ITER);
 	signals[DIRECTORY_ACTIVATED] =
 	    g_signal_new ("directory-activated",
 			  G_OBJECT_CLASS_TYPE (object_class),
 			  G_SIGNAL_RUN_LAST,
-			  G_STRUCT_OFFSET (PlumaFileBrowserViewClass,
-					   directory_activated), NULL, NULL,
-			  g_cclosure_marshal_VOID__BOXED,
+			  G_STRUCT_OFFSET (PlumaFileBrowserViewClass, directory_activated),
+			  NULL, NULL, NULL,
 			  G_TYPE_NONE, 1, GTK_TYPE_TREE_ITER);
 	signals[BOOKMARK_ACTIVATED] =
 	    g_signal_new ("bookmark-activated",
 			  G_OBJECT_CLASS_TYPE (object_class),
 			  G_SIGNAL_RUN_LAST,
-			  G_STRUCT_OFFSET (PlumaFileBrowserViewClass,
-					   bookmark_activated), NULL, NULL,
-			  g_cclosure_marshal_VOID__BOXED,
+			  G_STRUCT_OFFSET (PlumaFileBrowserViewClass, bookmark_activated),
+			  NULL, NULL, NULL,
 			  G_TYPE_NONE, 1, GTK_TYPE_TREE_ITER);
 }
 
diff --git a/plugins/filebrowser/pluma-file-browser-widget.c b/plugins/filebrowser/pluma-file-browser-widget.c
index 5544bd57..7d41e74c 100644
--- a/plugins/filebrowser/pluma-file-browser-widget.c
+++ b/plugins/filebrowser/pluma-file-browser-widget.c
@@ -39,7 +39,6 @@
 #include "pluma-file-browser-view.h"
 #include "pluma-file-browser-store.h"
 #include "pluma-file-bookmarks-store.h"
-#include "pluma-file-browser-marshal.h"
 #include "pluma-file-browser-enum-types.h"
 
 #define XML_UI_FILE "pluma-file-browser-widget-ui.xml"
@@ -435,26 +434,22 @@ pluma_file_browser_widget_class_init (PlumaFileBrowserWidgetClass * klass)
 	    g_signal_new ("uri-activated",
 			  G_OBJECT_CLASS_TYPE (object_class),
 			  G_SIGNAL_RUN_LAST,
-			  G_STRUCT_OFFSET (PlumaFileBrowserWidgetClass,
-					   uri_activated), NULL, NULL,
-			  g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1,
+			  G_STRUCT_OFFSET (PlumaFileBrowserWidgetClass, uri_activated),
+			  NULL, NULL, NULL,
+			  G_TYPE_NONE, 1,
 			  G_TYPE_STRING);
 	signals[ERROR] =
 	    g_signal_new ("error", G_OBJECT_CLASS_TYPE (object_class),
 			  G_SIGNAL_RUN_LAST,
-			  G_STRUCT_OFFSET (PlumaFileBrowserWidgetClass,
-					   error), NULL, NULL,
-			  pluma_file_browser_marshal_VOID__UINT_STRING,
+			  G_STRUCT_OFFSET (PlumaFileBrowserWidgetClass, error),
+			  NULL, NULL, NULL,
 			  G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
 
 	signals[CONFIRM_DELETE] =
 	    g_signal_new ("confirm-delete", G_OBJECT_CLASS_TYPE (object_class),
 	                  G_SIGNAL_RUN_LAST,
-	                  G_STRUCT_OFFSET (PlumaFileBrowserWidgetClass,
-	                                   confirm_delete),
-	                  g_signal_accumulator_true_handled,
-	                  NULL,
-	                  pluma_file_browser_marshal_BOOLEAN__OBJECT_POINTER,
+	                  G_STRUCT_OFFSET (PlumaFileBrowserWidgetClass, confirm_delete),
+	                  g_signal_accumulator_true_handled, NULL, NULL,
 	                  G_TYPE_BOOLEAN,
 	                  2,
 	                  G_TYPE_OBJECT,
@@ -463,11 +458,8 @@ pluma_file_browser_widget_class_init (PlumaFileBrowserWidgetClass * klass)
 	signals[CONFIRM_NO_TRASH] =
 	    g_signal_new ("confirm-no-trash", G_OBJECT_CLASS_TYPE (object_class),
 	                  G_SIGNAL_RUN_LAST,
-	                  G_STRUCT_OFFSET (PlumaFileBrowserWidgetClass,
-	                                   confirm_no_trash),
-	                  g_signal_accumulator_true_handled,
-	                  NULL,
-	                  pluma_file_browser_marshal_BOOLEAN__POINTER,
+	                  G_STRUCT_OFFSET (PlumaFileBrowserWidgetClass, confirm_no_trash),
+	                  g_signal_accumulator_true_handled, NULL, NULL,
 	                  G_TYPE_BOOLEAN,
 	                  1,
 	                  G_TYPE_POINTER);
diff --git a/plugins/spell/Makefile.am b/plugins/spell/Makefile.am
index 79f67c1b..587596c5 100644
--- a/plugins/spell/Makefile.am
+++ b/plugins/spell/Makefile.am
@@ -7,10 +7,6 @@ AM_CPPFLAGS = 							\
 	$(ENCHANT_CFLAGS)					\
 	$(WARN_CFLAGS)
 
-BUILT_SOURCES = 					\
-	pluma-spell-marshal.c				\
-	pluma-spell-marshal.h
-
 plugin_LTLIBRARIES = libspell.la
 
 libspell_la_SOURCES = \
@@ -28,9 +24,9 @@ libspell_la_SOURCES = \
 	pluma-automatic-spell-checker.h			\
 	pluma-spell-utils.c				\
 	pluma-spell-utils.h				\
-	$(BUILT_SOURCES)			
+	$(BUILT_SOURCES)
 
-libspell_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) 
+libspell_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libspell_la_LIBADD  = $(PLUMA_LIBS) $(ENCHANT_LIBS)
 
 uidir = $(PLUMA_PLUGINS_DATA_DIR)/spell
@@ -38,13 +34,6 @@ ui_files = spell-checker.ui languages-dialog.ui pluma-spell-setup-dialog.ui
 include $(top_srcdir)/gla11y.mk
 ui_DATA = $(ui_files)
 
-pluma-spell-marshal.h: pluma-spell-marshal.list $(GLIB_GENMARSHAL)
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=pluma_marshal > $@
-
-pluma-spell-marshal.c: pluma-spell-marshal.list $(GLIB_GENMARSHAL)
-	$(AM_V_GEN) echo "#include \"pluma-spell-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) $< --body --prefix=pluma_marshal >> $@
-
 plugin_in_files = spell.plugin.desktop.in
 plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
@@ -59,7 +48,6 @@ gsettings_SCHEMAS = $(spell_gschema_in:.xml.in=.xml)
 EXTRA_DIST = 					\
 	$(ui_DATA)				\
 	$(plugin_in_files)			\
-	pluma-spell-marshal.list    	        \
 	$(spell_gschema_in)			\
 	ui-a11y.suppr
 
diff --git a/plugins/spell/pluma-spell-checker-dialog.c b/plugins/spell/pluma-spell-checker-dialog.c
index 146c3175..61f83fdf 100644
--- a/plugins/spell/pluma-spell-checker-dialog.c
+++ b/plugins/spell/pluma-spell-checker-dialog.c
@@ -36,7 +36,6 @@
 #include <gtk/gtk.h>
 #include <pluma/pluma-utils.h>
 #include "pluma-spell-checker-dialog.h"
-#include "pluma-spell-marshal.h"
 
 struct _PlumaSpellCheckerDialog
 {
@@ -142,8 +141,7 @@ pluma_spell_checker_dialog_class_init (PlumaSpellCheckerDialogClass * klass)
  			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (PlumaSpellCheckerDialogClass, ignore),
-			      NULL, NULL,
-			      pluma_marshal_VOID__STRING,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      1,
 			      G_TYPE_STRING);
@@ -153,8 +151,7 @@ pluma_spell_checker_dialog_class_init (PlumaSpellCheckerDialogClass * klass)
  			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (PlumaSpellCheckerDialogClass, ignore_all),
-			      NULL, NULL,
-			      pluma_marshal_VOID__STRING,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      1,
 			      G_TYPE_STRING);
@@ -164,8 +161,7 @@ pluma_spell_checker_dialog_class_init (PlumaSpellCheckerDialogClass * klass)
  			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (PlumaSpellCheckerDialogClass, change),
-			      NULL, NULL,
-			      pluma_marshal_VOID__STRING_STRING,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      2,
 			      G_TYPE_STRING,
@@ -176,8 +172,7 @@ pluma_spell_checker_dialog_class_init (PlumaSpellCheckerDialogClass * klass)
  			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (PlumaSpellCheckerDialogClass, change_all),
-			      NULL, NULL,
-			      pluma_marshal_VOID__STRING_STRING,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      2,
 			      G_TYPE_STRING,
@@ -188,8 +183,7 @@ pluma_spell_checker_dialog_class_init (PlumaSpellCheckerDialogClass * klass)
  			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (PlumaSpellCheckerDialogClass, add_word_to_personal),
-			      NULL, NULL,
-			      pluma_marshal_VOID__STRING,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      1,
 			      G_TYPE_STRING);
diff --git a/plugins/spell/pluma-spell-checker.c b/plugins/spell/pluma-spell-checker.c
index 8318d5fa..e269faf4 100644
--- a/plugins/spell/pluma-spell-checker.c
+++ b/plugins/spell/pluma-spell-checker.c
@@ -40,7 +40,6 @@
 
 #include "pluma-spell-checker.h"
 #include "pluma-spell-utils.h"
-#include "pluma-spell-marshal.h"
 
 struct _PlumaSpellChecker
 {
@@ -152,8 +151,7 @@ pluma_spell_checker_class_init (PlumaSpellCheckerClass * klass)
 			  G_OBJECT_CLASS_TYPE (object_class),
 			  G_SIGNAL_RUN_LAST,
 			  G_STRUCT_OFFSET (PlumaSpellCheckerClass, add_word_to_personal),
-			  NULL, NULL,
-			  pluma_marshal_VOID__STRING_INT,
+			  NULL, NULL, NULL,
 			  G_TYPE_NONE,
 			  2,
 			  G_TYPE_STRING,
@@ -164,8 +162,7 @@ pluma_spell_checker_class_init (PlumaSpellCheckerClass * klass)
 			  G_OBJECT_CLASS_TYPE (object_class),
 			  G_SIGNAL_RUN_LAST,
 			  G_STRUCT_OFFSET (PlumaSpellCheckerClass, add_word_to_session),
-			  NULL, NULL,
-			  pluma_marshal_VOID__STRING_INT,
+			  NULL, NULL, NULL,
 			  G_TYPE_NONE,
 			  2,
 			  G_TYPE_STRING,
@@ -176,8 +173,7 @@ pluma_spell_checker_class_init (PlumaSpellCheckerClass * klass)
 			  G_OBJECT_CLASS_TYPE (object_class),
 			  G_SIGNAL_RUN_LAST,
 			  G_STRUCT_OFFSET (PlumaSpellCheckerClass, set_language),
-			  NULL, NULL,
-			  pluma_marshal_VOID__POINTER,
+			  NULL, NULL, NULL,
 			  G_TYPE_NONE,
 			  1,
 			  G_TYPE_POINTER);
@@ -187,8 +183,7 @@ pluma_spell_checker_class_init (PlumaSpellCheckerClass * klass)
 			  G_OBJECT_CLASS_TYPE (object_class),
 			  G_SIGNAL_RUN_LAST,
 			  G_STRUCT_OFFSET (PlumaSpellCheckerClass, clear_session),
-			  NULL, NULL,
-			  pluma_marshal_VOID__VOID,
+			  NULL, NULL, NULL,
 			  G_TYPE_NONE,
 			  0);
 }
diff --git a/plugins/spell/pluma-spell-marshal.list b/plugins/spell/pluma-spell-marshal.list
deleted file mode 100644
index 007dcf7d..00000000
--- a/plugins/spell/pluma-spell-marshal.list
+++ /dev/null
@@ -1,6 +0,0 @@
-VOID:STRING
-VOID:STRING,STRING
-VOID:STRING,INT
-VOID:POINTER
-VOID:VOID
-
diff --git a/pluma/Makefile.am b/pluma/Makefile.am
index 19654228..fa8685a3 100644
--- a/pluma/Makefile.am
+++ b/pluma/Makefile.am
@@ -34,10 +34,7 @@ libpluma_la_LIBADD += $(PLUMA_LIBS) -lICE
 
 BUILT_SOURCES = 			\
 	pluma-enum-types.c		\
-	pluma-enum-types.h		\
-	pluma-marshal.c			\
-	pluma-marshal.h
-
+	pluma-enum-types.h
 
 NOINST_H_FILES =			\
 	pluma-close-button.h		\
@@ -158,13 +155,6 @@ pluma-enum-types.h: pluma-enum-types.h.template $(INST_H_FILES) $(GLIB_MKENUMS)
 pluma-enum-types.c: pluma-enum-types.c.template $(INST_H_FILES) $(GLIB_MKENUMS)
 	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template pluma-enum-types.c.template $(INST_H_FILES)) > $@
 
-pluma-marshal.h: pluma-marshal.list $(GLIB_GENMARSHAL)
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=pluma_marshal > $@
-
-pluma-marshal.c: pluma-marshal.list $(GLIB_GENMARSHAL)
-	$(AM_V_GEN) echo "#include \"pluma-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) $< --body --prefix=pluma_marshal >> $@
-
 aboutdir = $(datadir)/pluma/
 about_DATA =				\
 	pluma.about			\
@@ -182,7 +172,6 @@ EXTRA_DIST = 				\
 	$(about_DATA)			\
 	pluma-enum-types.h.template	\
 	pluma-enum-types.c.template	\
-	pluma-marshal.list		\
 	pluma.rc			\
 	ui-a11y.suppr
 
diff --git a/pluma/dialogs/pluma-search-dialog.c b/pluma/dialogs/pluma-search-dialog.c
index 57138328..e4fd38e6 100644
--- a/pluma/dialogs/pluma-search-dialog.c
+++ b/pluma/dialogs/pluma-search-dialog.c
@@ -40,7 +40,6 @@
 #include "pluma-search-dialog.h"
 #include "pluma-history-entry.h"
 #include "pluma-utils.h"
-#include "pluma-marshal.h"
 #include "pluma-dirs.h"
 
 /* Signals */
@@ -158,8 +157,7 @@ pluma_search_dialog_class_init (PlumaSearchDialogClass *klass)
 		  	      G_TYPE_FROM_CLASS (object_class),
 		  	      G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 		  	      G_STRUCT_OFFSET (PlumaSearchDialogClass, show_replace),
-			      NULL, NULL,
-			      pluma_marshal_BOOLEAN__VOID,
+			      NULL, NULL, NULL,
 			      G_TYPE_BOOLEAN, 0);
 
 	g_object_class_install_property (object_class, PROP_SHOW_REPLACE,
diff --git a/pluma/pluma-document-loader.c b/pluma/pluma-document-loader.c
index ed551666..62bc9b29 100644
--- a/pluma/pluma-document-loader.c
+++ b/pluma/pluma-document-loader.c
@@ -43,7 +43,6 @@
 #include "pluma-debug.h"
 #include "pluma-metadata-manager.h"
 #include "pluma-utils.h"
-#include "pluma-marshal.h"
 #include "pluma-enum-types.h"
 #include "pluma-settings.h"
 
@@ -296,8 +295,7 @@ pluma_document_loader_class_init (PlumaDocumentLoaderClass *klass)
                       G_OBJECT_CLASS_TYPE (object_class),
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (PlumaDocumentLoaderClass, loading),
-                      NULL, NULL,
-                      pluma_marshal_VOID__BOOLEAN_POINTER,
+                      NULL, NULL, NULL,
                       G_TYPE_NONE,
                       2,
                       G_TYPE_BOOLEAN,
diff --git a/pluma/pluma-document-saver.c b/pluma/pluma-document-saver.c
index c215275c..61ed6666 100644
--- a/pluma/pluma-document-saver.c
+++ b/pluma/pluma-document-saver.c
@@ -39,7 +39,6 @@
 #include "pluma-document-saver.h"
 #include "pluma-document-input-stream.h"
 #include "pluma-debug.h"
-#include "pluma-marshal.h"
 #include "pluma-utils.h"
 #include "pluma-enum-types.h"
 #include "pluma-settings.h"
@@ -328,8 +327,7 @@ pluma_document_saver_class_init (PlumaDocumentSaverClass *klass)
                       G_OBJECT_CLASS_TYPE (object_class),
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (PlumaDocumentSaverClass, saving),
-                      NULL, NULL,
-                      pluma_marshal_VOID__BOOLEAN_POINTER,
+                      NULL, NULL, NULL,
                       G_TYPE_NONE,
                       2,
                       G_TYPE_BOOLEAN,
diff --git a/pluma/pluma-document.c b/pluma/pluma-document.c
index 53345e38..6b26a317 100644
--- a/pluma/pluma-document.c
+++ b/pluma/pluma-document.c
@@ -48,7 +48,6 @@
 #include "pluma-style-scheme-manager.h"
 #include "pluma-document-loader.h"
 #include "pluma-document-saver.h"
-#include "pluma-marshal.h"
 #include "pluma-enum-types.h"
 #include "plumatextregion.h"
 
@@ -535,8 +534,7 @@ pluma_document_class_init (PlumaDocumentClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (PlumaDocumentClass, cursor_moved),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      0);
 
@@ -555,8 +553,7 @@ pluma_document_class_init (PlumaDocumentClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (PlumaDocumentClass, load),
-			      NULL, NULL,
-			      pluma_marshal_VOID__STRING_BOXED_INT_BOOLEAN,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      4,
 			      G_TYPE_STRING,
@@ -572,8 +569,7 @@ pluma_document_class_init (PlumaDocumentClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (PlumaDocumentClass, loading),
-			      NULL, NULL,
-			      pluma_marshal_VOID__UINT64_UINT64,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      2,
 			      G_TYPE_UINT64,
@@ -584,8 +580,7 @@ pluma_document_class_init (PlumaDocumentClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (PlumaDocumentClass, loaded),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__POINTER,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      1,
 			      G_TYPE_POINTER);
@@ -604,8 +599,7 @@ pluma_document_class_init (PlumaDocumentClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (PlumaDocumentClass, save),
-			      NULL, NULL,
-			      pluma_marshal_VOID__STRING_BOXED_FLAGS,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      3,
 			      G_TYPE_STRING,
@@ -619,8 +613,7 @@ pluma_document_class_init (PlumaDocumentClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (PlumaDocumentClass, saving),
-			      NULL, NULL,
-			      pluma_marshal_VOID__UINT64_UINT64,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      2,
 			      G_TYPE_UINT64,
@@ -631,8 +624,7 @@ pluma_document_class_init (PlumaDocumentClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (PlumaDocumentClass, saved),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__POINTER,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      1,
 			      G_TYPE_POINTER);
@@ -642,8 +634,7 @@ pluma_document_class_init (PlumaDocumentClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (PlumaDocumentClass, search_highlight_updated),
-			      NULL, NULL,
-			      pluma_marshal_VOID__BOXED_BOXED,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      2,
 			      GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE,
diff --git a/pluma/pluma-marshal.list b/pluma/pluma-marshal.list
deleted file mode 100644
index 4c0e766d..00000000
--- a/pluma/pluma-marshal.list
+++ /dev/null
@@ -1,13 +0,0 @@
-BOOLEAN:VOID
-BOOLEAN:OBJECT
-VOID:BOOLEAN
-VOID:BOOLEAN,POINTER
-VOID:BOXED,BOXED
-VOID:OBJECT
-VOID:POINTER
-VOID:STRING,BOXED,FLAGS
-VOID:STRING,BOXED,INT,BOOLEAN
-VOID:UINT,POINTER
-VOID:UINT64,UINT64
-VOID:VOID
-VOID:INT,INT
diff --git a/pluma/pluma-message-bus.c b/pluma/pluma-message-bus.c
index fc10a9d5..eccf0e7e 100644
--- a/pluma/pluma-message-bus.c
+++ b/pluma/pluma-message-bus.c
@@ -205,8 +205,7 @@ pluma_message_bus_class_init (PlumaMessageBusClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (PlumaMessageBusClass, dispatch),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__OBJECT,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      1,
 			      PLUMA_TYPE_MESSAGE);
@@ -225,8 +224,7 @@ pluma_message_bus_class_init (PlumaMessageBusClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (PlumaMessageBusClass, registered),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__BOXED,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      1,
 			      PLUMA_TYPE_MESSAGE_TYPE);
@@ -245,8 +243,7 @@ pluma_message_bus_class_init (PlumaMessageBusClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (PlumaMessageBusClass, unregistered),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__BOXED,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      1,
 			      PLUMA_TYPE_MESSAGE_TYPE);
diff --git a/pluma/pluma-notebook.c b/pluma/pluma-notebook.c
index 3f210c96..19d48edf 100644
--- a/pluma/pluma-notebook.c
+++ b/pluma/pluma-notebook.c
@@ -46,7 +46,6 @@
 #include "pluma-notebook.h"
 #include "pluma-tab.h"
 #include "pluma-tab-label.h"
-#include "pluma-marshal.h"
 #include "pluma-window.h"
 #include "pluma-settings.h"
 
@@ -148,8 +147,7 @@ pluma_notebook_class_init (PlumaNotebookClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (PlumaNotebookClass, tab_added),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__OBJECT,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      1,
 			      PLUMA_TYPE_TAB);
@@ -158,8 +156,7 @@ pluma_notebook_class_init (PlumaNotebookClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (PlumaNotebookClass, tab_removed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__OBJECT,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      1,
 			      PLUMA_TYPE_TAB);
@@ -168,8 +165,7 @@ pluma_notebook_class_init (PlumaNotebookClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (PlumaNotebookClass, tab_detached),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__OBJECT,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      1,
 			      PLUMA_TYPE_TAB);
@@ -178,8 +174,7 @@ pluma_notebook_class_init (PlumaNotebookClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (PlumaNotebookClass, tabs_reordered),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      0);
 	signals[TAB_CLOSE_REQUEST] =
@@ -187,8 +182,7 @@ pluma_notebook_class_init (PlumaNotebookClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (PlumaNotebookClass, tab_close_request),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__OBJECT,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      1,
 			      PLUMA_TYPE_TAB);
diff --git a/pluma/pluma-print-job.c b/pluma/pluma-print-job.c
index 4fc92b87..558d331b 100644
--- a/pluma/pluma-print-job.c
+++ b/pluma/pluma-print-job.c
@@ -39,7 +39,6 @@
 #include "pluma-print-job.h"
 #include "pluma-debug.h"
 #include "pluma-print-preview.h"
-#include "pluma-marshal.h"
 #include "pluma-utils.h"
 #include "pluma-dirs.h"
 #include "pluma-settings.h"
@@ -201,8 +200,7 @@ pluma_print_job_class_init (PlumaPrintJobClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (PlumaPrintJobClass, printing),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__UINT,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      1,
 			      G_TYPE_UINT);
@@ -212,8 +210,7 @@ pluma_print_job_class_init (PlumaPrintJobClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (PlumaPrintJobClass, show_preview),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__OBJECT,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      1,
 			      GTK_TYPE_WIDGET);
@@ -223,8 +220,7 @@ pluma_print_job_class_init (PlumaPrintJobClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (PlumaPrintJobClass, done),
-			      NULL, NULL,
-			      pluma_marshal_VOID__UINT_POINTER,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      2,
 			      G_TYPE_UINT,
diff --git a/pluma/pluma-view.c b/pluma/pluma-view.c
index 9c8098b9..c1918ca4 100644
--- a/pluma/pluma-view.c
+++ b/pluma/pluma-view.c
@@ -44,7 +44,6 @@
 
 #include "pluma-view.h"
 #include "pluma-debug.h"
-#include "pluma-marshal.h"
 #include "pluma-utils.h"
 #include "pluma-settings.h"
 
@@ -260,8 +259,7 @@ pluma_view_class_init (PlumaViewClass *klass)
 		  	      G_TYPE_FROM_CLASS (object_class),
 		  	      G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 		  	      G_STRUCT_OFFSET (PlumaViewClass, start_interactive_search),
-			      NULL, NULL,
-			      pluma_marshal_BOOLEAN__VOID,
+			      NULL, NULL, NULL,
 			      G_TYPE_BOOLEAN, 0);
 
 	view_signals[START_INTERACTIVE_GOTO_LINE] =
@@ -269,8 +267,7 @@ pluma_view_class_init (PlumaViewClass *klass)
 		  	      G_TYPE_FROM_CLASS (object_class),
 		  	      G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 		  	      G_STRUCT_OFFSET (PlumaViewClass, start_interactive_goto_line),
-			      NULL, NULL,
-			      pluma_marshal_BOOLEAN__VOID,
+			      NULL, NULL, NULL,
 			      G_TYPE_BOOLEAN, 0);
 
 	view_signals[RESET_SEARCHED_TEXT] =
@@ -278,8 +275,7 @@ pluma_view_class_init (PlumaViewClass *klass)
 		  	      G_TYPE_FROM_CLASS (object_class),
 		  	      G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 		  	      G_STRUCT_OFFSET (PlumaViewClass, reset_searched_text),
-			      NULL, NULL,
-			      pluma_marshal_BOOLEAN__VOID,
+			      NULL, NULL, NULL,
 			      G_TYPE_BOOLEAN, 0);
 
 	/* A new signal DROP_URIS has been added to allow plugins to intercept
@@ -296,8 +292,7 @@ pluma_view_class_init (PlumaViewClass *klass)
 		  	      G_TYPE_FROM_CLASS (object_class),
 		  	      G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 		  	      G_STRUCT_OFFSET (PlumaViewClass, drop_uris),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__BOXED,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE, 1, G_TYPE_STRV);
 
 	binding_set = gtk_binding_set_by_class (klass);
diff --git a/pluma/pluma-window.c b/pluma/pluma-window.c
index 5ae05676..fae01e60 100644
--- a/pluma/pluma-window.c
+++ b/pluma/pluma-window.c
@@ -426,8 +426,7 @@ pluma_window_class_init (PlumaWindowClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (PlumaWindowClass, tab_added),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__OBJECT,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      1,
 			      PLUMA_TYPE_TAB);
@@ -436,8 +435,7 @@ pluma_window_class_init (PlumaWindowClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (PlumaWindowClass, tab_removed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__OBJECT,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      1,
 			      PLUMA_TYPE_TAB);
@@ -446,8 +444,7 @@ pluma_window_class_init (PlumaWindowClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (PlumaWindowClass, tabs_reordered),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      0);
 	signals[ACTIVE_TAB_CHANGED] =
@@ -455,8 +452,7 @@ pluma_window_class_init (PlumaWindowClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (PlumaWindowClass, active_tab_changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__OBJECT,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      1,
 			      PLUMA_TYPE_TAB);
@@ -465,8 +461,7 @@ pluma_window_class_init (PlumaWindowClass *klass)
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (PlumaWindowClass, active_tab_state_changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
+			      NULL, NULL, NULL,
 			      G_TYPE_NONE,
 			      0);