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.

7 files changed, 9 insertions, 22 deletions

diff --git a/mail/Makefile.am b/mail/Makefile.am
index e286a47908..23778d569c 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -92,7 +92,6 @@ mailinclude_HEADERS =				\
 
 libevolution_mail_la_SOURCES =			\
 	$(MAIL_IDL_GENERATED)			\
-	$(MARSHAL_GENERATED)			\
 	$(mailinclude_HEADERS)			\
 	e-searching-tokenizer.c			\
 	e-searching-tokenizer.h			\
@@ -241,15 +240,12 @@ em-filter-i18n.h: filtertypes.xml vfoldertypes.xml searchtypes.xml
 		sort -u >> $@
 
 glade_DATA = mail-config.glade mail-dialogs.glade
-MARSHAL_GENERATED = em-marshal.c em-marshal.h
-@EVO_MARSHAL_RULE@
 
 etspec_DATA = message-list.etspec
 
 EXTRA_DIST = 				\
 	ChangeLog.pre-1-4		\
 	README.async			\
-	em-marshal.list			\
 	$(MAIL_IDL)			\
 	mail.error.xml			\
 	$(glade_DATA)			\
@@ -306,7 +302,7 @@ endif
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
 
-BUILT_SOURCES = $(MAIL_IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) $(error_DATA)
+BUILT_SOURCES = $(MAIL_IDL_GENERATED) $(server_DATA) $(error_DATA)
 
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index 0357a26142..8687b1cbd2 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -37,6 +37,7 @@
 #include <libedataserver/e-xml-utils.h>
 #include <libedataserver/e-data-server-util.h>
 
+#include <e-util/e-util.h>
 #include <e-util/e-mktemp.h>
 
 #include <glib/gi18n.h>
@@ -57,7 +58,6 @@
 #include <camel/camel-folder.h>
 #include <camel/camel-vee-store.h>
 
-#include "em-marshal.h"
 #include "em-folder-tree-model.h"
 
 #define u(x)			/* unread count debug */
@@ -152,7 +152,7 @@ em_folder_tree_model_class_init (EMFolderTreeModelClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (EMFolderTreeModelClass, loading_row),
 			      NULL, NULL,
-			      em_marshal_VOID__POINTER_POINTER,
+			      e_marshal_VOID__POINTER_POINTER,
 			      G_TYPE_NONE, 2,
 			      G_TYPE_POINTER,
 			      G_TYPE_POINTER);
@@ -163,7 +163,7 @@ em_folder_tree_model_class_init (EMFolderTreeModelClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (EMFolderTreeModelClass, loaded_row),
 			      NULL, NULL,
-			      em_marshal_VOID__POINTER_POINTER,
+			      e_marshal_VOID__POINTER_POINTER,
 			      G_TYPE_NONE, 2,
 			      G_TYPE_POINTER,
 			      G_TYPE_POINTER);
@@ -174,7 +174,7 @@ em_folder_tree_model_class_init (EMFolderTreeModelClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (EMFolderTreeModelClass, folder_added),
 			      NULL, NULL,
-			      em_marshal_VOID__STRING_STRING,
+			      e_marshal_VOID__STRING_STRING,
 			      G_TYPE_NONE, 2,
 			      G_TYPE_STRING,
 			      G_TYPE_STRING);
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 14bdc832c8..eebb15454c 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -66,7 +66,6 @@
 
 #include "em-utils.h"
 #include "em-popup.h"
-#include "em-marshal.h"
 #include "em-folder-tree.h"
 #include "em-folder-utils.h"
 #include "em-folder-selector.h"
@@ -222,7 +221,7 @@ em_folder_tree_class_init (EMFolderTreeClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (EMFolderTreeClass, folder_selected),
 			      NULL, NULL,
-			      em_marshal_VOID__STRING_STRING_UINT,
+			      e_marshal_VOID__STRING_STRING_UINT,
 			      G_TYPE_NONE, 3,
 			      G_TYPE_STRING,
 			      G_TYPE_STRING,
@@ -234,7 +233,7 @@ em_folder_tree_class_init (EMFolderTreeClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (EMFolderTreeClass, folder_activated),
 			      NULL, NULL,
-			      em_marshal_VOID__STRING_STRING,
+			      e_marshal_VOID__STRING_STRING,
 			      G_TYPE_NONE, 2,
 			      G_TYPE_STRING,
 			      G_TYPE_STRING);
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 56111abe6c..ea177b65ce 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -65,7 +65,6 @@
 
 #include "em-utils.h"
 #include "em-popup.h"
-#include "em-marshal.h"
 #include "em-folder-tree.h"
 #include "em-folder-tree-model.h"
 #include "em-folder-utils.h"
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 54ea58529c..8e220955fa 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -98,7 +98,6 @@
 #include "message-list.h"
 #include "em-utils.h"
 #include "em-composer-utils.h"
-#include "em-marshal.h"
 #include "em-menu.h"
 #include "em-event.h"
 
@@ -412,7 +411,7 @@ emfv_class_init(GObjectClass *klass)
 					     G_SIGNAL_RUN_LAST,
 					     G_STRUCT_OFFSET (EMFolderViewClass, on_url),
 					     NULL, NULL,
-					     em_marshal_VOID__STRING_STRING,
+					     e_marshal_VOID__STRING_STRING,
 					     G_TYPE_NONE,
 					     2, G_TYPE_STRING, G_TYPE_STRING);
 
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index bef662452f..ad72ee8bdd 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -81,7 +81,6 @@
 #include "mail-config.h"
 
 #include "em-format-html-display.h"
-#include "em-marshal.h"
 #include "e-searching-tokenizer.h"
 #include "em-icon-stream.h"
 #include "em-utils.h"
@@ -340,7 +339,7 @@ efhd_class_init(GObjectClass *klass)
 			     G_SIGNAL_RUN_LAST,
 			     G_STRUCT_OFFSET(EMFormatHTMLDisplayClass, popup_event),
 			     efhd_bool_accumulator, NULL,
-			     em_marshal_BOOLEAN__BOXED_POINTER_POINTER,
+			     e_marshal_BOOLEAN__BOXED_POINTER_POINTER,
 			     G_TYPE_BOOLEAN, 3,
 			     GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE,
 			     G_TYPE_POINTER, G_TYPE_POINTER);
diff --git a/mail/em-marshal.list b/mail/em-marshal.list
deleted file mode 100644
index 660c272832..0000000000
--- a/mail/em-marshal.list
+++ /dev/null
@@ -1,5 +0,0 @@
-BOOLEAN:BOXED,POINTER,POINTER
-VOID:STRING,STRING,UINT
-VOID:STRING,STRING
-BOOLEAN:POINTER
-VOID:POINTER,POINTER