diff options
Diffstat (limited to 'plugins/spell')
-rw-r--r-- | plugins/spell/Makefile.am | 16 | ||||
-rw-r--r-- | plugins/spell/pluma-spell-checker-dialog.c | 16 | ||||
-rw-r--r-- | plugins/spell/pluma-spell-checker.c | 13 | ||||
-rw-r--r-- | plugins/spell/pluma-spell-marshal.list | 6 |
4 files changed, 11 insertions, 40 deletions
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 - |