[nautilus] all: use g_cclosure_marshal_generic() instead of generating marshallers

From: Cosimo Cecchi <cosimoc src gnome org>
To: commits-list gnome org
Cc:
Subject: [nautilus] all: use g_cclosure_marshal_generic() instead of generating marshallers
Date: Fri, 1 Jul 2011 16:52:44 +0000 (UTC)
commit 5c6950277332ca53fceb27d58fa3f06101737726
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Jul 1 12:52:09 2011 -0400

    all: use g_cclosure_marshal_generic() instead of generating marshallers

 eel/Makefile.am                                    |   33 -----------------
 eel/eel-canvas.c                                   |    4 +--
 eel/eel-editable-label.c                           |    5 +--
 libnautilus-private/Makefile.am                    |   22 ------------
 libnautilus-private/nautilus-directory-async.c     |    2 +-
 libnautilus-private/nautilus-icon-container.c      |   37 +++++++++----------
 libnautilus-private/nautilus-tree-view-drag-dest.c |   14 ++++----
 src/Makefile.am                                    |   30 ----------------
 src/nautilus-query-editor.c                        |    3 +-
 src/nautilus-view.c                                |   11 +++---
 src/nautilus-window.c                              |    5 +--
 11 files changed, 37 insertions(+), 129 deletions(-)
---
diff --git a/eel/Makefile.am b/eel/Makefile.am
index 15ff62e..0ff0b6a 100644
--- a/eel/Makefile.am
+++ b/eel/Makefile.am
@@ -15,11 +15,6 @@ INCLUDES =						\
 	-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\"	\
 	$(NULL)
 
-BUILT_SOURCES = \
-	eel-marshal.c \
-	eel-marshal.h \
-	$(NULL)
-
 libeel_2_la_LDFLAGS =				\
 	-no-undefined				\
 	$(NULL)
@@ -69,28 +64,6 @@ libeel_2_la_SOURCES =				\
 	$(eel_headers)				\
 	$(NULL)
 
-nodist_libeel_2_la_SOURCES =			\
-	$(BUILT_SOURCES)			\
-	$(NULL)
-
-eel-marshal.list: $(libeel_2_la_SOURCES) Makefile.am
-	$(AM_V_GEN)( cd $(srcdir) && \
-	sed -n -e 's/.*eel_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
-	$(libeel_2_la_SOURCES) ) \
-	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $  tmp
-	@if cmp -s $  tmp $@; then \
-		rm $  tmp; \
-	else \
-		mv $  tmp $@; \
-	fi
-
-%-marshal.c: %-marshal.list Makefile
-	$(AM_V_GEN)echo "#include \"eel-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) --body --prefix=$(subst -,_,$*)_marshal $< >> $*-marshal.c
-
-%-marshal.h: %-marshal.list Makefile
-	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=$(subst -,_,$*)_marshal $< > $*-marshal.h
-
 noinst_PROGRAMS = check-program
 
 check_program_SOURCES = check-program.c
@@ -102,10 +75,4 @@ TESTS = check-eel
 
 EXTRA_DIST =					\
 	check-eel				\
-	eel-marshal.list			\
-	$(NULL)
-
-CLEANFILES = \
-	eel-marshal.list \
-	$(BUILT_SOURCES) \
 	$(NULL)
diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c
index c54988f..719c66e 100644
--- a/eel/eel-canvas.c
+++ b/eel/eel-canvas.c
@@ -72,8 +72,6 @@
 #include <cairo-gobject.h>
 #include "eel-canvas.h"
 
-#include "eel-marshal.h"
-
 static void eel_canvas_request_update (EelCanvas      *canvas);
 static void group_add                   (EelCanvasGroup *group,
 					 EelCanvasItem  *item);
@@ -3966,7 +3964,7 @@ eel_canvas_item_class_init (EelCanvasItemClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EelCanvasItemClass, event),
 			      boolean_handled_accumulator, NULL,
-			      eel_marshal_BOOLEAN__BOXED,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_BOOLEAN, 1,
 			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c
index 03d4d7d..e5c3ae5 100644
--- a/eel/eel-editable-label.c
+++ b/eel/eel-editable-label.c
@@ -28,7 +28,6 @@
 #include <string.h>
 
 #include "eel-editable-label.h"
-#include "eel-marshal.h"
 #include "eel-accessibility.h"
 #include <libgail-util/gailmisc.h>
 
@@ -248,7 +247,7 @@ eel_editable_label_class_init (EelEditableLabelClass *class)
 		  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 		  G_STRUCT_OFFSET (EelEditableLabelClass, move_cursor),
 		  NULL, NULL,
-		  eel_marshal_VOID__ENUM_INT_BOOLEAN,
+		  g_cclosure_marshal_generic,
 		  G_TYPE_NONE, 3, GTK_TYPE_MOVEMENT_STEP, G_TYPE_INT, G_TYPE_BOOLEAN);
   
   signals[COPY_CLIPBOARD] =
@@ -275,7 +274,7 @@ eel_editable_label_class_init (EelEditableLabelClass *class)
 		  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 		  G_STRUCT_OFFSET (EelEditableLabelClass, delete_from_cursor),
 		  NULL, NULL, 
-		  eel_marshal_VOID__ENUM_INT,
+		  g_cclosure_marshal_generic,
 		  G_TYPE_NONE, 2, GTK_TYPE_DELETE_TYPE, G_TYPE_INT);
   
   signals[CUT_CLIPBOARD] =
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 1aa7859..4885ab3 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -29,8 +29,6 @@ $(dbus_built_sources) : Makefile.am $(top_srcdir)/data/dbus-interfaces.xml
 		$(NULL)
 
 BUILT_SOURCES = \
-	nautilus-marshal.c \
-	nautilus-marshal.h \
 	$(dbus_built_sources) \
 	$(NULL)
 
@@ -198,24 +196,6 @@ nodist_libnautilus_private_la_SOURCES =\
 
 $(lib_LTLIBRARIES): $(dependency_static_libs)
 
-nautilus-marshal.list: $(libnautilus_private_la_SOURCES) Makefile.am
-	$(AM_V_GEN)( cd $(srcdir) && \
-	sed -n -e 's/.*nautilus_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
-	$(libnautilus_private_la_SOURCES) ) \
-	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $  tmp
-	@if cmp -s $  tmp $@; then \
-		rm $  tmp; \
-	else \
-		mv $  tmp $@; \
-	fi
-
-%-marshal.h: %-marshal.list Makefile
-	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=$(subst -,_,$*)_marshal $< > $*-marshal.h
-
-%-marshal.c: %-marshal.list Makefile
-	$(AM_V_GEN)echo "#include \"nautilus-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) --body --prefix=$(subst -,_,$*)_marshal $< >> $*-marshal.c
-
 gsettingsschema_in_files = org.gnome.nautilus.gschema.xml.in
 gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
 .PRECIOUS: $(gsettings_SCHEMAS)
@@ -228,7 +208,6 @@ convert_DATA = nautilus.convert
 @GSETTINGS_RULES@
 
 EXTRA_DIST =				\
-	nautilus-marshal.list		\
 	nautilus.convert		\
 	$(gsettingsschema_in_files)     \
 	$(TRACKER_SOURCES)		\
@@ -237,7 +216,6 @@ EXTRA_DIST =				\
 CLEANFILES = \
 	$(BUILT_SOURCES)				\
 	$(gsettings_SCHEMAS)				\
-	nautilus-marshal.list				\
 	$(NULL)
 
 dist-hook:
diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
index a998c60..54d8170 100644
--- a/libnautilus-private/nautilus-directory-async.c
+++ b/libnautilus-private/nautilus-directory-async.c
@@ -4489,7 +4489,7 @@ extension_info_start (NautilusDirectory *directory,
 					  directory,
 					  NULL);
 	g_closure_set_marshal (update_complete,
-			       nautilus_marshal_VOID__POINTER_ENUM);
+			       g_cclosure_marshal_generic);
 			       
 	result = nautilus_info_provider_update_file_info
 		(provider, 
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index 34d6eae..3753d1e 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -33,7 +33,6 @@
 #include "nautilus-icon-private.h"
 #include "nautilus-lib-self-check-functions.h"
 #include "nautilus-selection-canvas-item.h"
-#include "nautilus-marshal.h"
 #include <atk/atkaction.h>
 #include <eel/eel-accessibility.h>
 #include <eel/eel-vfs-extensions.h>
@@ -5717,7 +5716,7 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
 						 button_press),
 		                NULL, NULL,
-		                nautilus_marshal_BOOLEAN__POINTER,
+		                g_cclosure_marshal_generic,
 		                G_TYPE_BOOLEAN, 1,
 				GDK_TYPE_EVENT);
 	signals[ACTIVATE]
@@ -5747,7 +5746,7 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
 						 activate_previewer),
 		                NULL, NULL,
-		                nautilus_marshal_VOID__POINTER_POINTER,
+		                g_cclosure_marshal_generic,
 		                G_TYPE_NONE, 2,
 				G_TYPE_POINTER, G_TYPE_POINTER);
 	signals[CONTEXT_CLICK_SELECTION]
@@ -5787,7 +5786,7 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
 						 icon_position_changed),
 		                NULL, NULL,
-		                nautilus_marshal_VOID__POINTER_POINTER,
+		                g_cclosure_marshal_generic,
 		                G_TYPE_NONE, 2,
 				G_TYPE_POINTER,
 				G_TYPE_POINTER);
@@ -5798,7 +5797,7 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
 						 icon_text_changed),
 		                NULL, NULL,
-		                nautilus_marshal_VOID__POINTER_STRING,
+		                g_cclosure_marshal_generic,
 		                G_TYPE_NONE, 2,
 				G_TYPE_POINTER,
 				G_TYPE_STRING);
@@ -5839,7 +5838,7 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
 						 get_icon_uri),
 		                NULL, NULL,
-		                nautilus_marshal_STRING__POINTER,
+		                g_cclosure_marshal_generic,
 		                G_TYPE_STRING, 1,
 				G_TYPE_POINTER);
 	signals[GET_ICON_DROP_TARGET_URI]
@@ -5849,7 +5848,7 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
 						 get_icon_drop_target_uri),
 		                NULL, NULL,
-		                nautilus_marshal_STRING__POINTER,
+		                g_cclosure_marshal_generic,
 		                G_TYPE_STRING, 1,
 				G_TYPE_POINTER);
 	signals[MOVE_COPY_ITEMS] 
@@ -5859,7 +5858,7 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_STRUCT_OFFSET (NautilusIconContainerClass, 
 						 move_copy_items),
 		                NULL, NULL,
-		                nautilus_marshal_VOID__POINTER_POINTER_POINTER_ENUM_INT_INT,
+		                g_cclosure_marshal_generic,
 		                G_TYPE_NONE, 6,
 				G_TYPE_POINTER,
 				G_TYPE_POINTER,
@@ -5874,7 +5873,7 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_STRUCT_OFFSET (NautilusIconContainerClass, 
 						 handle_netscape_url),
 		                NULL, NULL,
-		                nautilus_marshal_VOID__STRING_STRING_ENUM_INT_INT,
+		                g_cclosure_marshal_generic,
 		                G_TYPE_NONE, 5,
 				G_TYPE_STRING,
 				G_TYPE_STRING,
@@ -5888,7 +5887,7 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_STRUCT_OFFSET (NautilusIconContainerClass, 
 						     handle_uri_list),
 		                NULL, NULL,
-		                nautilus_marshal_VOID__STRING_STRING_ENUM_INT_INT,
+		                g_cclosure_marshal_generic,
 		                G_TYPE_NONE, 5,
 				G_TYPE_STRING,
 				G_TYPE_STRING,
@@ -5902,7 +5901,7 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_STRUCT_OFFSET (NautilusIconContainerClass, 
 						 handle_text),
 		                NULL, NULL,
-		                nautilus_marshal_VOID__STRING_STRING_ENUM_INT_INT,
+		                g_cclosure_marshal_generic,
 		                G_TYPE_NONE, 5,
 				G_TYPE_STRING,
 				G_TYPE_STRING,
@@ -5916,7 +5915,7 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
 						 handle_raw),
 		                NULL, NULL,
-		                nautilus_marshal_VOID__POINTER_INT_STRING_STRING_ENUM_INT_INT,
+		                g_cclosure_marshal_generic,
 		                G_TYPE_NONE, 7,
 				G_TYPE_POINTER,
 				G_TYPE_INT,
@@ -5932,7 +5931,7 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_STRUCT_OFFSET (NautilusIconContainerClass, 
 						 get_container_uri),
 		                NULL, NULL,
-		                nautilus_marshal_STRING__VOID,
+		                g_cclosure_marshal_generic,
 		                G_TYPE_STRING, 0);
 	signals[CAN_ACCEPT_ITEM] 
 		= g_signal_new ("can_accept_item",
@@ -5941,7 +5940,7 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_STRUCT_OFFSET (NautilusIconContainerClass, 
 						 can_accept_item),
 		                NULL, NULL,
-		                nautilus_marshal_INT__POINTER_STRING,
+		                g_cclosure_marshal_generic,
 		                G_TYPE_INT, 2,
 				G_TYPE_POINTER,
 				G_TYPE_STRING);
@@ -5952,7 +5951,7 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
 						 get_stored_icon_position),
 		                NULL, NULL,
-		                nautilus_marshal_BOOLEAN__POINTER_POINTER,
+		                g_cclosure_marshal_generic,
 		                G_TYPE_BOOLEAN, 2,
 				G_TYPE_POINTER,
 				G_TYPE_POINTER);
@@ -5963,7 +5962,7 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
 						 get_stored_layout_timestamp),
 		                NULL, NULL,
-		                nautilus_marshal_BOOLEAN__POINTER_POINTER,
+		                g_cclosure_marshal_generic,
 		                G_TYPE_BOOLEAN, 2,
 				G_TYPE_POINTER,
 				G_TYPE_POINTER);
@@ -5974,7 +5973,7 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
 						 store_layout_timestamp),
 		                NULL, NULL,
-		                nautilus_marshal_BOOLEAN__POINTER_POINTER,
+		                g_cclosure_marshal_generic,
 		                G_TYPE_BOOLEAN, 2,
 				G_TYPE_POINTER,
 				G_TYPE_POINTER);
@@ -5994,7 +5993,7 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
 						 preview),
 		                NULL, NULL,
-		                nautilus_marshal_INT__POINTER_BOOLEAN,
+		                g_cclosure_marshal_generic,
 		                G_TYPE_INT, 2,
 				G_TYPE_POINTER,
 				G_TYPE_BOOLEAN);
@@ -6052,7 +6051,7 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 				G_STRUCT_OFFSET (NautilusIconContainerClass,
 						 start_interactive_search),
 				NULL, NULL,
-				nautilus_marshal_BOOLEAN__VOID,
+				g_cclosure_marshal_generic,
 				G_TYPE_BOOLEAN, 0);
 
 	/* GtkWidget class.  */
diff --git a/libnautilus-private/nautilus-tree-view-drag-dest.c b/libnautilus-private/nautilus-tree-view-drag-dest.c
index 432b95a..8b45251 100644
--- a/libnautilus-private/nautilus-tree-view-drag-dest.c
+++ b/libnautilus-private/nautilus-tree-view-drag-dest.c
@@ -1048,7 +1048,7 @@ nautilus_tree_view_drag_dest_class_init (NautilusTreeViewDragDestClass *class)
 			      G_STRUCT_OFFSET (NautilusTreeViewDragDestClass,
 					       get_root_uri),
 			      NULL, NULL,
-			      nautilus_marshal_STRING__VOID,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_STRING, 0);
 	signals[GET_FILE_FOR_PATH] = 
 		g_signal_new ("get_file_for_path",
@@ -1057,7 +1057,7 @@ nautilus_tree_view_drag_dest_class_init (NautilusTreeViewDragDestClass *class)
 			      G_STRUCT_OFFSET (NautilusTreeViewDragDestClass,
 					       get_file_for_path),
 			      NULL, NULL,
-			      nautilus_marshal_OBJECT__BOXED,
+			      g_cclosure_marshal_generic,
 			      NAUTILUS_TYPE_FILE, 1,
 			      GTK_TYPE_TREE_PATH);
 	signals[MOVE_COPY_ITEMS] =
@@ -1068,7 +1068,7 @@ nautilus_tree_view_drag_dest_class_init (NautilusTreeViewDragDestClass *class)
 					       move_copy_items),
 			      NULL, NULL,
 			      
-			      nautilus_marshal_VOID__POINTER_STRING_ENUM_INT_INT,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE, 5,
 			      G_TYPE_POINTER,
 			      G_TYPE_STRING,
@@ -1082,7 +1082,7 @@ nautilus_tree_view_drag_dest_class_init (NautilusTreeViewDragDestClass *class)
 			      G_STRUCT_OFFSET (NautilusTreeViewDragDestClass, 
 					       handle_netscape_url),
 			      NULL, NULL,
-			      nautilus_marshal_VOID__STRING_STRING_ENUM_INT_INT,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE, 5,
 			      G_TYPE_STRING,
 			      G_TYPE_STRING,
@@ -1096,7 +1096,7 @@ nautilus_tree_view_drag_dest_class_init (NautilusTreeViewDragDestClass *class)
 			      G_STRUCT_OFFSET (NautilusTreeViewDragDestClass, 
 					       handle_uri_list),
 			      NULL, NULL,
-			      nautilus_marshal_VOID__STRING_STRING_ENUM_INT_INT,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE, 5,
 			      G_TYPE_STRING,
 			      G_TYPE_STRING,
@@ -1110,7 +1110,7 @@ nautilus_tree_view_drag_dest_class_init (NautilusTreeViewDragDestClass *class)
 			      G_STRUCT_OFFSET (NautilusTreeViewDragDestClass, 
 					       handle_text),
 			      NULL, NULL,
-			      nautilus_marshal_VOID__STRING_STRING_ENUM_INT_INT,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE, 5,
 			      G_TYPE_STRING,
 			      G_TYPE_STRING,
@@ -1124,7 +1124,7 @@ nautilus_tree_view_drag_dest_class_init (NautilusTreeViewDragDestClass *class)
 			      G_STRUCT_OFFSET (NautilusTreeViewDragDestClass,
 					       handle_raw),
 			      NULL, NULL,
-			      nautilus_marshal_VOID__POINTER_INT_STRING_STRING_ENUM_INT_INT,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE, 7,
 			      G_TYPE_POINTER,
 			      G_TYPE_INT,
diff --git a/src/Makefile.am b/src/Makefile.am
index ed938b1..ac1c8f6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,11 +43,6 @@ LDADD =\
 	$(POPT_LIBS) \
 	$(NULL)
 
-BUILT_SOURCES = \
-	nautilus-src-marshal.c \
-	nautilus-src-marshal.h \
-	$(NULL)
-
 nautilus_SOURCES = \
 	nautilus-actions.h			\
 	nautilus-application.c			\
@@ -157,28 +152,6 @@ if ENABLE_EMPTY_VIEW
 nautilus_SOURCES += $(EMPTY_VIEW_SOURCES)
 endif
 
-nodist_nautilus_SOURCES = \
-	$(BUILT_SOURCES) \
-	$(NULL)
-
-nautilus-src-marshal.list: $(nautilus_SOURCES) Makefile.am
-	$(AM_V_GEN)( cd $(srcdir) && \
-	sed -n -e 's/.*nautilus_src_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
-	$(nautilus_SOURCES) ) \
-	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $  tmp
-	@if cmp -s $  tmp $@; then \
-		rm $  tmp; \
-	else \
-		mv $  tmp $@; \
-	fi
-
-%-marshal.c: %-marshal.list Makefile
-	$(AM_V_GEN)echo "#include \"nautilus-src-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) --body --prefix=$(subst -,_,$*)_marshal $< >> $*-marshal.c
-
-%-marshal.h: %-marshal.list Makefile
-	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=$(subst -,_,$*)_marshal $< > $*-marshal.h
-
 nautilus_autorun_software_SOURCES= 			\
 	nautilus-autorun-software.c			\
 	$(NULL)
@@ -214,13 +187,10 @@ ui_DATA = 					\
 	$(NULL)
 
 CLEANFILES = \
-	nautilus-src-marshal.list		\
-	$(BUILT_SOURCES)			\
 	$(server_DATA)				\
 	$(NULL)
 
 EXTRA_DIST =					\
-	nautilus-src-marshal.list		\
 	$(server_in_files)			\
 	$(ui_DATA)				\
 	check-nautilus				\
diff --git a/src/nautilus-query-editor.c b/src/nautilus-query-editor.c
index 89e20bc..90e8f56 100644
--- a/src/nautilus-query-editor.c
+++ b/src/nautilus-query-editor.c
@@ -23,7 +23,6 @@
 
 #include <config.h>
 #include "nautilus-query-editor.h"
-#include "nautilus-src-marshal.h"
 #include "nautilus-window-slot.h"
 
 #include <string.h>
@@ -199,7 +198,7 @@ nautilus_query_editor_class_init (NautilusQueryEditorClass *class)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusQueryEditorClass, changed),
 		              NULL, NULL,
-		              nautilus_src_marshal_VOID__OBJECT_BOOLEAN,
+		              g_cclosure_marshal_generic,
 		              G_TYPE_NONE, 2, NAUTILUS_TYPE_QUERY, G_TYPE_BOOLEAN);
 
 	signals[CANCEL] =
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index b2d0f6d..fbd482d 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -38,7 +38,6 @@
 #include "nautilus-mime-actions.h"
 #include "nautilus-previewer.h"
 #include "nautilus-properties-window.h"
-#include "nautilus-src-marshal.h"
 
 #include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms.h>
@@ -9596,7 +9595,7 @@ nautilus_view_class_init (NautilusViewClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusViewClass, add_file),
 		              NULL, NULL,
-		              nautilus_src_marshal_VOID__OBJECT_OBJECT,
+		              g_cclosure_marshal_generic,
 		              G_TYPE_NONE, 2, NAUTILUS_TYPE_FILE, NAUTILUS_TYPE_DIRECTORY);
 	signals[BEGIN_FILE_CHANGES] =
 		g_signal_new ("begin_file_changes",
@@ -9644,7 +9643,7 @@ nautilus_view_class_init (NautilusViewClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusViewClass, file_changed),
 		              NULL, NULL,
-		              nautilus_src_marshal_VOID__OBJECT_OBJECT,
+		              g_cclosure_marshal_generic,
 		              G_TYPE_NONE, 2, NAUTILUS_TYPE_FILE, NAUTILUS_TYPE_DIRECTORY);
 	signals[LOAD_ERROR] =
 		g_signal_new ("load_error",
@@ -9660,7 +9659,7 @@ nautilus_view_class_init (NautilusViewClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusViewClass, remove_file),
 		              NULL, NULL,
-		              nautilus_src_marshal_VOID__OBJECT_OBJECT,
+		              g_cclosure_marshal_generic,
 		              G_TYPE_NONE, 2, NAUTILUS_TYPE_FILE, NAUTILUS_TYPE_DIRECTORY);
 	signals[ZOOM_LEVEL_CHANGED] =
 		g_signal_new ("zoom-level-changed",
@@ -9683,7 +9682,7 @@ nautilus_view_class_init (NautilusViewClass *klass)
 			      G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 			      G_STRUCT_OFFSET (NautilusViewClass, trash),
 			      g_signal_accumulator_true_handled, NULL,
-			      nautilus_src_marshal_BOOLEAN__VOID,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_BOOLEAN, 0);
 	signals[DELETE] =
 		g_signal_new ("delete",
@@ -9691,7 +9690,7 @@ nautilus_view_class_init (NautilusViewClass *klass)
 			      G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 			      G_STRUCT_OFFSET (NautilusViewClass, delete),
 			      g_signal_accumulator_true_handled, NULL,
-			      nautilus_src_marshal_BOOLEAN__VOID,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_BOOLEAN, 0);
 
 	klass->get_selected_icon_locations = real_get_selected_icon_locations;
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 1d23133..4232fb8 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -39,7 +39,6 @@
 #include "nautilus-notebook.h"
 #include "nautilus-places-sidebar.h"
 #include "nautilus-search-bar.h"
-#include "nautilus-src-marshal.h"
 #include "nautilus-tree-sidebar.h"
 #include "nautilus-view-factory.h"
 #include "nautilus-window-manage-views.h"
@@ -2095,7 +2094,7 @@ nautilus_window_class_init (NautilusWindowClass *class)
 			      G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 			      G_STRUCT_OFFSET (NautilusWindowClass, go_up),
 			      g_signal_accumulator_true_handled, NULL,
-			      nautilus_src_marshal_BOOLEAN__BOOLEAN,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN);
 	signals[RELOAD] =
 		g_signal_new ("reload",
@@ -2119,7 +2118,7 @@ nautilus_window_class_init (NautilusWindowClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      nautilus_src_marshal_VOID__INT_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE, 5,
 			      G_TYPE_INT, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
 			      G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]