[nautilus] [file-manager] autogenerate marshallers



commit 21e75511d2466bd814a31031472323d3cd8ae6c1
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Aug 20 10:59:28 2010 +0200

    [file-manager] autogenerate marshallers

 src/file-manager/Makefile.am         |   37 ++++++++++++++++++++++++++++++++-
 src/file-manager/fm-directory-view.c |   12 +++++-----
 2 files changed, 41 insertions(+), 8 deletions(-)
---
diff --git a/src/file-manager/Makefile.am b/src/file-manager/Makefile.am
index 80d67c4..d5cc81c 100644
--- a/src/file-manager/Makefile.am
+++ b/src/file-manager/Makefile.am
@@ -12,7 +12,10 @@ INCLUDES = 					\
 	$(DISABLE_DEPRECATED_CFLAGS)            \
 	$(NULL)	
 
-
+BUILT_SOURCES = \
+	fm-marshal.c \
+	fm-marshal.h \
+	$(NULL)
 
 libnautilus_file_manager_la_SOURCES=	\
 	fm-actions.h			\
@@ -42,6 +45,28 @@ libnautilus_file_manager_la_SOURCES=	\
 	nautilus-audio-mime-types.h	\
 	$(NULL)
 
+nodist_libnautilus_file_manager_la_SOURCES=\
+	$(BUILT_SOURCES) \
+	$(NULL)
+
+fm-marshal.list: $(libnautilus_file_manager_la_SOURCES) Makefile.am
+	$(AM_V_GEN)( cd $(srcdir) && \
+	sed -n -e 's/.*fm_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
+	$(libnautilus_file_manager_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 \"fm-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
+
 EMPTY_VIEW_SOURCES = \
 	fm-empty-view.c \
 	fm-empty-view.h
@@ -58,4 +83,12 @@ ui_DATA =					\
 	nautilus-list-view-ui.xml		\
 	$(NULL)
 
-EXTRA_DIST = $(ui_DATA)
+EXTRA_DIST = \
+	$(ui_DATA) \
+	fm-marshal.list
+
+CLEANFILES = \
+	$(BUILT_SOURCES) \
+	fm-marshal.list \
+	$(NULL)
+
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 45bd820..e5146f5 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -35,6 +35,7 @@
 
 #include "fm-actions.h"
 #include "fm-error-reporting.h"
+#include "fm-marshal.h"
 #include "fm-properties-window.h"
 #include "libnautilus-private/nautilus-open-with-dialog.h"
 
@@ -71,7 +72,6 @@
 #include <libnautilus-private/nautilus-file-private.h> /* for nautilus_file_get_existing_by_uri */
 #include <libnautilus-private/nautilus-global-preferences.h>
 #include <libnautilus-private/nautilus-link.h>
-#include <libnautilus-private/nautilus-marshal.h>
 #include <libnautilus-private/nautilus-metadata.h>
 #include <libnautilus-private/nautilus-mime-actions.h>
 #include <libnautilus-private/nautilus-module.h>
@@ -10642,7 +10642,7 @@ fm_directory_view_class_init (FMDirectoryViewClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (FMDirectoryViewClass, add_file),
 		              NULL, NULL,
-		              nautilus_marshal_VOID__OBJECT_OBJECT,
+		              fm_marshal_VOID__OBJECT_OBJECT,
 		              G_TYPE_NONE, 2, NAUTILUS_TYPE_FILE, NAUTILUS_TYPE_DIRECTORY);
 	signals[BEGIN_FILE_CHANGES] =
 		g_signal_new ("begin_file_changes",
@@ -10698,7 +10698,7 @@ fm_directory_view_class_init (FMDirectoryViewClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (FMDirectoryViewClass, file_changed),
 		              NULL, NULL,
-		              nautilus_marshal_VOID__OBJECT_OBJECT,
+		              fm_marshal_VOID__OBJECT_OBJECT,
 		              G_TYPE_NONE, 2, NAUTILUS_TYPE_FILE, NAUTILUS_TYPE_DIRECTORY);
 	signals[LOAD_ERROR] =
 		g_signal_new ("load_error",
@@ -10714,7 +10714,7 @@ fm_directory_view_class_init (FMDirectoryViewClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (FMDirectoryViewClass, remove_file),
 		              NULL, NULL,
-		              nautilus_marshal_VOID__OBJECT_OBJECT,
+		              fm_marshal_VOID__OBJECT_OBJECT,
 		              G_TYPE_NONE, 2, NAUTILUS_TYPE_FILE, NAUTILUS_TYPE_DIRECTORY);
 
 	klass->accepts_dragged_files = real_accepts_dragged_files;
@@ -10771,7 +10771,7 @@ fm_directory_view_class_init (FMDirectoryViewClass *klass)
 			      G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 			      G_STRUCT_OFFSET (FMDirectoryViewClass, trash),
 			      g_signal_accumulator_true_handled, NULL,
-			      eel_marshal_BOOLEAN__VOID,
+			      fm_marshal_BOOLEAN__VOID,
 			      G_TYPE_BOOLEAN, 0);
 	signals[DELETE] =
 		g_signal_new ("delete",
@@ -10779,7 +10779,7 @@ fm_directory_view_class_init (FMDirectoryViewClass *klass)
 			      G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 			      G_STRUCT_OFFSET (FMDirectoryViewClass, delete),
 			      g_signal_accumulator_true_handled, NULL,
-			      eel_marshal_BOOLEAN__VOID,
+			      fm_marshal_BOOLEAN__VOID,
 			      G_TYPE_BOOLEAN, 0);
 	
 	binding_set = gtk_binding_set_by_class (klass);



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