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



commit c735e4e68914fadce4a31ca93cee74926b4cc170
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Dec 11 17:05:15 2012 +0100

    shell: Remove custom marshallers

 shell/Makefile.am           |   12 +-----------
 shell/cc-shell-item-view.c  |    3 +--
 shell/cc-shell-marshal.list |    1 -
 3 files changed, 2 insertions(+), 14 deletions(-)
---
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 4f7c621..ba59c08 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -5,15 +5,6 @@ INCLUDES =					\
 
 bin_PROGRAMS = gnome-control-center
 
-MARSHAL_FILES = cc-shell-marshal.c cc-shell-marshal.h
-BUILT_SOURCES = $(MARSHAL_FILES)
-
-cc-shell-marshal.h: cc-shell-marshal.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=cc_shell_marshal $< --header > $@
-
-cc-shell-marshal.c: cc-shell-marshal.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=cc_shell_marshal $< --body --header > $@
-
 gnome_control_center_SOURCES =			\
 	control-center.c			\
 	cc-shell-log.c				\
@@ -100,8 +91,7 @@ EXTRA_DIST =					\
 	$(ui_DATA)				\
 	gnome-control-center.desktop.in.in	\
 	gnomecc.directory.in			\
-	gnomecc.menu.in				\
-	cc-shell-marshal.list
+	gnomecc.menu.in
 
 DISTCLEANFILES = gnome-control-center.desktop gnome-control-center.desktop.in gnomecc.directory gnomecc.menu
 
diff --git a/shell/cc-shell-item-view.c b/shell/cc-shell-item-view.c
index ea4c9cd..4b41d4c 100644
--- a/shell/cc-shell-item-view.c
+++ b/shell/cc-shell-item-view.c
@@ -20,7 +20,6 @@
 
 #include "cc-shell-item-view.h"
 #include "cc-shell-model.h"
-#include "cc-shell-marshal.h"
 
 G_DEFINE_TYPE (CcShellItemView, cc_shell_item_view, GTK_TYPE_ICON_VIEW)
 
@@ -186,7 +185,7 @@ cc_shell_item_view_class_init (CcShellItemViewClass *klass)
                                                   0,
                                                   NULL,
                                                   NULL,
-                                                  cc_shell_marshal_VOID__STRING_STRING_STRING,
+                                                  g_cclosure_marshal_generic,
                                                   G_TYPE_NONE,
                                                   3,
                                                   G_TYPE_STRING,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]