Progress update:

	- Kill EABMenu.

	- Centralize marshallers to eliminate duplication.


svn path=/branches/kill-bonobo/; revision=36368

6 files changed, 28 insertions, 15 deletions

diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index f22d8e6161..8855115582 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -57,6 +57,7 @@ eutilinclude_HEADERS = 				\
 	e-icon-factory.h			\
 	e-import.h				\
 	e-logger.h				\
+	e-marshal.h				\
 	e-menu.h				\
 	e-mktemp.h				\
 	e-print.h				\
@@ -75,16 +76,14 @@ 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				\
 	e-config-listener.c			\
+	e-config.c				\
 	e-corba-utils.c				\
 	e-cursor.c				\
 	e-dialog-utils.c			\
@@ -98,10 +97,11 @@ libeutil_la_SOURCES =				\
 	e-icon-factory.c			\
 	e-import.c				\
 	e-logger.c				\
+	e-marshal.c				\
 	e-menu.c				\
 	e-mktemp.c				\
-	e-plugin.c				\
 	e-plugin-ui.c				\
+	e-plugin.c				\
 	e-popup.c				\
 	e-print.c				\
 	e-profile-event.c			\
@@ -121,7 +121,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)
@@ -162,7 +162,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-util-marshal.list b/e-util/e-marshal.list
index 9314f25777..f440c3d5d1 100644
--- a/e-util/e-util-marshal.list
+++ b/e-util/e-marshal.list
@@ -1,10 +1,16 @@
+BOOLEAN:BOXED,POINTER,POINTER
 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
+BOOLEAN:POINTER,BOOLEAN,POINTER
+BOOLEAN:POINTER,POINTER
 BOOLEAN:POINTER,POINTER,INT,INT,INT
 BOOLEAN:POINTER,POINTER,POINTER,INT,INT,INT
+BOOLEAN:POINTER,POINTER,POINTER,POINTER
+BOOLEAN:STRING
 BOOLEAN:STRING,INT
 DOUBLE:OBJECT,DOUBLE,DOUBLE,BOOLEAN
 INT:BOXED
@@ -15,6 +21,9 @@ INT:OBJECT,BOXED
 INT:POINTER
 NONE:BOXED,INT
 NONE:BOXED,INT,INT
+NONE:ENUM,ENUM
+NONE:ENUM,STRING
+NONE:INT,BOOLEAN
 NONE:INT,INT
 NONE:INT,INT,BOXED
 NONE:INT,INT,OBJECT
@@ -24,6 +33,7 @@ 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,OBJECT
 NONE:INT,POINTER
 NONE:INT,POINTER,INT,BOXED
 NONE:INT,POINTER,INT,OBJECT
@@ -31,10 +41,12 @@ 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:LONG,LONG
 NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN
+NONE:OBJECT,OBJECT
 NONE:POINTER,BOOLEAN
 NONE:POINTER,BOOLEAN,BOOLEAN,BOOLEAN
+NONE:POINTER,ENUM
 NONE:POINTER,INT
 NONE:POINTER,INT,INT
 NONE:POINTER,INT,INT,INT
@@ -42,5 +54,13 @@ NONE:POINTER,INT,INT,INT,INT
 NONE:POINTER,INT,OBJECT
 NONE:POINTER,POINTER
 NONE:POINTER,POINTER,INT
+NONE:POINTER,STRING
+NONE:STRING,BOOL,INT,INT
+NONE:STRING,INT
+NONE:STRING,INT,INT
+NONE:STRING,POINTER,POINTER
+NONE:STRING,STRING
+NONE:STRING,STRING,STRING
+NONE:STRING,STRING,UINT
 OBJECT:OBJECT,DOUBLE,DOUBLE,BOOLEAN
 POINTER:NONE
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.c b/e-util/e-util.c
index 06d7e1fcee..cec2ec1b69 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -288,10 +288,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 2abe72ced9..d1a76c8ea6 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -30,7 +30,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