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, 11 insertions, 36 deletions

diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 77f27cd71e..e61f6a1f91 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -22,10 +22,6 @@ $(CALENDAR_IDL_GENERATED_C): $(CALENDAR_IDL_GENERATED_H)
 
 IDL_GENERATED = $(CALENDAR_IDL_GENERATED)
 
-# The marshallers
-MARSHAL_GENERATED = e-calendar-marshal.c e-calendar-marshal.h
-@EVO_MARSHAL_RULE@
-
 SUBDIRS = alarm-notify dialogs
 
 component_LTLIBRARIES = libevolution-calendar.la
@@ -73,7 +69,6 @@ etspec_DATA =				\
 
 libevolution_calendar_la_SOURCES =		\
 	$(IDL_GENERATED)			\
-	$(MARSHAL_GENERATED)			\
 	cal-search-bar.c			\
 	cal-search-bar.h			\
 	calendar-config.c			\
@@ -252,7 +247,6 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
 
 EXTRA_DIST =	 			\
-	e-calendar-marshal.list		\
 	$(glade_DATA)			\
 	$(schema_in_files)              \
 	$(etspec_DATA)			\
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 4007e1236f..4fcfbd7609 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -35,7 +35,7 @@
 #include "e-cal-model.h"
 #include "itip-utils.h"
 #include "misc.h"
-#include "e-calendar-marshal.h"
+#include "e-util/e-util.h"
 #include "calendar-config.h"
 
 typedef struct {
@@ -153,7 +153,7 @@ e_cal_model_class_init (ECalModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECalModelClass, time_range_changed),
 			      NULL, NULL,
-			      e_calendar_marshal_VOID__LONG_LONG,
+			      e_marshal_VOID__LONG_LONG,
 			      G_TYPE_NONE, 2, G_TYPE_LONG, G_TYPE_LONG);
 
 	signals[ROW_APPENDED] =
@@ -180,7 +180,7 @@ e_cal_model_class_init (ECalModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECalModelClass, cal_view_progress),
 			      NULL, NULL,
-	                      e_calendar_marshal_VOID__STRING_INT_INT,
+	                      e_marshal_VOID__STRING_INT_INT,
 			      G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
 	signals[CAL_VIEW_DONE] =
 		g_signal_new ("cal_view_done",
@@ -188,7 +188,7 @@ e_cal_model_class_init (ECalModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECalModelClass, cal_view_done),
 			      NULL, NULL,
-			      e_calendar_marshal_VOID__INT_INT,
+			      e_marshal_VOID__INT_INT,
 			      G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
 
 }
diff --git a/calendar/gui/e-calendar-marshal.list b/calendar/gui/e-calendar-marshal.list
deleted file mode 100644
index 5e0a5c5b22..0000000000
--- a/calendar/gui/e-calendar-marshal.list
+++ /dev/null
@@ -1,17 +0,0 @@
-NONE:INT,STRING
-NONE:INT,BOOL
-NONE:INT,POINTER
-NONE:INT,OBJECT
-NONE:STRING,INT
-NONE:INT,INT
-NONE:ENUM,ENUM
-NONE:ENUM,STRING
-NONE:STRING,BOOL,INT,INT
-NONE:STRING,STRING
-NONE:STRING,STRING,STRING
-NONE:STRING,POINTER,POINTER
-NONE:POINTER,ENUM
-NONE:POINTER,STRING
-NONE:POINTER,POINTER
-NONE:LONG,LONG
-NONE:STRING,INT,INT
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 495b50d0e9..a6376a7385 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -31,10 +31,10 @@
 #include <glib/gstdio.h>
 #include <gdk/gdkkeysyms.h>
 #include <libedataserver/e-time-utils.h>
+#include <e-util/e-util.h>
 #include <e-util/e-error.h>
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-icon-factory.h>
-#include "e-calendar-marshal.h"
 #include <libecal/e-cal-time-util.h>
 #include <libecal/e-cal-component.h>
 
@@ -204,7 +204,7 @@ e_calendar_view_class_init (ECalendarViewClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECalendarViewClass, timezone_changed),
 			      NULL, NULL,
-			      e_calendar_marshal_VOID__POINTER_POINTER,
+			      e_marshal_VOID__POINTER_POINTER,
 			      G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 
 	e_calendar_view_signals[EVENT_CHANGED] =
diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c
index 71cfb4e4c1..384743184a 100644
--- a/calendar/gui/e-memos.c
+++ b/calendar/gui/e-memos.c
@@ -44,7 +44,6 @@
 #include <libedataserver/e-categories.h>
 #include "widgets/menus/gal-view-menus.h"
 #include "dialogs/delete-error.h"
-#include "e-calendar-marshal.h"
 #include "calendar-config.h"
 #include "cal-search-bar.h"
 #include "calendar-component.h"
diff --git a/calendar/gui/e-select-names-renderer.c b/calendar/gui/e-select-names-renderer.c
index fb742bf5c7..357eba4c5b 100644
--- a/calendar/gui/e-select-names-renderer.c
+++ b/calendar/gui/e-select-names-renderer.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include "e-calendar-marshal.h"
+#include "e-util/e-util.h"
 
 #include "e-select-names-editable.h"
 #include "e-select-names-renderer.h"
@@ -192,7 +192,7 @@ e_select_names_renderer_class_init (ESelectNamesRendererClass *class)
 					      G_SIGNAL_RUN_LAST,
 					      G_STRUCT_OFFSET (ESelectNamesRendererClass, cell_edited),
 					      NULL, NULL,
-					      e_calendar_marshal_VOID__STRING_POINTER_POINTER,
+					      e_marshal_VOID__STRING_POINTER_POINTER,
 					      G_TYPE_NONE, 3,
 					      G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER);
 }
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index f617a1bbd3..4efb688ae0 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -43,7 +43,6 @@
 #include "widgets/menus/gal-view-menus.h"
 #include "dialogs/delete-error.h"
 #include "dialogs/task-editor.h"
-#include "e-calendar-marshal.h"
 #include "cal-search-bar.h"
 #include "calendar-config.h"
 #include "calendar-component.h"
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 1bae7d2879..c2e4511ce6 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -47,6 +47,7 @@
 #include <widgets/menus/gal-view-etable.h>
 #include <widgets/menus/gal-define-views-dialog.h>
 #include "widgets/menus/gal-view-menus.h"
+#include "e-util/e-util.h"
 #include "e-util/e-error.h"
 #include "e-util/e-util-private.h"
 #include "e-comp-editor-registry.h"
@@ -54,7 +55,6 @@
 #include "dialogs/event-editor.h"
 #include "dialogs/task-editor.h"
 #include "comp-util.h"
-#include "e-calendar-marshal.h"
 #include "e-cal-model-calendar.h"
 #include "e-day-view.h"
 #include "e-day-view-config.h"
@@ -372,7 +372,7 @@ gnome_calendar_class_init (GnomeCalendarClass *class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (GnomeCalendarClass, source_added),
 			      NULL, NULL,
-			      e_calendar_marshal_VOID__INT_OBJECT,
+			      e_marshal_VOID__INT_OBJECT,
 			      G_TYPE_NONE,
 			      2,
 			      G_TYPE_INT, G_TYPE_OBJECT);
@@ -383,7 +383,7 @@ gnome_calendar_class_init (GnomeCalendarClass *class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (GnomeCalendarClass, source_removed),
 			      NULL, NULL,
-			      e_calendar_marshal_VOID__INT_OBJECT,
+			      e_marshal_VOID__INT_OBJECT,
 			      G_TYPE_NONE,
 			      2,
 			      G_TYPE_INT, G_TYPE_OBJECT);