diff options
author | mbkma <[email protected]> | 2020-10-04 18:09:56 +0200 |
---|---|---|
committer | raveit65 <[email protected]> | 2020-10-19 10:59:44 +0200 |
commit | 0830446ca167e24e3105bb76fcf5aabc13608b54 (patch) | |
tree | 22e0154a981ab80e7f2d11702e61fe522b127094 /pluma | |
parent | ae86d50d909e7e20b856107614b255104c8850a6 (diff) | |
download | pluma-0830446ca167e24e3105bb76fcf5aabc13608b54.tar.bz2 pluma-0830446ca167e24e3105bb76fcf5aabc13608b54.tar.xz |
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
Diffstat (limited to 'pluma')
-rw-r--r-- | pluma/Makefile.am | 13 | ||||
-rw-r--r-- | pluma/dialogs/pluma-search-dialog.c | 4 | ||||
-rw-r--r-- | pluma/pluma-document-loader.c | 4 | ||||
-rw-r--r-- | pluma/pluma-document-saver.c | 4 | ||||
-rw-r--r-- | pluma/pluma-document.c | 25 | ||||
-rw-r--r-- | pluma/pluma-marshal.list | 13 | ||||
-rw-r--r-- | pluma/pluma-message-bus.c | 9 | ||||
-rw-r--r-- | pluma/pluma-notebook.c | 16 | ||||
-rw-r--r-- | pluma/pluma-print-job.c | 10 | ||||
-rw-r--r-- | pluma/pluma-view.c | 13 | ||||
-rw-r--r-- | pluma/pluma-window.c | 15 |
11 files changed, 32 insertions, 94 deletions
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); |