Progress update:

	- Kill EABMenu.

	- Centralize marshallers to eliminate duplication.


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

13 files changed, 56 insertions, 60 deletions

diff --git a/widgets/table/e-cell-spin-button.c b/widgets/table/e-cell-spin-button.c
index ea7f294cfa..405546be3e 100644
--- a/widgets/table/e-cell-spin-button.c
+++ b/widgets/table/e-cell-spin-button.c
@@ -149,7 +149,7 @@ e_cell_spin_button_class_init     (ECellSpinButtonClass   *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECellSpinButtonClass, step),
 			      NULL, NULL,
-			      e_util_marshal_NONE__POINTER_INT_INT_INT,
+			      e_marshal_NONE__POINTER_INT_INT_INT,
 			      G_TYPE_NONE,
 			      4, G_TYPE_POINTER, G_TYPE_INT,
 			      G_TYPE_INT, G_TYPE_INT);
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index d0da6beadf..9975dba559 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -1785,7 +1785,7 @@ e_cell_text_class_init (ECellTextClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (ECellTextClass, text_inserted),
 			      NULL, NULL,
-			      e_util_marshal_VOID__POINTER_INT_INT_INT_INT,
+			      e_marshal_VOID__POINTER_INT_INT_INT_INT,
 			      G_TYPE_NONE, 5,
 			      G_TYPE_POINTER, G_TYPE_INT, G_TYPE_INT,
 			      G_TYPE_INT, G_TYPE_INT);
@@ -1796,7 +1796,7 @@ e_cell_text_class_init (ECellTextClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (ECellTextClass, text_deleted),
 			      NULL, NULL,
-			      e_util_marshal_VOID__POINTER_INT_INT_INT_INT,
+			      e_marshal_VOID__POINTER_INT_INT_INT_INT,
 			      G_TYPE_NONE, 5,
 			      G_TYPE_POINTER, G_TYPE_INT, G_TYPE_INT,
 			      G_TYPE_INT, G_TYPE_INT);
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index c4d72e314b..4871b055eb 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -32,7 +32,6 @@
 #include "a11y/e-table/gal-a11y-e-table-click-to-add.h"
 #include "text/e-text.h"
 #include <glib/gi18n.h>
-#include "e-util/e-util-marshal.h"
 #include "e-util/e-util.h"
 #include "misc/e-canvas-utils.h"
 #include "misc/e-canvas.h"
@@ -538,7 +537,7 @@ etcta_class_init (ETableClickToAddClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableClickToAddClass, cursor_change),
 			      NULL, NULL,
-			      e_util_marshal_VOID__INT_INT,
+			      e_marshal_VOID__INT_INT,
 			      G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
 
 	etcta_signals [STYLE_SET] =
diff --git a/widgets/table/e-table-column.c b/widgets/table/e-table-column.c
index bf9ed10afe..54909a079d 100644
--- a/widgets/table/e-table-column.c
+++ b/widgets/table/e-table-column.c
@@ -70,14 +70,14 @@ e_table_column_class_init (GtkObjectClass *object_class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableColumn, structure_change),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      e_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 	etc_signals [DIMENSION_CHANGE] =
 		g_signal_new ("dimension_change",
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableColumn, dimension_change),
-			      e_util_marshal_NONE__INT,
+			      e_marshal_NONE__INT,
 			      G_TYPE_NONE, 1, G_TYPE_INT);
 }
 
diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
index cbbd02c839..cebef080d8 100644
--- a/widgets/table/e-table-group.c
+++ b/widgets/table/e-table-group.c
@@ -675,7 +675,7 @@ etg_class_init (ETableGroupClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableGroupClass, double_click),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT_INT_BOXED,
+			      e_marshal_NONE__INT_INT_BOXED,
 			      G_TYPE_NONE, 3, G_TYPE_INT,
 			      G_TYPE_INT, GDK_TYPE_EVENT);
 
@@ -685,7 +685,7 @@ etg_class_init (ETableGroupClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableGroupClass, right_click),
 			      NULL, NULL,
-			      e_util_marshal_INT__INT_INT_BOXED,
+			      e_marshal_INT__INT_INT_BOXED,
 			      G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT);
 
 	etg_signals [CLICK] =
@@ -694,7 +694,7 @@ etg_class_init (ETableGroupClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableGroupClass, click),
 			      NULL, NULL,
-			      e_util_marshal_INT__INT_INT_BOXED,
+			      e_marshal_INT__INT_INT_BOXED,
 			      G_TYPE_INT, 3, G_TYPE_INT,
 			      G_TYPE_INT, GDK_TYPE_EVENT);
 
@@ -704,7 +704,7 @@ etg_class_init (ETableGroupClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableGroupClass, key_press),
 			      NULL, NULL,
-			      e_util_marshal_INT__INT_INT_BOXED,
+			      e_marshal_INT__INT_INT_BOXED,
 			      G_TYPE_INT, 3, G_TYPE_INT,
 			      G_TYPE_INT, GDK_TYPE_EVENT);
 
@@ -714,7 +714,7 @@ etg_class_init (ETableGroupClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableGroupClass, start_drag),
 			      NULL, NULL,
-			      e_util_marshal_INT__INT_INT_BOXED,
+			      e_marshal_INT__INT_INT_BOXED,
 			      G_TYPE_INT, 3, G_TYPE_INT,
 			      G_TYPE_INT, GDK_TYPE_EVENT);
 }
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index e4138370da..441f665987 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -36,7 +36,6 @@
 #include <gdk/gdkkeysyms.h>
 
 #include <glib/gi18n.h>
-#include "e-util/e-util-marshal.h"
 #include "e-util/e-util.h"
 #include "e-util/e-xml-utils.h"
 #include "misc/e-canvas.h"
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
index 66e7d68680..3bd1409ade 100644
--- a/widgets/table/e-table-header.c
+++ b/widgets/table/e-table-header.c
@@ -304,7 +304,7 @@ e_table_header_class_init (ETableHeaderClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableHeaderClass, request_width),
 			      (GSignalAccumulator) NULL, NULL,
-			      e_util_marshal_INT__INT,
+			      e_marshal_INT__INT,
 			      G_TYPE_INT, 1, G_TYPE_INT);
 
 	klass->structure_change = NULL;
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index a4ec641cc0..c8409fb720 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -3127,7 +3127,7 @@ eti_class_init (ETableItemClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableItemClass, double_click),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT_INT_BOXED,
+			      e_marshal_NONE__INT_INT_BOXED,
 			      G_TYPE_NONE, 3, G_TYPE_INT,
 			      G_TYPE_INT, GDK_TYPE_EVENT);
 
@@ -3137,7 +3137,7 @@ eti_class_init (ETableItemClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableItemClass, start_drag),
 			      NULL, NULL,
-			      e_util_marshal_INT__INT_INT_BOXED,
+			      e_marshal_INT__INT_INT_BOXED,
 			      G_TYPE_INT, 3, G_TYPE_INT,
 			      G_TYPE_INT, GDK_TYPE_EVENT);
 
@@ -3147,7 +3147,7 @@ eti_class_init (ETableItemClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableItemClass, right_click),
 			      NULL, NULL,
-			      e_util_marshal_INT__INT_INT_BOXED,
+			      e_marshal_INT__INT_INT_BOXED,
 			      G_TYPE_INT, 3, G_TYPE_INT,
 			      G_TYPE_INT, GDK_TYPE_EVENT);
 
@@ -3157,7 +3157,7 @@ eti_class_init (ETableItemClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableItemClass, click),
 			      NULL, NULL,
-			      e_util_marshal_INT__INT_INT_BOXED,
+			      e_marshal_INT__INT_INT_BOXED,
 			      G_TYPE_INT, 3, G_TYPE_INT,
 			      G_TYPE_INT, GDK_TYPE_EVENT);
 
@@ -3167,7 +3167,7 @@ eti_class_init (ETableItemClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableItemClass, key_press),
 			      NULL, NULL,
-			      e_util_marshal_INT__INT_INT_BOXED,
+			      e_marshal_INT__INT_INT_BOXED,
 			      G_TYPE_INT, 3, G_TYPE_INT,
 			      G_TYPE_INT, GDK_TYPE_EVENT);
 
diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c
index a7b6f9e714..41664e4757 100644
--- a/widgets/table/e-table-model.c
+++ b/widgets/table/e-table-model.c
@@ -25,7 +25,6 @@
 
 #include <glib-object.h>
 
-#include "e-util/e-util-marshal.h"
 #include "e-util/e-util.h"
 
 #include "e-table-model.h"
@@ -324,7 +323,7 @@ e_table_model_class_init (ETableModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableModelClass, model_cell_changed),
 			      (GSignalAccumulator) NULL, NULL,
-			      e_util_marshal_VOID__INT_INT,
+			      e_marshal_VOID__INT_INT,
 			      G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
 
 	e_table_model_signals [MODEL_ROWS_INSERTED] =
@@ -333,7 +332,7 @@ e_table_model_class_init (ETableModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableModelClass, model_rows_inserted),
 			      (GSignalAccumulator) NULL, NULL,
-			      e_util_marshal_VOID__INT_INT,
+			      e_marshal_VOID__INT_INT,
 			      G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
 
 	e_table_model_signals [MODEL_ROWS_DELETED] =
@@ -342,7 +341,7 @@ e_table_model_class_init (ETableModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableModelClass, model_rows_deleted),
 			      (GSignalAccumulator) NULL, NULL,
-			      e_util_marshal_VOID__INT_INT,
+			      e_marshal_VOID__INT_INT,
 			      G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
 
 	klass->column_count        = NULL;
diff --git a/widgets/table/e-table-search.c b/widgets/table/e-table-search.c
index 99fa7acb17..7a51b62f1c 100644
--- a/widgets/table/e-table-search.c
+++ b/widgets/table/e-table-search.c
@@ -129,7 +129,7 @@ e_table_search_class_init (ETableSearchClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableSearchClass, search),
 			      (GSignalAccumulator) NULL, NULL,
-			      e_util_marshal_BOOLEAN__STRING_INT,
+			      e_marshal_BOOLEAN__STRING_INT,
 			      G_TYPE_BOOLEAN, 2, G_TYPE_STRING, G_TYPE_INT);
 
 	e_table_search_signals [SEARCH_ACCEPT] =
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index c260199ecb..9583494bd1 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -3142,7 +3142,7 @@ e_table_class_init (ETableClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableClass, double_click),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT_INT_BOXED,
+			      e_marshal_NONE__INT_INT_BOXED,
 			      G_TYPE_NONE, 3, G_TYPE_INT,
 			      G_TYPE_INT, GDK_TYPE_EVENT);
 
@@ -3152,7 +3152,7 @@ e_table_class_init (ETableClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableClass, right_click),
 			      NULL, NULL,
-			      e_util_marshal_INT__INT_INT_BOXED,
+			      e_marshal_INT__INT_INT_BOXED,
 			      G_TYPE_INT, 3, G_TYPE_INT,
 			      G_TYPE_INT, GDK_TYPE_EVENT);
 
@@ -3162,7 +3162,7 @@ e_table_class_init (ETableClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableClass, click),
 			      NULL, NULL,
-			      e_util_marshal_INT__INT_INT_BOXED,
+			      e_marshal_INT__INT_INT_BOXED,
 			      G_TYPE_INT, 3, G_TYPE_INT,
 			      G_TYPE_INT, GDK_TYPE_EVENT);
 
@@ -3172,7 +3172,7 @@ e_table_class_init (ETableClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableClass, key_press),
 			      NULL, NULL,
-			      e_util_marshal_INT__INT_INT_BOXED,
+			      e_marshal_INT__INT_INT_BOXED,
 			      G_TYPE_INT, 3, G_TYPE_INT,
 			      G_TYPE_INT, GDK_TYPE_EVENT);
 
@@ -3182,7 +3182,7 @@ e_table_class_init (ETableClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableClass, start_drag),
 			      NULL, NULL,
-			      e_util_marshal_INT__INT_INT_BOXED,
+			      e_marshal_INT__INT_INT_BOXED,
 			      G_TYPE_INT, 3, G_TYPE_INT,
 			      G_TYPE_INT, GDK_TYPE_EVENT);
 
@@ -3201,7 +3201,7 @@ e_table_class_init (ETableClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableClass, white_space_event),
 			      NULL, NULL,
-			      e_util_marshal_INT__BOXED,
+			      e_marshal_INT__BOXED,
 			      G_TYPE_INT, 1, GDK_TYPE_EVENT);
 
 	et_signals[TABLE_DRAG_BEGIN] =
@@ -3210,7 +3210,7 @@ e_table_class_init (ETableClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableClass, table_drag_begin),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT_INT_OBJECT,
+			      e_marshal_NONE__INT_INT_OBJECT,
 			      G_TYPE_NONE, 3,
 			      G_TYPE_INT,
 			      G_TYPE_INT,
@@ -3221,7 +3221,7 @@ e_table_class_init (ETableClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableClass, table_drag_end),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT_INT_OBJECT,
+			      e_marshal_NONE__INT_INT_OBJECT,
 			      G_TYPE_NONE, 3,
 			      G_TYPE_INT,
 			      G_TYPE_INT,
@@ -3232,7 +3232,7 @@ e_table_class_init (ETableClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableClass, table_drag_data_get),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT_INT_OBJECT_BOXED_UINT_UINT,
+			      e_marshal_NONE__INT_INT_OBJECT_BOXED_UINT_UINT,
 			      G_TYPE_NONE, 6,
 			      G_TYPE_INT,
 			      G_TYPE_INT,
@@ -3246,7 +3246,7 @@ e_table_class_init (ETableClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableClass, table_drag_data_delete),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT_INT_OBJECT,
+			      e_marshal_NONE__INT_INT_OBJECT,
 			      G_TYPE_NONE, 3,
 			      G_TYPE_INT,
 			      G_TYPE_INT,
@@ -3258,7 +3258,7 @@ e_table_class_init (ETableClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableClass, table_drag_leave),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT_INT_OBJECT_UINT,
+			      e_marshal_NONE__INT_INT_OBJECT_UINT,
 			      G_TYPE_NONE, 4,
 			      G_TYPE_INT,
 			      G_TYPE_INT,
@@ -3270,7 +3270,7 @@ e_table_class_init (ETableClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableClass, table_drag_motion),
 			      NULL, NULL,
-			      e_util_marshal_BOOLEAN__INT_INT_OBJECT_INT_INT_UINT,
+			      e_marshal_BOOLEAN__INT_INT_OBJECT_INT_INT_UINT,
 			      G_TYPE_BOOLEAN, 6,
 			      G_TYPE_INT,
 			      G_TYPE_INT,
@@ -3284,7 +3284,7 @@ e_table_class_init (ETableClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableClass, table_drag_drop),
 			      NULL, NULL,
-			      e_util_marshal_BOOLEAN__INT_INT_OBJECT_INT_INT_UINT,
+			      e_marshal_BOOLEAN__INT_INT_OBJECT_INT_INT_UINT,
 			      G_TYPE_BOOLEAN, 6,
 			      G_TYPE_INT,
 			      G_TYPE_INT,
@@ -3298,7 +3298,7 @@ e_table_class_init (ETableClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableClass, table_drag_data_received),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT_INT_OBJECT_INT_INT_BOXED_UINT_UINT,
+			      e_marshal_NONE__INT_INT_OBJECT_INT_INT_BOXED_UINT_UINT,
 			      G_TYPE_NONE, 8,
 			      G_TYPE_INT,
 			      G_TYPE_INT,
@@ -3317,7 +3317,7 @@ e_table_class_init (ETableClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableClass, set_scroll_adjustments),
 			      NULL, NULL,
-			      e_util_marshal_NONE__OBJECT_OBJECT,
+			      e_marshal_NONE__OBJECT_OBJECT,
 			      G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
 
 	g_object_class_install_property (object_class, PROP_LENGTH_THRESHOLD,
diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c
index 127c643758..28a856abc9 100644
--- a/widgets/table/e-tree-model.c
+++ b/widgets/table/e-tree-model.c
@@ -107,7 +107,7 @@ e_tree_model_class_init (ETreeModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETreeModelClass, node_col_changed),
 			      (GSignalAccumulator) NULL, NULL,
-			      e_util_marshal_VOID__POINTER_INT,
+			      e_marshal_VOID__POINTER_INT,
 			      G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_INT);
 
 	e_tree_model_signals [NODE_INSERTED] =
@@ -116,7 +116,7 @@ e_tree_model_class_init (ETreeModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETreeModelClass, node_inserted),
 			      (GSignalAccumulator) NULL, NULL,
-			      e_util_marshal_VOID__POINTER_POINTER,
+			      e_marshal_VOID__POINTER_POINTER,
 			      G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 
 	e_tree_model_signals [NODE_REMOVED] =
@@ -125,7 +125,7 @@ e_tree_model_class_init (ETreeModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETreeModelClass, node_removed),
 			      (GSignalAccumulator) NULL, NULL,
-			      e_util_marshal_VOID__POINTER_POINTER_INT,
+			      e_marshal_VOID__POINTER_POINTER_INT,
 			      G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_INT);
 
 	e_tree_model_signals [NODE_DELETED] =
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 6d375cdfc1..90cce8e1bb 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -34,7 +34,6 @@
 #include "a11y/e-table/gal-a11y-e-tree.h"
 #include <glib/gi18n.h>
 #include "e-util/e-util.h"
-#include "e-util/e-util-marshal.h"
 #include "misc/e-canvas.h"
 #include "misc/e-canvas-utils.h"
 #include "misc/e-canvas-background.h"
@@ -3119,7 +3118,7 @@ e_tree_class_init (ETreeClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETreeClass, cursor_change),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT_POINTER,
+			      e_marshal_NONE__INT_POINTER,
 			      G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_POINTER);
 
 	et_signals [CURSOR_ACTIVATED] =
@@ -3128,7 +3127,7 @@ e_tree_class_init (ETreeClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETreeClass, cursor_activated),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT_POINTER,
+			      e_marshal_NONE__INT_POINTER,
 			      G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_POINTER);
 
 	et_signals [SELECTION_CHANGE] =
@@ -3146,7 +3145,7 @@ e_tree_class_init (ETreeClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETreeClass, double_click),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT_POINTER_INT_BOXED,
+			      e_marshal_NONE__INT_POINTER_INT_BOXED,
 			      G_TYPE_NONE, 4, G_TYPE_INT,
 			      G_TYPE_POINTER, G_TYPE_INT, GDK_TYPE_EVENT);
 
@@ -3156,7 +3155,7 @@ e_tree_class_init (ETreeClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETreeClass, right_click),
 			      NULL, NULL,
-			      e_util_marshal_INT__INT_POINTER_INT_BOXED,
+			      e_marshal_INT__INT_POINTER_INT_BOXED,
 			      G_TYPE_INT, 4, G_TYPE_INT, G_TYPE_POINTER,
 			      G_TYPE_INT, GDK_TYPE_EVENT);
 
@@ -3166,7 +3165,7 @@ e_tree_class_init (ETreeClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETreeClass, click),
 			      NULL, NULL,
-			      e_util_marshal_INT__INT_POINTER_INT_BOXED,
+			      e_marshal_INT__INT_POINTER_INT_BOXED,
 			      G_TYPE_INT, 4, G_TYPE_INT, G_TYPE_POINTER,
 			      G_TYPE_INT, GDK_TYPE_EVENT);
 
@@ -3176,7 +3175,7 @@ e_tree_class_init (ETreeClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETreeClass, key_press),
 			      NULL, NULL,
-			      e_util_marshal_INT__INT_POINTER_INT_BOXED,
+			      e_marshal_INT__INT_POINTER_INT_BOXED,
 			      G_TYPE_INT, 4, G_TYPE_INT, G_TYPE_POINTER,
 			      G_TYPE_INT, GDK_TYPE_EVENT);
 
@@ -3186,7 +3185,7 @@ e_tree_class_init (ETreeClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETreeClass, start_drag),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT_POINTER_INT_BOXED,
+			      e_marshal_NONE__INT_POINTER_INT_BOXED,
 			      G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_POINTER,
 			      G_TYPE_INT, GDK_TYPE_EVENT);
 
@@ -3205,7 +3204,7 @@ e_tree_class_init (ETreeClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETreeClass, white_space_event),
 			      NULL, NULL,
-			      e_util_marshal_INT__POINTER,
+			      e_marshal_INT__POINTER,
 			      G_TYPE_INT, 1, GDK_TYPE_EVENT);
 
 	et_signals[TREE_DRAG_BEGIN] =
@@ -3214,7 +3213,7 @@ e_tree_class_init (ETreeClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETreeClass, tree_drag_begin),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT_POINTER_INT_BOXED,
+			      e_marshal_NONE__INT_POINTER_INT_BOXED,
 			      G_TYPE_NONE, 4,
 			      G_TYPE_INT,
 			      G_TYPE_POINTER,
@@ -3226,7 +3225,7 @@ e_tree_class_init (ETreeClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETreeClass, tree_drag_end),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT_POINTER_INT_BOXED,
+			      e_marshal_NONE__INT_POINTER_INT_BOXED,
 			      G_TYPE_NONE, 4,
 			      G_TYPE_INT,
 			      G_TYPE_POINTER,
@@ -3238,7 +3237,7 @@ e_tree_class_init (ETreeClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETreeClass, tree_drag_data_get),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT_POINTER_INT_OBJECT_BOXED_UINT_UINT,
+			      e_marshal_NONE__INT_POINTER_INT_OBJECT_BOXED_UINT_UINT,
 			      G_TYPE_NONE, 7,
 			      G_TYPE_INT,
 			      G_TYPE_POINTER,
@@ -3253,7 +3252,7 @@ e_tree_class_init (ETreeClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETreeClass, tree_drag_data_delete),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT_POINTER_INT_OBJECT,
+			      e_marshal_NONE__INT_POINTER_INT_OBJECT,
 			      G_TYPE_NONE, 4,
 			      G_TYPE_INT,
 			      G_TYPE_POINTER,
@@ -3266,7 +3265,7 @@ e_tree_class_init (ETreeClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETreeClass, tree_drag_leave),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT_POINTER_INT_OBJECT_UINT,
+			      e_marshal_NONE__INT_POINTER_INT_OBJECT_UINT,
 			      G_TYPE_NONE, 5,
 			      G_TYPE_INT,
 			      G_TYPE_POINTER,
@@ -3279,7 +3278,7 @@ e_tree_class_init (ETreeClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETreeClass, tree_drag_motion),
 			      NULL, NULL,
-			      e_util_marshal_BOOLEAN__INT_POINTER_INT_OBJECT_INT_INT_UINT,
+			      e_marshal_BOOLEAN__INT_POINTER_INT_OBJECT_INT_INT_UINT,
 			      G_TYPE_BOOLEAN, 7,
 			      G_TYPE_INT,
 			      G_TYPE_POINTER,
@@ -3294,7 +3293,7 @@ e_tree_class_init (ETreeClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETreeClass, tree_drag_drop),
 			      NULL, NULL,
-			      e_util_marshal_BOOLEAN__INT_POINTER_INT_OBJECT_INT_INT_UINT,
+			      e_marshal_BOOLEAN__INT_POINTER_INT_OBJECT_INT_INT_UINT,
 			      G_TYPE_BOOLEAN, 7,
 			      G_TYPE_INT,
 			      G_TYPE_POINTER,
@@ -3309,7 +3308,7 @@ e_tree_class_init (ETreeClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETreeClass, tree_drag_data_received),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT_POINTER_INT_OBJECT_INT_INT_BOXED_UINT_UINT,
+			      e_marshal_NONE__INT_POINTER_INT_OBJECT_INT_INT_BOXED_UINT_UINT,
 			      G_TYPE_NONE, 9,
 			      G_TYPE_INT,
 			      G_TYPE_POINTER,
@@ -3329,7 +3328,7 @@ e_tree_class_init (ETreeClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETreeClass, set_scroll_adjustments),
 			      NULL, NULL,
-			      e_util_marshal_NONE__OBJECT_OBJECT,
+			      e_marshal_NONE__OBJECT_OBJECT,
 			      G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT,
 			      GTK_TYPE_ADJUSTMENT);