[sound-juicer] libjuicer: Use the glib generic marshaller

[Bastien Nocera <hadess src gnome org>]

commit 69745958a4991e48299d921809553e484a39db0c
Author: Bastien Nocera <hadess hadess net>
Date:   Tue May 6 18:57:25 2014 +0200

    libjuicer: Use the glib generic marshaller
    
    Instead of creating a custom one. Note that this is a new function in
    GObject 2.30, but we already depend on the associated Gio 2.32, so an
    updated version dependency isn't necessary.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=729661

 libjuicer/Makefile.am              |   25 -------------------------
 libjuicer/sj-metadata-getter.c     |    3 +--
 libjuicer/sj-metadata-marshal.list |    1 -
 libjuicer/sj-metadata.c            |    1 -
 4 files changed, 1 insertions(+), 29 deletions(-)
---
diff --git a/libjuicer/Makefile.am b/libjuicer/Makefile.am
index 69f7186..ff9da32 100644
--- a/libjuicer/Makefile.am
+++ b/libjuicer/Makefile.am
@@ -47,29 +47,4 @@ libjuicer_la_LIBADD += $(MUSICBRAINZ5_LIBS)
 libjuicer_la_CFLAGS += $(MUSICBRAINZ5_CFLAGS)
 
 
-#
-# Build the GValue marshals
-#
-
-MARSHALFILES = sj-metadata-marshal.h sj-metadata-marshal.c
-GLIB_GENMARSHAL =`pkg-config --variable=glib_genmarshal glib-2.0`
-
-sj-metadata-marshal.h: sj-metadata-marshal.list
-       $(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=metadata_marshal $< \
-       --header > marshal-header.tmp \
-       && mv marshal-header.tmp $@ ) \
-       || ( rm -f marshal-header.tmp && exit 1 )
-
-sj-metadata-marshal.c: sj-metadata-marshal.list sj-metadata-marshal.h
-       $(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=metadata_marshal $< \
-       --body > marshal-source.tmp \
-       && echo "#include \"sj-metadata-marshal.h\"" > $@ \
-       && cat marshal-source.tmp >> $@ \
-       && rm -f marshal-source.tmp ) \
-       || ( rm -f marshal-source.tmp && exit 1 )
-
-BUILT_SOURCES = $(MARSHALFILES)
-CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = sj-metadata-marshal.list
-
 -include $(top_srcdir)/git.mk
diff --git a/libjuicer/sj-metadata-getter.c b/libjuicer/sj-metadata-getter.c
index b78c720..98a921c 100644
--- a/libjuicer/sj-metadata-getter.c
+++ b/libjuicer/sj-metadata-getter.c
@@ -23,7 +23,6 @@
 #include <glib/gi18n.h>
 #include "sj-structures.h"
 #include "sj-metadata-getter.h"
-#include "sj-metadata-marshal.h"
 #include "sj-metadata.h"
 #ifdef HAVE_MUSICBRAINZ5
 #include "sj-metadata-musicbrainz5.h"
@@ -84,7 +83,7 @@ sj_metadata_getter_class_init (SjMetadataGetterClass *klass)
                                    G_SIGNAL_RUN_LAST,
                                    G_STRUCT_OFFSET (SjMetadataGetterClass, metadata),
                                    NULL, NULL,
-                                   metadata_marshal_VOID__POINTER_POINTER,
+                                   g_cclosure_marshal_generic,
                                    G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 }
 
diff --git a/libjuicer/sj-metadata.c b/libjuicer/sj-metadata.c
index e772fa6..4bd25c9 100644
--- a/libjuicer/sj-metadata.c
+++ b/libjuicer/sj-metadata.c
@@ -31,7 +31,6 @@
 #endif /* USE_TOTEM_PL_PARSER */
 
 #include "sj-metadata.h"
-#include "sj-metadata-marshal.h"
 #include "sj-error.h"
 
 enum {