[gnome-control-center] display: Remove custom marshallers

[Bastien Nocera <hadess src gnome org>]

commit c6ee7e0b95b51b66bae82396998c830b4e00d8d2
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Dec 11 17:03:52 2012 +0100

    display: Remove custom marshallers

 panels/display/Makefile.am      |   13 +------------
 panels/display/foo-marshal.list |    6 ------
 panels/display/scrollarea.c     |    6 ++----
 3 files changed, 3 insertions(+), 22 deletions(-)
---
diff --git a/panels/display/Makefile.am b/panels/display/Makefile.am
index ca687ba..0294634 100644
--- a/panels/display/Makefile.am
+++ b/panels/display/Makefile.am
@@ -4,14 +4,6 @@ cappletname = display
 uidir = $(pkgdatadir)/ui
 dist_ui_DATA = display-capplet.ui
 
-MARSHALFILES = foo-marshal.c foo-marshal.h
-BUILT_SOURCES = $(MARSHALFILES)
-
-foo-marshal.c: foo-marshal.h
-	$(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=foo_marshal $(srcdir)/foo-marshal.list --header --body > foo-marshal.c )
-foo-marshal.h: foo-marshal.list
-	$(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=foo_marshal $(srcdir)/foo-marshal.list --header > foo-marshal.h )
-
 noinst_LTLIBRARIES = libdisplay.la
 
 libdisplay_la_SOURCES =		\
@@ -20,8 +12,7 @@ libdisplay_la_SOURCES =		\
 	cc-rr-labeler.c		\
 	cc-rr-labeler.h		\
 	scrollarea.c		\
-	scrollarea.h		\
-	$(MARSHALFILES)
+	scrollarea.h
 
 libdisplay_la_LIBADD = $(PANEL_LIBS) $(DISPLAY_PANEL_LIBS)
 
@@ -69,6 +60,4 @@ update-icon-cache:
 	fi
 endif
 
-EXTRA_DIST = foo-marshal.list
-
 -include $(top_srcdir)/git.mk
diff --git a/panels/display/scrollarea.c b/panels/display/scrollarea.c
index 995872d..92e183c 100644
--- a/panels/display/scrollarea.c
+++ b/panels/display/scrollarea.c
@@ -20,8 +20,6 @@
 
 #include <gdk/gdk.h>
 
-#include "foo-marshal.h"
-
 G_DEFINE_TYPE_WITH_CODE (FooScrollArea, foo_scroll_area, GTK_TYPE_CONTAINER,
                          G_IMPLEMENT_INTERFACE (GTK_TYPE_SCROLLABLE, NULL));
 
@@ -273,7 +271,7 @@ foo_scroll_area_class_init (FooScrollAreaClass *class)
                   G_STRUCT_OFFSET (FooScrollAreaClass,
                                    viewport_changed),
                   NULL, NULL,
-                  foo_marshal_VOID__BOXED_BOXED,
+                  g_cclosure_marshal_generic,
                   G_TYPE_NONE, 2,
                   GDK_TYPE_RECTANGLE,
                   GDK_TYPE_RECTANGLE);
@@ -285,7 +283,7 @@ foo_scroll_area_class_init (FooScrollAreaClass *class)
                   G_STRUCT_OFFSET (FooScrollAreaClass,
                                    paint),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__POINTER,
+                  g_cclosure_marshal_generic,
                   G_TYPE_NONE, 1,
                   G_TYPE_POINTER);
 }