[almanah] build: Drop custom marshal function generation

[Philip Withnall <pwithnall src gnome org>]

commit c7f1425b70d4c0dba2df2832270d2e3317776387
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Dec 12 15:14:25 2016 +0000

    build: Drop custom marshal function generation
    
    Use the generic C closure marshaller instead.

 configure.ac             |    1 -
 src/Makefile.am          |   16 ----------------
 src/almanah-marshal.list |    2 --
 src/storage-manager.c    |    7 +++----
 4 files changed, 3 insertions(+), 23 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index fed691b..68ecbda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,6 @@ LT_INIT([])
 PKG_PROG_PKG_CONFIG
 GLIB_GSETTINGS
 
-AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal])
 AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
 
 APPDATA_XML
diff --git a/src/Makefile.am b/src/Makefile.am
index 40982c3..feba1f9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,6 @@ EXTRA_DIST =
 CLEANFILES =
 
 almanah_SOURCES = \
-       $(ALMANAH_MARSHAL_FILES)                \
        main.c                                  \
        application.c                           \
        application.h                           \
@@ -116,16 +115,6 @@ resources.c: almanah.gresource.xml $(resource_files)
 EXTRA_DIST += almanah.gresource.xml
 CLEANFILES += resources.c
 
-# Marshalling
-ALMANAH_MARSHAL_FILES = \
-       almanah-marshal.c       \
-       almanah-marshal.h
-
-almanah-marshal.h: almanah-marshal.list
-       $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=almanah_marshal --header $< > $@
-almanah-marshal.c: almanah-marshal.list almanah-marshal.h
-       $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=almanah_marshal --header --body $< > $@
-
 # Enums
 almanah_enum_header_file = enums.h
 almanah_enum_source_file = enums.c
@@ -154,9 +143,4 @@ CLEANFILES += \
        $(almanah_enum_source_file) \
        $(NULL)
 
-CLEANFILES += \
-       $(ALMANAH_MARSHAL_FILES)
-
-EXTRA_DIST += almanah-marshal.list
-
 -include $(top_srcdir)/git.mk
diff --git a/src/storage-manager.c b/src/storage-manager.c
index 01a65da..887a0f9 100644
--- a/src/storage-manager.c
+++ b/src/storage-manager.c
@@ -31,7 +31,6 @@
 
 #include "entry.h"
 #include "storage-manager.h"
-#include "almanah-marshal.h"
 #include "vfs.h"
 
 static void almanah_storage_manager_finalize (GObject *object);
@@ -98,7 +97,7 @@ almanah_storage_manager_class_init (AlmanahStorageManagerClass *klass)
                                                                     G_TYPE_FROM_CLASS (klass),
                                                                     G_SIGNAL_RUN_LAST,
                                                                     0, NULL, NULL,
-                                                                    almanah_marshal_VOID__STRING_STRING,
+                                                                    NULL,
                                                                     G_TYPE_NONE, 2, G_TYPE_STRING, 
G_TYPE_STRING);
        storage_manager_signals[SIGNAL_ENTRY_ADDED] = g_signal_new ("entry-added",
                                                                    G_TYPE_FROM_CLASS (klass),
@@ -122,13 +121,13 @@ almanah_storage_manager_class_init (AlmanahStorageManagerClass *klass)
                                                                        G_TYPE_FROM_CLASS (klass),
                                                                        G_SIGNAL_RUN_LAST,
                                                                        0, NULL, NULL,
-                                                                       almanah_marshal_VOID__OBJECT_STRING,
+                                                                       NULL,
                                                                        G_TYPE_NONE, 2, ALMANAH_TYPE_ENTRY, 
G_TYPE_STRING);
        storage_manager_signals[SIGNAL_ENTRY_TAG_REMOVED] = g_signal_new ("entry-tag-removed",
                                                                          G_TYPE_FROM_CLASS (klass),
                                                                          G_SIGNAL_RUN_LAST,
                                                                          0, NULL, NULL,
-                                                                         almanah_marshal_VOID__OBJECT_STRING,
+                                                                         NULL,
                                                                          G_TYPE_NONE, 2, ALMANAH_TYPE_ENTRY, 
G_TYPE_STRING);
 }