[nautilus-actions] Rename src/nact/nact-marshal.def as base-marshal.def

[Pierre Wieser <pwieser src gnome org>]

commit 3bf288e3476dad7b343ec152dabe62657ebbe8e3
Author: Pierre Wieser <pwieser trychlos org>
Date:   Thu Feb 17 20:05:26 2011 +0100

    Rename src/nact/nact-marshal.def as base-marshal.def
    
    This is consistant with a use in BaseWindow class.

 src/nact/.gitignore                             |    4 ++--
 src/nact/Makefile.am                            |   12 ++++++------
 src/nact/{nact-marshal.def => base-marshal.def} |    0
 src/nact/base-window.c                          |    2 +-
 src/nact/nact-main-window.c                     |    2 +-
 src/nact/nact-tree-view.c                       |    2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/src/nact/.gitignore b/src/nact/.gitignore
index b6d766d..9265585 100644
--- a/src/nact/.gitignore
+++ b/src/nact/.gitignore
@@ -1,5 +1,5 @@
-nact-marshal.c
-nact-marshal.h
+base-marshal.c
+base-marshal.h
 nact.desktop
 nautilus-actions-config
 nautilus-actions-config-tool
diff --git a/src/nact/Makefile.am b/src/nact/Makefile.am
index d99e6fe..c14b0ef 100644
--- a/src/nact/Makefile.am
+++ b/src/nact/Makefile.am
@@ -43,8 +43,8 @@ AM_CPPFLAGS += \
 	$(NULL)
 
 BUILT_SOURCES = \
-	nact-marshal.c										\
-	nact-marshal.h										\
+	base-marshal.c										\
+	base-marshal.h										\
 	$(NULL)
 
 nautilus_actions_config_tool_SOURCES = \
@@ -148,11 +148,11 @@ nautilus_actions_config_tool_SOURCES = \
 	$(BUILT_SOURCES)									\
 	$(NULL)
 
-nact-marshal.h: nact-marshal.def $(GLIB_GENMARSHAL)
+base-marshal.h: base-marshal.def $(GLIB_GENMARSHAL)
 	$(GLIB_GENMARSHAL) $< --header --prefix=nact_cclosure_marshal > $@
 
-nact-marshal.c: nact-marshal.def $(GLIB_GENMARSHAL)
-	echo "#include \"nact-marshal.h\"" > $@ && \
+base-marshal.c: base-marshal.def $(GLIB_GENMARSHAL)
+	echo "#include \"base-marshal.h\"" > $@ && \
 	$(GLIB_GENMARSHAL) $< --body --prefix=nact_cclosure_marshal >> $@
 
 nautilus_actions_config_tool_LDADD = \
@@ -191,5 +191,5 @@ CLEANFILES = \
 EXTRA_DIST = \
 	$(applications_in_files)							\
 	$(pkgdata_DATA)										\
-	nact-marshal.def									\
+	base-marshal.def									\
 	$(NULL)
diff --git a/src/nact/nact-marshal.def b/src/nact/base-marshal.def
similarity index 100%
rename from src/nact/nact-marshal.def
rename to src/nact/base-marshal.def
diff --git a/src/nact/base-window.c b/src/nact/base-window.c
index 3457e3a..5aa7213 100644
--- a/src/nact/base-window.c
+++ b/src/nact/base-window.c
@@ -39,7 +39,7 @@
 #include "base-application.h"
 #include "base-window.h"
 #include "base-gtk-utils.h"
-#include "nact-marshal.h"
+#include "base-marshal.h"
 
 /* private class data
  */
diff --git a/src/nact/nact-main-window.c b/src/nact/nact-main-window.c
index 70770c1..47e22e3 100644
--- a/src/nact/nact-main-window.c
+++ b/src/nact/nact-main-window.c
@@ -42,6 +42,7 @@
 #include <core/na-iprefs.h>
 #include <core/na-pivot.h>
 
+#include "base-marshal.h"
 #include "nact-iaction-tab.h"
 #include "nact-icommand-tab.h"
 #include "nact-ibasenames-tab.h"
@@ -54,7 +55,6 @@
 #include "nact-iproperties-tab.h"
 #include "nact-main-tab.h"
 #include "nact-main-statusbar.h"
-#include "nact-marshal.h"
 #include "nact-main-window.h"
 #include "nact-menubar.h"
 #include "nact-tree-view.h"
diff --git a/src/nact/nact-tree-view.c b/src/nact/nact-tree-view.c
index 9e63829..64c0fb5 100644
--- a/src/nact/nact-tree-view.c
+++ b/src/nact/nact-tree-view.c
@@ -37,8 +37,8 @@
 #include <api/na-object-api.h>
 
 #include "base-keysyms.h"
+#include "base-marshal.h"
 #include "nact-application.h"
-#include "nact-marshal.h"
 #include "nact-tree-view.h"
 #include "nact-tree-model.h"
 #include "nact-tree-ieditable.h"