[glib-networking] gnutls: use g_cclosure_marshal_generic, drop gnutls-marshal.list

[Dan Winship <danw src gnome org>]

commit eec88e9ce9af1a82abfe24a0806878e9da3970aa
Author: Dan Winship <danw gnome org>
Date:   Wed Sep 28 16:33:35 2011 -0400

    gnutls: use g_cclosure_marshal_generic, drop gnutls-marshal.list

 tls/gnutls/Makefile.am             |   23 -----------------------
 tls/gnutls/gnutls-marshal.list     |    1 -
 tls/gnutls/gtlsconnection-gnutls.c |    3 +--
 3 files changed, 1 insertions(+), 26 deletions(-)
---
diff --git a/tls/gnutls/Makefile.am b/tls/gnutls/Makefile.am
index 7df8756..9f3c217 100644
--- a/tls/gnutls/Makefile.am
+++ b/tls/gnutls/Makefile.am
@@ -2,19 +2,8 @@ include $(top_srcdir)/Makefile.decl
 
 giomodule_LTLIBRARIES = libgiognutls.la
 
-gnutls-marshal.h: gnutls-marshal.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_gnutls_marshal $(srcdir)/gnutls-marshal.list --header --internal > $  tmp && \
-	  mv $  tmp $@
-
-gnutls-marshal.c: gnutls-marshal.h gnutls-marshal.list
-	$(AM_V_GEN) (echo "#include \"gnutls-marshal.h\""; \
-	$(GLIB_GENMARSHAL) --prefix=_gnutls_marshal $(srcdir)/gnutls-marshal.list --body --internal) > $  tmp && \
-	  mv $  tmp $@
-
 libgiognutls_la_SOURCES = 		\
 	gnutls-module.c			\
-	gnutls-marshal.c		\
-	gnutls-marshal.h		\
 	gtlsbackend-gnutls.c		\
 	gtlsbackend-gnutls.h		\
 	gtlscertificate-gnutls.c	\
@@ -35,8 +24,6 @@ libgiognutls_la_SOURCES = 		\
 	gtlsserverconnection-gnutls.h	\
 	$(NULL)
 
-$(libgiognutls_la_OBJECTS): gnutls-marshal.h
-
 INCLUDES +=				\
 	$(LIBGNUTLS_CFLAGS)		\
 	$(LIBGCRYPT_CFLAGS)		\
@@ -48,13 +35,3 @@ libgiognutls_la_LIBADD =		\
 	$(GNUTLS_LIBS)			\
 	$(LIBGCRYPT_LIBS)		\
 	$(NULL)
-
-BUILT_SOURCES = 		\
-	gnutls-marshal.h	\
-	gnutls-marshal.c
-
-EXTRA_DIST += 			\
-	gnutls-marshal.list
-
-CLEANFILES = 			\
-	$(BUILT_SOURCES)
diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c
index 5eb3d51..5adab14 100644
--- a/tls/gnutls/gtlsconnection-gnutls.c
+++ b/tls/gnutls/gtlsconnection-gnutls.c
@@ -31,7 +31,6 @@
 #include "gtlsinputstream-gnutls.h"
 #include "gtlsoutputstream-gnutls.h"
 #include "gtlsserverconnection-gnutls.h"
-#include "gnutls-marshal.h"
 #include <glib/gi18n-lib.h>
 
 static void g_tls_connection_gnutls_get_property (GObject    *object,
@@ -722,7 +721,7 @@ static GSourceFuncs gnutls_source_funcs =
   gnutls_source_dispatch,
   gnutls_source_finalize,
   (GSourceFunc)g_tls_connection_gnutls_source_closure_callback,
-  (GSourceDummyMarshal)_gnutls_marshal_BOOLEAN__VOID,
+  (GSourceDummyMarshal)g_cclosure_marshal_generic
 };
 
 GSource *