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, 5 insertions, 58 deletions

diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index f003ff9068..73665a3516 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -58,6 +58,7 @@ eutilinclude_HEADERS = 				\
 	e-import.h				\
 	e-logger.h				\
 	e-non-intrusive-error-dialog.h		\
+	e-marshal.h				\
 	e-menu.h				\
 	e-mktemp.h				\
 	e-print.h				\
@@ -76,12 +77,10 @@ eutilinclude_HEADERS = 				\
 	e-text-event-processor.h		\
 	e-util.h				\
 	e-util-labels.h				\
-	e-util-marshal.h			\
 	e-xml-utils.h
 
 libeutil_la_SOURCES =				\
 	$(eutilinclude_HEADERS)			\
-	e-util-marshal.c			\
 	e-bconf-map.c				\
 	e-categories-config.c			\
 	e-config.c				\
@@ -100,6 +99,7 @@ libeutil_la_SOURCES =				\
 	e-import.c				\
 	e-logger.c				\
 	e-non-intrusive-error-dialog.c		\
+	e-marshal.c				\
 	e-menu.c				\
 	e-mktemp.c				\
 	e-plugin.c				\
@@ -123,7 +123,7 @@ libeutil_la_SOURCES =				\
 	gconf-bridge.h				\
 	$(PLATFORM_SOURCES)
 
-MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h
+MARSHAL_GENERATED = e-marshal.c e-marshal.h
 @EVO_MARSHAL_RULE@
 
 libeutil_la_LDFLAGS = $(NO_UNDEFINED)
@@ -164,7 +164,7 @@ EXTRA_DIST =				\
 	e-system.error.xml		\
 	$(pilot_sources)		\
 	ChangeLog.pre-1-4		\
-	e-util-marshal.list
+	e-marshal.list
 
 BUILT_SOURCES = $(MARSHAL_GENERATED) $(error_DATA)
 CLEANFILES    = $(BUILT_SOURCES)
diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c
index 898bff9057..d2b575c15a 100644
--- a/e-util/e-signature-list.c
+++ b/e-util/e-signature-list.c
@@ -29,8 +29,6 @@
 
 #include <libedataserver/e-uid.h>
 
-#include "e-util-marshal.h"
-
 #include "e-signature-list.h"
 
 struct _ESignatureListPrivate {
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index e381e86342..b515f33f57 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -24,7 +24,6 @@
 
 #include <glib/gi18n.h>
 
-#include "e-util-marshal.h"
 #include "e-text-event-processor.h"
 #include "e-util.h"
 
diff --git a/e-util/e-util-marshal.list b/e-util/e-util-marshal.list
deleted file mode 100644
index 9314f25777..0000000000
--- a/e-util/e-util-marshal.list
+++ /dev/null
@@ -1,46 +0,0 @@
-BOOLEAN:INT,INT,OBJECT,INT,INT,UINT
-BOOLEAN:INT,POINTER,INT,OBJECT,INT,INT,UINT
-BOOLEAN:NONE
-BOOLEAN:OBJECT
-BOOLEAN:OBJECT,DOUBLE,DOUBLE,BOOLEAN
-BOOLEAN:POINTER,POINTER,INT,INT,INT
-BOOLEAN:POINTER,POINTER,POINTER,INT,INT,INT
-BOOLEAN:STRING,INT
-DOUBLE:OBJECT,DOUBLE,DOUBLE,BOOLEAN
-INT:BOXED
-INT:INT
-INT:INT,INT,BOXED
-INT:INT,POINTER,INT,BOXED
-INT:OBJECT,BOXED
-INT:POINTER
-NONE:BOXED,INT
-NONE:BOXED,INT,INT
-NONE:INT,INT
-NONE:INT,INT,BOXED
-NONE:INT,INT,OBJECT
-NONE:INT,INT,OBJECT,BOXED,UINT,UINT
-NONE:INT,INT,OBJECT,INT,INT,BOXED,UINT,UINT
-NONE:INT,INT,OBJECT,POINTER,UINT,UINT
-NONE:INT,INT,OBJECT,UINT
-NONE:INT,INT,STRING,STRING
-NONE:INT,INT,STRING,STRING,POINTER
-NONE:INT,POINTER
-NONE:INT,POINTER,INT,BOXED
-NONE:INT,POINTER,INT,OBJECT
-NONE:INT,POINTER,INT,OBJECT,BOXED,UINT,UINT
-NONE:INT,POINTER,INT,OBJECT,INT,INT,BOXED,UINT,UINT
-NONE:INT,POINTER,INT,OBJECT,UINT
-NONE:INT,STRING
-NONE:OBJECT,OBJECT
-NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN
-NONE:POINTER,BOOLEAN
-NONE:POINTER,BOOLEAN,BOOLEAN,BOOLEAN
-NONE:POINTER,INT
-NONE:POINTER,INT,INT
-NONE:POINTER,INT,INT,INT
-NONE:POINTER,INT,INT,INT,INT
-NONE:POINTER,INT,OBJECT
-NONE:POINTER,POINTER
-NONE:POINTER,POINTER,INT
-OBJECT:OBJECT,DOUBLE,DOUBLE,BOOLEAN
-POINTER:NONE
diff --git a/e-util/e-util.c b/e-util/e-util.c
index d4bded2d6b..0b28404c82 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -335,10 +335,6 @@ e_write_file_uri (const gchar *filename, const gchar *data)
 	return res;
 }
 
-/* Include build marshalers */
-
-#include "e-util-marshal.h"
-
 static gint
 epow10 (gint number)
 {
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 4f82df471b..021e3286c7 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -29,7 +29,7 @@
 #include <gconf/gconf-client.h>
 #include <cairo.h>
 
-#include <e-util/e-util-marshal.h>
+#include <e-util/e-marshal.h>
 
 G_BEGIN_DECLS