[byzanz] Use the generic marshaller

[Jasper St. Pierre <jstpierre src gnome org>]

commit 7b3daa0307d504e883436565c08ff95681bae314
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Mar 19 13:32:16 2013 -0400

    Use the generic marshaller

 .gitignore           |    2 --
 configure.ac         |    2 --
 src/Makefile.am      |   15 ---------------
 src/byzanzlayer.c    |    2 --
 src/byzanzrecorder.c |    5 ++---
 5 files changed, 2 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dfd2fb8..59c3d4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,4 @@ src/byzanz-applet
 src/byzanz-playback
 src/byzanz-record
 src/byzanz.schemas
-src/byzanzmarshal.c
-src/byzanzmarshal.h
 
diff --git a/configure.ac b/configure.ac
index 4ffa20f..e32c9c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,8 +86,6 @@ AS_IF([test x$have_applet = xyes],
 
 PKG_CHECK_MODULES(GST, gstreamer-app-0.10 >= $GST_REQ gstreamer-0.10 >= $GST_REQ)
 
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-
 GIFENC_CFLAGS="$GTK_CFLAGS $ERROR_CFLAGS"
 GIFENC_LIBS="$GTK_LIBS"
 AC_SUBST(GIFENC_CFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 4f7e9f0..2f922ed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,10 +3,6 @@ noinst_LTLIBRARIES = libbyzanz.la
 bin_PROGRAMS = byzanz-record byzanz-playback
 man_MANS = byzanz.1 byzanz-record.1 byzanz-playback.1
 
-BUILT_SOURCES = \
-       byzanzmarshal.h \
-       byzanzmarshal.c
-
 noinst_HEADERS = \
        byzanzencoder.h \
        byzanzencoderbyzanz.h \
@@ -39,7 +35,6 @@ libbyzanz_la_SOURCES = \
        byzanzlayer.c \
        byzanzlayercursor.c \
        byzanzlayerwindow.c \
-       byzanzmarshal.c \
        byzanzqueue.c \
        byzanzqueueinputstream.c \
        byzanzqueueoutputstream.c \
@@ -75,14 +70,6 @@ byzanz_applet_SOURCES = \
 byzanz_applet_CFLAGS = -DBYZANZ_MENU_UI_DIR=\""$(uidir)"\" $(APPLET_CFLAGS)
 byzanz_applet_LDADD = $(APPLET_LIBS) ./libbyzanz.la
 
-byzanzmarshal.h: byzanzmarshal.list
-       $(GLIB_GENMARSHAL) --prefix=byzanz_marshal $(srcdir)/byzanzmarshal.list --header > byzanzmarshal.h
-
-byzanzmarshal.c: byzanzmarshal.list
-       (echo "#include \"byzanzmarshal.h\""; \
-        $(GLIB_GENMARSHAL) --prefix=byzanz_marshal $(srcdir)/byzanzmarshal.list --body) > byzanzmarshal.c
-
-
 gsettings_schemas_in_in = org.gnome.byzanz.applet.gschema.xml.in.in
 
 @INTLTOOL_XML_NOMERGE_RULE@
@@ -114,13 +101,11 @@ CLEANFILES = \
        $(applet_DATA).in \
        $(service_DATA) \
        $(schemas_DATA) \
-       $(BUILT_SOURCES) \
        $(gsettings_SCHEMAS_in) \
        $(gsettings_SCHEMAS) \
        *.gschema.valid
 
 EXTRA_DIST = \
-       byzanzmarshal.list \
        org.gnome.ByzanzApplet.panel-applet.in.in \
        $(gsettings_schemas_in_in)      \
        $(man_MANS) \
diff --git a/src/byzanzlayer.c b/src/byzanzlayer.c
index c62f3ee..92c93aa 100644
--- a/src/byzanzlayer.c
+++ b/src/byzanzlayer.c
@@ -25,8 +25,6 @@
 
 #include <gdk/gdkx.h>
 
-#include "byzanzmarshal.h"
-
 enum {
   PROP_0,
   PROP_RECORDER,
diff --git a/src/byzanzrecorder.c b/src/byzanzrecorder.c
index 3f5211d..13ab596 100644
--- a/src/byzanzrecorder.c
+++ b/src/byzanzrecorder.c
@@ -31,7 +31,6 @@
 #include "byzanzlayer.h"
 #include "byzanzlayercursor.h"
 #include "byzanzlayerwindow.h"
-#include "byzanzmarshal.h"
 
 enum {
   PROP_0,
@@ -368,8 +367,8 @@ byzanz_recorder_class_init (ByzanzRecorderClass *klass)
          FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
   signals[IMAGE] = g_signal_new ("image", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
-      G_STRUCT_OFFSET (ByzanzRecorderClass, image), NULL, NULL, 
-      byzanz_marshal_VOID__POINTER_POINTER_POINTER, G_TYPE_NONE, 3, 
+      G_STRUCT_OFFSET (ByzanzRecorderClass, image), NULL, NULL, NULL,
+      G_TYPE_NONE, 3, 
       G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER);
 }