[gedit/wip/spell-checking] spell: get rid of signal marshallers

[Sébastien Wilmet <swilmet src gnome org>]

commit cbfd71a7d92a4c6a76f1d846810a06692ca825d3
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sat Jul 11 14:25:45 2015 +0200

    spell: get rid of signal marshallers
    
    This simplifies the code and the build system. If one day we want to
    move that code into a library (Gspell, for example), it'll be a little
    easier.

 plugins/spell/Makefile.am                  |   13 +------------
 plugins/spell/gedit-spell-checker-dialog.c |   19 ++++++-------------
 plugins/spell/gedit-spell-checker.c        |   13 ++++---------
 plugins/spell/gedit-spell-marshal.list     |    6 ------
 4 files changed, 11 insertions(+), 40 deletions(-)
---
diff --git a/plugins/spell/Makefile.am b/plugins/spell/Makefile.am
index e75ac67..73210d5 100644
--- a/plugins/spell/Makefile.am
+++ b/plugins/spell/Makefile.am
@@ -19,8 +19,6 @@ plugins_spell_libspell_la_CFLAGS =                            \
        $(DISABLE_DEPRECATED_CFLAGS)
 
 plugins_spell_built_sources =                          \
-       plugins/spell/gedit-spell-marshal.c             \
-       plugins/spell/gedit-spell-marshal.h             \
        plugins/spell/gedit-spell-resources.c
 
 plugins_spell_libspell_la_SOURCES =                    \
@@ -56,13 +54,6 @@ plugins_spell_libosx_la_SOURCES =            \
 plugins_spell_libspell_la_LIBADD += plugins/spell/libosx.la
 endif
 
-plugins/spell/gedit-spell-marshal.h: plugins/spell/gedit-spell-marshal.list $(GLIB_GENMARSHAL)
-       $(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=gedit_marshal > $@
-
-plugins/spell/gedit-spell-marshal.c: plugins/spell/gedit-spell-marshal.list $(GLIB_GENMARSHAL)
-       $(AM_V_GEN) echo "#include \"gedit-spell-marshal.h\"" > $@ && \
-       $(GLIB_GENMARSHAL) $< --body --prefix=gedit_marshal >> $@
-
 spell_resource_deps = $(call GRESDEPS,plugins/spell/resources/gedit-spell.gresource.xml)
 plugins/spell/gedit-spell-resources.c: $(spell_resource_deps)
        $(GRESGEN)
@@ -71,9 +62,7 @@ plugin_in_files += plugins/spell/spell.plugin.desktop.in
 
 BUILT_SOURCES += $(plugins_spell_built_sources)
 
-EXTRA_DIST +=                                  \
-       plugins/spell/gedit-spell-marshal.list  \
-       $(spell_resource_deps)
+EXTRA_DIST += $(spell_resource_deps)
 
 else
 
diff --git a/plugins/spell/gedit-spell-checker-dialog.c b/plugins/spell/gedit-spell-checker-dialog.c
index dcc5b2d..a6acc02 100644
--- a/plugins/spell/gedit-spell-checker-dialog.c
+++ b/plugins/spell/gedit-spell-checker-dialog.c
@@ -31,7 +31,6 @@
 #include <gedit/gedit-utils.h>
 
 #include "gedit-spell-checker-dialog.h"
-#include "gedit-spell-marshal.h"
 
 struct _GeditSpellCheckerDialog
 {
@@ -152,8 +151,7 @@ gedit_spell_checker_dialog_class_init (GeditSpellCheckerDialogClass * klass)
                              G_OBJECT_CLASS_TYPE (object_class),
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (GeditSpellCheckerDialogClass, ignore),
-                             NULL, NULL,
-                             gedit_marshal_VOID__STRING,
+                             NULL, NULL, NULL,
                              G_TYPE_NONE,
                              1,
                              G_TYPE_STRING);
@@ -163,8 +161,7 @@ gedit_spell_checker_dialog_class_init (GeditSpellCheckerDialogClass * klass)
                              G_OBJECT_CLASS_TYPE (object_class),
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (GeditSpellCheckerDialogClass, ignore_all),
-                             NULL, NULL,
-                             gedit_marshal_VOID__STRING,
+                             NULL, NULL, NULL,
                              G_TYPE_NONE,
                              1,
                              G_TYPE_STRING);
@@ -174,8 +171,7 @@ gedit_spell_checker_dialog_class_init (GeditSpellCheckerDialogClass * klass)
                              G_OBJECT_CLASS_TYPE (object_class),
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (GeditSpellCheckerDialogClass, change),
-                             NULL, NULL,
-                             gedit_marshal_VOID__STRING_STRING,
+                             NULL, NULL, NULL,
                              G_TYPE_NONE,
                              2,
                              G_TYPE_STRING,
@@ -186,8 +182,7 @@ gedit_spell_checker_dialog_class_init (GeditSpellCheckerDialogClass * klass)
                              G_OBJECT_CLASS_TYPE (object_class),
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (GeditSpellCheckerDialogClass, change_all),
-                             NULL, NULL,
-                             gedit_marshal_VOID__STRING_STRING,
+                             NULL, NULL, NULL,
                              G_TYPE_NONE,
                              2,
                              G_TYPE_STRING,
@@ -198,8 +193,7 @@ gedit_spell_checker_dialog_class_init (GeditSpellCheckerDialogClass * klass)
                              G_OBJECT_CLASS_TYPE (object_class),
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (GeditSpellCheckerDialogClass, add_word_to_personal),
-                             NULL, NULL,
-                             gedit_marshal_VOID__STRING,
+                             NULL, NULL, NULL,
                              G_TYPE_NONE,
                              1,
                              G_TYPE_STRING);
@@ -209,8 +203,7 @@ gedit_spell_checker_dialog_class_init (GeditSpellCheckerDialogClass * klass)
                              G_OBJECT_CLASS_TYPE (klass),
                              G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                              G_STRUCT_OFFSET (GeditSpellCheckerDialogClass, close),
-                             NULL, NULL,
-                             gedit_marshal_VOID__VOID,
+                             NULL, NULL, NULL,
                              G_TYPE_NONE,
                              0);
 }
diff --git a/plugins/spell/gedit-spell-checker.c b/plugins/spell/gedit-spell-checker.c
index 7d765ba..3af90d5 100644
--- a/plugins/spell/gedit-spell-checker.c
+++ b/plugins/spell/gedit-spell-checker.c
@@ -32,7 +32,6 @@
 
 #include "gedit-spell-checker.h"
 #include "gedit-spell-utils.h"
-#include "gedit-spell-marshal.h"
 
 #ifdef OS_OSX
 #include "gedit-spell-osx.h"
@@ -148,8 +147,7 @@ gedit_spell_checker_class_init (GeditSpellCheckerClass * klass)
                          G_OBJECT_CLASS_TYPE (object_class),
                          G_SIGNAL_RUN_LAST,
                          G_STRUCT_OFFSET (GeditSpellCheckerClass, add_word_to_personal),
-                         NULL, NULL,
-                         gedit_marshal_VOID__STRING_INT,
+                         NULL, NULL, NULL,
                          G_TYPE_NONE,
                          2,
                          G_TYPE_STRING,
@@ -160,8 +158,7 @@ gedit_spell_checker_class_init (GeditSpellCheckerClass * klass)
                          G_OBJECT_CLASS_TYPE (object_class),
                          G_SIGNAL_RUN_LAST,
                          G_STRUCT_OFFSET (GeditSpellCheckerClass, add_word_to_session),
-                         NULL, NULL,
-                         gedit_marshal_VOID__STRING_INT,
+                         NULL, NULL, NULL,
                          G_TYPE_NONE,
                          2,
                          G_TYPE_STRING,
@@ -172,8 +169,7 @@ gedit_spell_checker_class_init (GeditSpellCheckerClass * klass)
                          G_OBJECT_CLASS_TYPE (object_class),
                          G_SIGNAL_RUN_LAST,
                          G_STRUCT_OFFSET (GeditSpellCheckerClass, set_language),
-                         NULL, NULL,
-                         gedit_marshal_VOID__POINTER,
+                         NULL, NULL, NULL,
                          G_TYPE_NONE,
                          1,
                          G_TYPE_POINTER);
@@ -183,8 +179,7 @@ gedit_spell_checker_class_init (GeditSpellCheckerClass * klass)
                          G_OBJECT_CLASS_TYPE (object_class),
                          G_SIGNAL_RUN_LAST,
                          G_STRUCT_OFFSET (GeditSpellCheckerClass, clear_session),
-                         NULL, NULL,
-                         gedit_marshal_VOID__VOID,
+                         NULL, NULL, NULL,
                          G_TYPE_NONE,
                          0);
 }