Bug 577929 – Consolidate marshallers

Consolidate all marshalling specifications to e-util/e-marshal.list.
This reduces code duplication and makes it slightly easier to locate
unused marshallers.

6 files changed, 3 insertions, 39 deletions

diff --git a/shell/Makefile.am b/shell/Makefile.am
index cf53a5c79c..177d9e80be 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -96,7 +96,6 @@ eshellinclude_HEADERS = 			\
 
 libeshell_la_SOURCES =				\
 	$(IDL_GENERATED)			\
-	$(MARSHAL_GENERATED)			\
 	e-component-view.c			\
 	evolution-component.c			\
 	evolution-listener.c			\
@@ -221,10 +220,6 @@ uninstall-local: uninstall-evolution
 
 endif
 
-
-MARSHAL_GENERATED = e-shell-marshal.c e-shell-marshal.h
-@EVO_MARSHAL_RULE@
-
 # Extra dist stuff
 
 EXTRA_DIST = 					\
@@ -234,7 +229,6 @@ EXTRA_DIST = 					\
 	$(glade_DATA)				\
 	$(schema_in_files)			\
 	ChangeLog.pre-1-4			\
-	e-shell-marshal.list			\
 	evolution-nognome.in
 
 # Purify support
@@ -251,7 +245,7 @@ evolution.pure: evolution
 
 endif
 
-BUILT_SOURCES = $(IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) $(DATASERVER_IDL_GENERATED) $(error_DATA)
+BUILT_SOURCES = $(IDL_GENERATED) $(server_DATA) $(DATASERVER_IDL_GENERATED) $(error_DATA)
 CLEANFILES = $(BUILT_SOURCES)
 
 DISTCLEANFILES = $(schema_DATA)
diff --git a/shell/e-shell-marshal.list b/shell/e-shell-marshal.list
deleted file mode 100644
index 2b7c3eb383..0000000000
--- a/shell/e-shell-marshal.list
+++ /dev/null
@@ -1,26 +0,0 @@
-BOOL:POINTER,INT
-NONE:BOOL,INT
-NONE:INT,INT
-NONE:INT,POINTER
-NONE:INT,STRING
-NONE:POINTER,INT
-NONE:POINTER,INT,INT
-NONE:POINTER,POINTER
-NONE:POINTER,POINTER,POINTER
-NONE:POINTER,POINTER,POINTER,BOOL
-NONE:POINTER,POINTER,POINTER,POINTER
-NONE:POINTER,POINTER,POINTER,POINTER,POINTER
-NONE:POINTER,STRING
-NONE:POINTER,STRING,BOOL
-NONE:POINTER,STRING,STRING
-NONE:POINTER,STRING,STRING,BOOL
-NONE:POINTER,STRING,STRING,STRING,STRING
-NONE:STRING,BOOL
-NONE:STRING,INT
-NONE:STRING,INT,INT
-NONE:STRING,POINTER
-NONE:STRING,POINTER,POINTER
-NONE:STRING,STRING
-NONE:STRING,STRING,STRING
-NONE:STRING,STRING,STRING,STRING
-NONE:STRING,POINTER,POINTER,UINT,UINT
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 5319acb3d2..204b9286b0 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -34,7 +34,6 @@
 
 #include "e-component-registry.h"
 #include "e-shell-window-commands.h"
-#include "e-shell-marshal.h"
 #include "e-sidebar.h"
 #include "es-menu.h"
 #include "es-event.h"
diff --git a/shell/e-shell.c b/shell/e-shell.c
index a512442133..061071efb8 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -61,7 +61,6 @@
 
 #include "Evolution.h"
 #include "e-shell-constants.h"
-#include "e-shell-marshal.h"
 #include "e-shell-settings-dialog.h"
 #include "e-shell.h"
 #include "e-shell-view.h"
diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c
index 5771e07dd1..37ff2fed13 100644
--- a/shell/e-sidebar.c
+++ b/shell/e-sidebar.c
@@ -26,7 +26,7 @@
 
 #include "e-sidebar.h"
 
-#include "e-shell-marshal.h"
+#include "e-util/e-util.h"
 
 #include <gconf/gconf-client.h>
 #include <libgnome/gnome-gconf.h>
@@ -501,7 +501,7 @@ e_sidebar_class_init (ESidebarClass *klass)
 				G_SIGNAL_RUN_LAST,
 				G_STRUCT_OFFSET (ESidebarClass, button_pressed),
 				boolean_handled_accumulator, NULL,
-				e_shell_marshal_NONE__POINTER_INT,
+				e_marshal_NONE__POINTER_INT,
 				G_TYPE_BOOLEAN, 2,
 				G_TYPE_POINTER, G_TYPE_INT);
 }
diff --git a/shell/evolution-config-control.c b/shell/evolution-config-control.c
index 56c5b60048..35044c9dba 100644
--- a/shell/evolution-config-control.c
+++ b/shell/evolution-config-control.c
@@ -26,8 +26,6 @@
 
 #include "evolution-config-control.h"
 
-#include "e-shell-marshal.h"
-
 #include <e-util/e-util.h>
 
 #include <bonobo/bonobo-control.h>