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.

8 files changed, 9 insertions, 18 deletions

diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index 5bb175aad2..5169781870 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -29,7 +29,6 @@
 #endif
 
 #include "e-dateedit.h"
-#include "e-util/e-util-marshal.h"
 
 #include <ctype.h>
 #include <stdio.h>
diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c
index 8057d23aaa..20252f1b92 100644
--- a/widgets/misc/e-image-chooser.c
+++ b/widgets/misc/e-image-chooser.c
@@ -28,7 +28,6 @@
 #include <glib/gi18n.h>
 
 #include "e-image-chooser.h"
-#include "e-util/e-util-marshal.h"
 #include "e-util/e-icon-factory.h"
 #include "e-util/e-util.h"
 
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
index 347b97ca7c..f9742b597f 100644
--- a/widgets/misc/e-map.c
+++ b/widgets/misc/e-map.c
@@ -183,7 +183,7 @@ e_map_class_init (EMapClass *class)
 								    G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 								    G_STRUCT_OFFSET (EMapClass, 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);
diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c
index f5392cc201..7f2db7ecc4 100644
--- a/widgets/misc/e-printable.c
+++ b/widgets/misc/e-printable.c
@@ -24,8 +24,6 @@
 
 #include <gtk/gtk.h>
 
-#include "e-util/e-util-marshal.h"
-
 #include "e-util/e-util.h"
 
 #include "e-printable.h"
@@ -57,7 +55,7 @@ e_printable_class_init (EPrintableClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EPrintableClass, print_page),
 			      NULL, NULL,
-			      e_util_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOLEAN,
+			      e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOLEAN,
 			      G_TYPE_NONE, 4, G_TYPE_OBJECT, G_TYPE_DOUBLE,
 			      G_TYPE_DOUBLE, G_TYPE_BOOLEAN);
 
@@ -67,7 +65,7 @@ e_printable_class_init (EPrintableClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EPrintableClass, data_left),
 			      NULL, NULL,
-			      e_util_marshal_BOOLEAN__NONE,
+			      e_marshal_BOOLEAN__NONE,
 			      G_TYPE_BOOLEAN, 0, G_TYPE_NONE);
 
 	e_printable_signals [RESET] =
@@ -85,7 +83,7 @@ e_printable_class_init (EPrintableClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EPrintableClass, height),
 			      NULL, NULL,
-			      e_util_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOLEAN,
+			      e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOLEAN,
 			      G_TYPE_DOUBLE, 4, G_TYPE_OBJECT, G_TYPE_DOUBLE,
 			      G_TYPE_DOUBLE, G_TYPE_BOOLEAN);
 
@@ -95,7 +93,7 @@ e_printable_class_init (EPrintableClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EPrintableClass, will_fit),
 			      NULL, NULL,
-			      e_util_marshal_BOOLEAN__OBJECT_DOUBLE_DOUBLE_BOOLEAN,
+			      e_marshal_BOOLEAN__OBJECT_DOUBLE_DOUBLE_BOOLEAN,
 			      G_TYPE_BOOLEAN, 4, G_TYPE_OBJECT, G_TYPE_DOUBLE,
 			      G_TYPE_DOUBLE, G_TYPE_BOOLEAN);
 
diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c
index 8f206e20c6..eae3d43324 100644
--- a/widgets/misc/e-reflow-model.c
+++ b/widgets/misc/e-reflow-model.c
@@ -22,8 +22,6 @@
  */
 #include <config.h>
 
-#include "e-util/e-util-marshal.h"
-
 #include "e-util/e-util.h"
 
 #include "e-reflow-model.h"
@@ -178,7 +176,7 @@ e_reflow_model_class_init (EReflowModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EReflowModelClass, model_items_inserted),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT_INT,
+			      e_marshal_NONE__INT_INT,
 			      G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
 
 	e_reflow_model_signals [MODEL_ITEM_CHANGED] =
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index 4e4587d3e5..f51a502a83 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -29,7 +29,6 @@
 
 #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-unicode.h"
 
@@ -1461,7 +1460,7 @@ e_reflow_class_init (EReflowClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EReflowClass, selection_event),
 			      NULL, NULL,
-			      e_util_marshal_INT__OBJECT_BOXED,
+			      e_marshal_INT__OBJECT_BOXED,
 			      G_TYPE_INT, 2, G_TYPE_OBJECT,
 			      GDK_TYPE_EVENT);
 
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 33fa94ff7f..30cba7f074 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -41,7 +41,6 @@
 #include "e-icon-entry.h"
 #include "e-search-bar.h"
 #include "e-util/e-util.h"
-#include "e-util/e-util-marshal.h"
 
 
 enum {
diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c
index 4e473f80bb..697bb68096 100644
--- a/widgets/misc/e-selection-model.c
+++ b/widgets/misc/e-selection-model.c
@@ -25,7 +25,6 @@
 #include <gdk/gdkkeysyms.h>
 
 #include <glib/gi18n.h>
-#include "e-util/e-util-marshal.h"
 #include "e-util/e-util.h"
 
 #include "e-selection-model.h"
@@ -151,7 +150,7 @@ e_selection_model_class_init (ESelectionModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ESelectionModelClass, cursor_changed),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT_INT,
+			      e_marshal_NONE__INT_INT,
 			      G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
 
 	e_selection_model_signals [CURSOR_ACTIVATED] =
@@ -160,7 +159,7 @@ e_selection_model_class_init (ESelectionModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ESelectionModelClass, cursor_activated),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT_INT,
+			      e_marshal_NONE__INT_INT,
 			      G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
 
 	e_selection_model_signals [SELECTION_CHANGED] =