Fix for bug #461195 from Hiroyuki Ikezoe.

Use GObject's marshalers whenever possible.


svn path=/trunk/; revision=34324

55 files changed, 176 insertions, 119 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 251f14982b..eab43048ab 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,19 @@
+2007-09-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
+
+	** Fix for bug #461195
+
+	* util/eab-marshal.list:
+	* gui/contact-list-editor/e-contact-list-editor-marshal.list:
+	* gui/contact-editor/e-contact-editor-marshal.list: Remove
+	needless marshalers.
+	* gui/contact-editor/eab-editor.c:
+	* gui/widgets/e-minicard-view-widget.c:
+	* gui/widgets/eab-marshal.list:
+	* gui/widgets/e-minicard.c:
+	* gui/widgets/e-minicard-label.c:
+	* gui/widgets/e-addressbook-model.c:
+	* gui/widgets/e-addressbook-view.c: Use GObject's marshalers.
+
 2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #477045
diff --git a/addressbook/gui/contact-editor/e-contact-editor-marshal.list b/addressbook/gui/contact-editor/e-contact-editor-marshal.list
index 58b2640de5..f871960b0d 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-marshal.list
+++ b/addressbook/gui/contact-editor/e-contact-editor-marshal.list
@@ -1,2 +1 @@
 NONE:INT,OBJECT
-NONE:NONE
diff --git a/addressbook/gui/contact-editor/eab-editor.c b/addressbook/gui/contact-editor/eab-editor.c
index a467515b1c..5c9cd12678 100644
--- a/addressbook/gui/contact-editor/eab-editor.c
+++ b/addressbook/gui/contact-editor/eab-editor.c
@@ -171,7 +171,7 @@ eab_editor_class_init (EABEditorClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (EABEditorClass, editor_closed),
 			      NULL, NULL,
-			      e_contact_editor_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 }
 
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor-marshal.list b/addressbook/gui/contact-list-editor/e-contact-list-editor-marshal.list
index 8d94a0bf3b..32b8e41ecb 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor-marshal.list
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor-marshal.list
@@ -1,4 +1,2 @@
 INT:OBJECT
 NONE:INT,OBJECT
-NONE:INT,OBJECT
-NONE:NONE
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
index 85fa854324..dae9c68745 100644
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ b/addressbook/gui/widgets/e-addressbook-model.c
@@ -320,7 +320,7 @@ eab_model_class_init (GObjectClass *object_class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EABModelClass, writable_status),
 			      NULL, NULL,
-			      eab_marshal_NONE__BOOL,
+			      g_cclosure_marshal_VOID__BOOLEAN,
 			      G_TYPE_NONE,
 			      1, G_TYPE_BOOLEAN);
 
@@ -330,7 +330,7 @@ eab_model_class_init (GObjectClass *object_class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EABModelClass, status_message),
 			      NULL, NULL,
-			      eab_marshal_NONE__POINTER,
+			      g_cclosure_marshal_VOID__POINTER,
 			      G_TYPE_NONE,
 			      1, G_TYPE_POINTER);
 
@@ -340,7 +340,7 @@ eab_model_class_init (GObjectClass *object_class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EABModelClass, search_started),
 			      NULL, NULL,
-			      eab_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 	
 	eab_model_signals [SEARCH_RESULT] =
@@ -349,7 +349,7 @@ eab_model_class_init (GObjectClass *object_class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EABModelClass, search_result),
 			      NULL, NULL,
-			      eab_marshal_NONE__INT,
+			      g_cclosure_marshal_VOID__INT,
 			      G_TYPE_NONE, 1, G_TYPE_INT);
 	
 	eab_model_signals [FOLDER_BAR_MESSAGE] =
@@ -358,7 +358,7 @@ eab_model_class_init (GObjectClass *object_class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EABModelClass, folder_bar_message),
 			      NULL, NULL,
-			      eab_marshal_NONE__POINTER,
+			      g_cclosure_marshal_VOID__POINTER,
 			      G_TYPE_NONE, 1, G_TYPE_POINTER);
 
 	eab_model_signals [CONTACT_ADDED] =
@@ -376,7 +376,7 @@ eab_model_class_init (GObjectClass *object_class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EABModelClass, contacts_removed),
 			      NULL, NULL,
-			      eab_marshal_NONE__POINTER,
+			      g_cclosure_marshal_VOID__POINTER,
 			      G_TYPE_NONE, 1, G_TYPE_POINTER);
 
 	eab_model_signals [CONTACT_CHANGED] =
@@ -385,7 +385,7 @@ eab_model_class_init (GObjectClass *object_class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EABModelClass, contact_changed),
 			      NULL, NULL,
-			      eab_marshal_NONE__INT,
+			      g_cclosure_marshal_VOID__INT,
 			      G_TYPE_NONE, 1, G_TYPE_INT);
 
 	eab_model_signals [MODEL_CHANGED] =
@@ -394,7 +394,7 @@ eab_model_class_init (GObjectClass *object_class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EABModelClass, model_changed),
 			      NULL, NULL,
-			      eab_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	eab_model_signals [STOP_STATE_CHANGED] =
@@ -403,7 +403,7 @@ eab_model_class_init (GObjectClass *object_class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EABModelClass, stop_state_changed),
 			      NULL, NULL,
-			      eab_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	eab_model_signals [BACKEND_DIED] =
@@ -412,7 +412,7 @@ eab_model_class_init (GObjectClass *object_class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EABModelClass, backend_died),
 			      NULL, NULL,
-			      eab_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 }
 
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index ec4895f2e0..8aa6ef0c57 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -256,7 +256,7 @@ eab_view_class_init (EABViewClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EABViewClass, status_message),
 			      NULL, NULL,
-			      eab_marshal_NONE__POINTER,
+			      g_cclosure_marshal_VOID__POINTER,
 			      G_TYPE_NONE, 1, G_TYPE_POINTER);
 
 	eab_view_signals [SEARCH_RESULT] =
@@ -265,7 +265,7 @@ eab_view_class_init (EABViewClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EABViewClass, search_result),
 			      NULL, NULL,
-			      eab_marshal_NONE__INT,
+			      g_cclosure_marshal_VOID__INT,
 			      G_TYPE_NONE, 1, G_TYPE_INT);
 
 	eab_view_signals [FOLDER_BAR_MESSAGE] =
@@ -274,7 +274,7 @@ eab_view_class_init (EABViewClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EABViewClass, folder_bar_message),
 			      NULL, NULL,
-			      eab_marshal_NONE__POINTER,
+			      g_cclosure_marshal_VOID__POINTER,
 			      G_TYPE_NONE, 1, G_TYPE_POINTER);
 
 	eab_view_signals [COMMAND_STATE_CHANGE] =
@@ -283,7 +283,7 @@ eab_view_class_init (EABViewClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EABViewClass, command_state_change),
 			      NULL, NULL,
-			      eab_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	if (!clipboard_atom)
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index ec67d1f92f..1d4bf307c9 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -172,7 +172,7 @@ e_minicard_label_class_init (EMinicardLabelClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (EMinicardLabelClass, style_set),
 			      NULL, NULL,
-			      eab_marshal_VOID__OBJECT,
+			      g_cclosure_marshal_VOID__OBJECT,
 			      G_TYPE_NONE, 1,
 			      GTK_TYPE_STYLE);
 
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index 9f5261af15..7f4c84d0fd 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -136,7 +136,7 @@ e_minicard_view_widget_class_init (EMinicardViewWidgetClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EMinicardViewWidgetClass, selection_change),
 			      NULL, NULL,
-			      eab_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	signals [COLUMN_WIDTH_CHANGED] =
@@ -145,7 +145,7 @@ e_minicard_view_widget_class_init (EMinicardViewWidgetClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EMinicardViewWidgetClass, column_width_changed),
 			      NULL, NULL,
-			      eab_marshal_NONE__DOUBLE,
+			      g_cclosure_marshal_VOID__DOUBLE,
 			      G_TYPE_NONE, 1, G_TYPE_DOUBLE);
 
 	signals [RIGHT_CLICK] =
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 1813476a2f..9569095ff3 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -220,7 +220,7 @@ e_minicard_class_init (EMinicardClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (EMinicardClass, style_set),
 			      NULL, NULL,
-			      eab_marshal_VOID__OBJECT,
+			      g_cclosure_marshal_VOID__OBJECT,
 			      G_TYPE_NONE, 1,
 			      GTK_TYPE_STYLE);
 
diff --git a/addressbook/gui/widgets/eab-marshal.list b/addressbook/gui/widgets/eab-marshal.list
index 2b34707dbb..867355e96e 100644
--- a/addressbook/gui/widgets/eab-marshal.list
+++ b/addressbook/gui/widgets/eab-marshal.list
@@ -1,11 +1,2 @@
 INT:POINTER
-NONE:NONE
-NONE:BOOL
-NONE:POINTER
-NONE:OBJECT
-NONE:ENUM
 NONE:INT,INT
-NONE:INT
-NONE:UINT
-NONE:DOUBLE
-INT:POINTER
diff --git a/addressbook/util/eab-marshal.list b/addressbook/util/eab-marshal.list
index 680ea039a3..e69de29bb2 100644
--- a/addressbook/util/eab-marshal.list
+++ b/addressbook/util/eab-marshal.list
@@ -1,5 +0,0 @@
-NONE:NONE
-NONE:BOOL
-NONE:POINTER
-NONE:STRING
-NONE:INT
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a58079e3f4..349cd18036 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
+
+	** Fix for bug #461195
+
+	* gui/e-calendar-marshal.list: Remove needless marshalers.
+	* gui/e-memos.c:
+	* gui/e-tasks.c: Use GObject's marshalers.
+
 2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #477045
diff --git a/calendar/gui/e-calendar-marshal.list b/calendar/gui/e-calendar-marshal.list
index 1b258f9244..5e0a5c5b22 100644
--- a/calendar/gui/e-calendar-marshal.list
+++ b/calendar/gui/e-calendar-marshal.list
@@ -1,6 +1,3 @@
-NONE:INT
-NONE:POINTER
-NONE:OBJECT
 NONE:INT,STRING
 NONE:INT,BOOL
 NONE:INT,POINTER
diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c
index c04453d5d5..60dc54a927 100644
--- a/calendar/gui/e-memos.c
+++ b/calendar/gui/e-memos.c
@@ -513,7 +513,7 @@ e_memos_class_init (EMemosClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (EMemosClass, source_added),
 			      NULL, NULL,
-			      e_calendar_marshal_VOID__OBJECT,
+			      g_cclosure_marshal_VOID__OBJECT,
 			      G_TYPE_NONE,
 			      1,
 			      G_TYPE_OBJECT);
@@ -524,7 +524,7 @@ e_memos_class_init (EMemosClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (EMemosClass, source_removed),
 			      NULL, NULL,
-			      e_calendar_marshal_VOID__OBJECT,
+			      g_cclosure_marshal_VOID__OBJECT,
 			      G_TYPE_NONE,
 			      1,
 			      G_TYPE_OBJECT);
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index 2c44e58927..d1ede74793 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -641,7 +641,7 @@ e_tasks_class_init (ETasksClass *class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (ETasksClass, source_added),
 			      NULL, NULL,
-			      e_calendar_marshal_VOID__OBJECT,
+			      g_cclosure_marshal_VOID__OBJECT,
 			      G_TYPE_NONE,
 			      1,
 			      G_TYPE_OBJECT);
@@ -652,7 +652,7 @@ e_tasks_class_init (ETasksClass *class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (ETasksClass, source_removed),
 			      NULL, NULL,
-			      e_calendar_marshal_VOID__OBJECT,
+			      g_cclosure_marshal_VOID__OBJECT,
 			      G_TYPE_NONE,
 			      1,
 			      G_TYPE_OBJECT);
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 124506509e..95de506f9c 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
+
+	** Fix for bug #461195
+
+	* e-uril-marshal.list: Remove needless marshalers.
+	* e-text-event-processor.c:
+	* e-signature-list.c: Use GObject's marshalers.
+
 2007-09-10  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fix for bug #471791 
diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c
index 4f57645b92..cbdf138a95 100644
--- a/e-util/e-signature-list.c
+++ b/e-util/e-signature-list.c
@@ -98,7 +98,7 @@ e_signature_list_class_init (ESignatureListClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ESignatureListClass, signature_added),
 			      NULL, NULL,
-			      e_util_marshal_NONE__OBJECT,
+			      g_cclosure_marshal_VOID__OBJECT,
 			      G_TYPE_NONE, 1,
 			      E_TYPE_SIGNATURE);
 	signals[SIGNATURE_CHANGED] =
@@ -107,7 +107,7 @@ e_signature_list_class_init (ESignatureListClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ESignatureListClass, signature_changed),
 			      NULL, NULL,
-			      e_util_marshal_NONE__OBJECT,
+			      g_cclosure_marshal_VOID__OBJECT,
 			      G_TYPE_NONE, 1,
 			      E_TYPE_SIGNATURE);
 	signals[SIGNATURE_REMOVED] =
@@ -116,7 +116,7 @@ e_signature_list_class_init (ESignatureListClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ESignatureListClass, signature_removed),
 			      NULL, NULL,
-			      e_util_marshal_NONE__OBJECT,
+			      g_cclosure_marshal_VOID__OBJECT,
 			      G_TYPE_NONE, 1,
 			      E_TYPE_SIGNATURE);
 }
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index 4c69442fa7..a46301db73 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -72,7 +72,7 @@ e_text_event_processor_class_init (ETextEventProcessorClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETextEventProcessorClass, command),
 			      NULL, NULL,
-			      e_util_marshal_NONE__POINTER,
+			      g_cclosure_marshal_VOID__POINTER,
 			      G_TYPE_NONE, 1,
 			      G_TYPE_POINTER);
 
diff --git a/e-util/e-util-marshal.list b/e-util/e-util-marshal.list
index b478efb1ce..9314f25777 100644
--- a/e-util/e-util-marshal.list
+++ b/e-util/e-util-marshal.list
@@ -13,11 +13,8 @@ INT:INT,INT,BOXED
 INT:INT,POINTER,INT,BOXED
 INT:OBJECT,BOXED
 INT:POINTER
-NONE:BOXED
 NONE:BOXED,INT
 NONE:BOXED,INT,INT
-NONE:DOUBLE
-NONE:INT
 NONE:INT,INT
 NONE:INT,INT,BOXED
 NONE:INT,INT,OBJECT
@@ -34,11 +31,8 @@ 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:NONE
-NONE:OBJECT
 NONE:OBJECT,OBJECT
 NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN
-NONE:POINTER
 NONE:POINTER,BOOLEAN
 NONE:POINTER,BOOLEAN,BOOLEAN,BOOLEAN
 NONE:POINTER,INT
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 7801937c0c..c94953f74e 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
+
+	** Fix for bug #461195
+
+	* filter-marshal.list: Remove needless marshalers.
+	* filter-rule.c:
+	* filter-context.c: Use GObject's marshalers.
+
 2007-09-14  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #476231
diff --git a/filter/filter-marshal.list b/filter/filter-marshal.list
index 9d6744db44..e69de29bb2 100644
--- a/filter/filter-marshal.list
+++ b/filter/filter-marshal.list
@@ -1,2 +0,0 @@
-NONE:NONE
-NONE:POINTER
diff --git a/filter/filter-rule.c b/filter/filter-rule.c
index 9e2c79f10c..bceabcb17a 100644
--- a/filter/filter-rule.c
+++ b/filter/filter-rule.c
@@ -113,7 +113,7 @@ filter_rule_class_init (FilterRuleClass *klass)
 			      G_STRUCT_OFFSET (FilterRuleClass, changed),
 			      NULL,
 			      NULL,
-			      filter_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 }
 
diff --git a/filter/rule-context.c b/filter/rule-context.c
index 33f69a3925..55d53bc078 100644
--- a/filter/rule-context.c
+++ b/filter/rule-context.c
@@ -133,7 +133,7 @@ rule_context_class_init(RuleContextClass *klass)
 			      G_STRUCT_OFFSET(RuleContextClass, rule_added),
 			      NULL,
 			      NULL,
-			      filter_marshal_NONE__POINTER,
+			      g_cclosure_marshal_VOID__POINTER,
 			      G_TYPE_NONE, 1, G_TYPE_POINTER);
 	
 	signals[RULE_REMOVED] =
@@ -143,7 +143,7 @@ rule_context_class_init(RuleContextClass *klass)
 			      G_STRUCT_OFFSET(RuleContextClass, rule_removed),
 			      NULL,
 			      NULL,
-			      filter_marshal_NONE__POINTER,
+			      g_cclosure_marshal_VOID__POINTER,
 			      G_TYPE_NONE, 1, G_TYPE_POINTER);
 	
 	signals[CHANGED] =
@@ -153,7 +153,7 @@ rule_context_class_init(RuleContextClass *klass)
 			      G_STRUCT_OFFSET(RuleContextClass, changed),
 			      NULL,
 			      NULL,
-			      filter_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 }
 
diff --git a/mail/ChangeLog b/mail/ChangeLog
index f7e5c693bc..54ac99880c 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
+
+	** Fix for bug #461195
+
+	* mail-marshalers.list: Remove needless marshalers.
+
 2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #477045
diff --git a/mail/em-marshal.list b/mail/em-marshal.list
index 6138abbf69..660c272832 100644
--- a/mail/em-marshal.list
+++ b/mail/em-marshal.list
@@ -3,4 +3,3 @@ VOID:STRING,STRING,UINT
 VOID:STRING,STRING
 BOOLEAN:POINTER
 VOID:POINTER,POINTER
-VOID:POINTER
diff --git a/plugins/mail-remote/ChangeLog b/plugins/mail-remote/ChangeLog
index d565ef53c1..cb54919c22 100644
--- a/plugins/mail-remote/ChangeLog
+++ b/plugins/mail-remote/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
+
+	** Fix for bug #461195
+
+	* evolution-mail-marshal.list: Remove needless marshalers.
+
 2007-05-12  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #337616
diff --git a/plugins/mail-remote/evolution-mail-marshal.list b/plugins/mail-remote/evolution-mail-marshal.list
index 7af68d8567..cd4885308e 100644
--- a/plugins/mail-remote/evolution-mail-marshal.list
+++ b/plugins/mail-remote/evolution-mail-marshal.list
@@ -1,3 +1 @@
 VOID:POINTER,POINTER
-VOID:POINTER
-
diff --git a/shell/ChangeLog b/shell/ChangeLog
index d870742ffc..5bc2c5ba7c 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,14 @@
+2007-09-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
+
+	** Fix for bug #461195
+
+	* e-shell-marshal.list: Remove needless marshalers.
+	* e-shell-folder-title-bar.c:
+	* e-shell.c:
+	* e-shell-window.c:
+	* e-shell-marshal.list:
+	* e-sidebar.c: Use GObject's marshalers.
+
 2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #477045
diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c
index 16aee674c8..24bf3a58e8 100644
--- a/shell/e-shell-folder-title-bar.c
+++ b/shell/e-shell-folder-title-bar.c
@@ -417,7 +417,7 @@ e_shell_folder_title_bar_class_init (EShellFolderTitleBarClass *klass)
 				G_SIGNAL_RUN_FIRST,
 				G_STRUCT_OFFSET (EShellFolderTitleBarClass, title_toggled),
 				NULL, NULL,
-				e_shell_marshal_NONE__BOOL,
+				g_cclosure_marshal_VOID__BOOLEAN,
 				G_TYPE_NONE, 1,
 				G_TYPE_BOOLEAN);
 
@@ -427,7 +427,7 @@ e_shell_folder_title_bar_class_init (EShellFolderTitleBarClass *klass)
 				G_SIGNAL_RUN_FIRST,
 				G_STRUCT_OFFSET (EShellFolderTitleBarClass, back_clicked),
 				NULL, NULL,
-				e_shell_marshal_NONE__NONE,
+				g_cclosure_marshal_VOID__VOID,
 				G_TYPE_NONE, 0);
 
 	signals[FORWARD_CLICKED]
@@ -436,7 +436,7 @@ e_shell_folder_title_bar_class_init (EShellFolderTitleBarClass *klass)
 				G_SIGNAL_RUN_FIRST,
 				G_STRUCT_OFFSET (EShellFolderTitleBarClass, forward_clicked),
 				NULL, NULL,
-				e_shell_marshal_NONE__NONE,
+				g_cclosure_marshal_VOID__VOID,
 				G_TYPE_NONE, 0);
 }
 
diff --git a/shell/e-shell-marshal.list b/shell/e-shell-marshal.list
index f18d290c80..2b7c3eb383 100644
--- a/shell/e-shell-marshal.list
+++ b/shell/e-shell-marshal.list
@@ -1,12 +1,8 @@
 BOOL:POINTER,INT
-NONE:BOOL
 NONE:BOOL,INT
-NONE:INT
 NONE:INT,INT
 NONE:INT,POINTER
 NONE:INT,STRING
-NONE:NONE
-NONE:POINTER
 NONE:POINTER,INT
 NONE:POINTER,INT,INT
 NONE:POINTER,POINTER
@@ -19,7 +15,6 @@ NONE:POINTER,STRING,BOOL
 NONE:POINTER,STRING,STRING
 NONE:POINTER,STRING,STRING,BOOL
 NONE:POINTER,STRING,STRING,STRING,STRING
-NONE:STRING
 NONE:STRING,BOOL
 NONE:STRING,INT
 NONE:STRING,INT,INT
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index eb4708cc7a..b97138b8fd 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -998,7 +998,7 @@ e_shell_window_class_init (EShellWindowClass *klass)
 						   G_SIGNAL_RUN_FIRST,
 						   G_STRUCT_OFFSET (EShellWindowClass, component_changed),
 						   NULL, NULL,
-						   e_shell_marshal_NONE__NONE,
+						   g_cclosure_marshal_VOID__VOID,
 						   G_TYPE_NONE, 0);
 
 	load_icons ();
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 5a8091e2af..a5617a909a 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -504,7 +504,7 @@ e_shell_class_init (EShellClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EShellClass, no_windows_left),
 			      NULL, NULL,
-			      e_shell_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	signals[LINE_STATUS_CHANGED] =
@@ -513,7 +513,7 @@ e_shell_class_init (EShellClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EShellClass, line_status_changed),
 			      NULL, NULL,
-			      e_shell_marshal_NONE__INT,
+			      g_cclosure_marshal_VOID__INT,
 			      G_TYPE_NONE, 1,
 			      G_TYPE_INT);
 
@@ -523,7 +523,7 @@ e_shell_class_init (EShellClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EShellClass, new_window_created),
 			      NULL, NULL,
-			      e_shell_marshal_NONE__POINTER,
+			      g_cclosure_marshal_VOID__POINTER,
 			      G_TYPE_NONE, 1,
 			      G_TYPE_POINTER);
 
diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c
index ab6ea1657f..4fd2e0e3c0 100644
--- a/shell/e-sidebar.c
+++ b/shell/e-sidebar.c
@@ -469,7 +469,7 @@ e_sidebar_class_init (ESidebarClass *klass)
 				G_SIGNAL_RUN_FIRST,
 				G_STRUCT_OFFSET (ESidebarClass, button_selected),
 				NULL, NULL,
-				e_shell_marshal_NONE__INT,
+				g_cclosure_marshal_VOID__INT,
 				G_TYPE_NONE, 1,
 				G_TYPE_INT);
 	signals[BUTTON_PRESSED]
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index 8f2836b042..6492c5d9b0 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,22 @@
+2007-09-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
+
+	** Fix for bug #461195
+
+	* text/e-completion-view.c:
+	* text/e-text-model.c:
+	* text/e-text.c:
+	* text/e-entry.c:
+	* text/e-completion.c:
+	* misc/e-dateedit.c:
+	* misc/e-reflow-model.c:
+	* misc/e-reflow.c:
+	* misc/e-canvas.c:
+	* misc/e-image-chooser.c:
+	* misc/e-selection-model.c:
+	* misc/e-printable.c:
+	* misc/e-canvas-background.c:
+	* misc/e-search-bar.c: Use GObject's marshalers.
+
 2007-08-31  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Move away from g_assert to g_return* critical warnings to debug
diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index 9ee7d440ce..441973e6e9 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -509,7 +509,7 @@ ecb_class_init (ECanvasBackgroundClass *ecb_class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECanvasBackgroundClass, style_set),
 			      NULL, NULL,
-			      e_util_marshal_NONE__OBJECT,
+			      g_cclosure_marshal_VOID__OBJECT,
 			      G_TYPE_NONE, 1, GTK_TYPE_STYLE);
 }
 
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index 468cf99c5c..9ae23fbfd6 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -93,7 +93,7 @@ e_canvas_class_init (ECanvasClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECanvasClass, reflow),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 }
 
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index 310087a72e..d1598074e7 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -259,7 +259,7 @@ e_date_edit_class_init		(EDateEditClass	*class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (EDateEditClass, changed),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      GTK_TYPE_NONE, 0);
 
 	object_class->dispose = e_date_edit_dispose;
diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c
index 0ce8986f40..5212027bac 100644
--- a/widgets/misc/e-image-chooser.c
+++ b/widgets/misc/e-image-chooser.c
@@ -137,7 +137,7 @@ e_image_chooser_class_init (EImageChooserClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (EImageChooserClass, changed),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      GTK_TYPE_NONE, 0);
 
 	/*
diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c
index 802a40fb85..7d7aa7b36b 100644
--- a/widgets/misc/e-printable.c
+++ b/widgets/misc/e-printable.c
@@ -77,7 +77,7 @@ e_printable_class_init (EPrintableClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EPrintableClass, reset),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0, G_TYPE_NONE);
 
 	e_printable_signals [HEIGHT] =
diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c
index 15d5a81f74..13460b975e 100644
--- a/widgets/misc/e-reflow-model.c
+++ b/widgets/misc/e-reflow-model.c
@@ -161,7 +161,7 @@ e_reflow_model_class_init (EReflowModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EReflowModelClass, model_changed),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	e_reflow_model_signals [COMPARISON_CHANGED] =
@@ -170,7 +170,7 @@ e_reflow_model_class_init (EReflowModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EReflowModelClass, comparison_changed),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	e_reflow_model_signals [MODEL_ITEMS_INSERTED] =
@@ -188,7 +188,7 @@ e_reflow_model_class_init (EReflowModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EReflowModelClass, model_item_changed),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT,
+			      g_cclosure_marshal_VOID__INT,
 			      G_TYPE_NONE, 1, G_TYPE_INT);
 
 	e_reflow_model_signals [MODEL_ITEM_REMOVED] =
@@ -197,7 +197,7 @@ e_reflow_model_class_init (EReflowModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EReflowModelClass, model_item_removed),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT,
+			      g_cclosure_marshal_VOID__INT,
 			      G_TYPE_NONE, 1, G_TYPE_INT);
 
 	klass->set_width            = NULL;
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index 2ae6824176..eca5f60e6a 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -1480,7 +1480,7 @@ e_reflow_class_init (EReflowClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EReflowClass, column_width_changed),
 			      NULL, NULL,
-			      e_util_marshal_NONE__DOUBLE,
+			      g_cclosure_marshal_VOID__DOUBLE,
 			      G_TYPE_NONE, 1, G_TYPE_DOUBLE);
 }
 
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index f96efb06b4..e64694cd32 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -884,7 +884,7 @@ class_init (ESearchBarClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ESearchBarClass, query_changed),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 	
 	esb_signals [MENU_ACTIVATED] =
@@ -893,7 +893,7 @@ class_init (ESearchBarClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ESearchBarClass, menu_activated),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT,
+			      g_cclosure_marshal_VOID__INT,
 			      G_TYPE_NONE, 1, G_TYPE_INT);
 
 	esb_signals [SEARCH_ACTIVATED] =
@@ -902,7 +902,7 @@ class_init (ESearchBarClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ESearchBarClass, search_activated),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	esb_signals [SEARCH_CLEARED] =
@@ -911,7 +911,7 @@ class_init (ESearchBarClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ESearchBarClass, search_cleared),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);	
 }
 
diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c
index 2626e5aa00..786e0bd52b 100644
--- a/widgets/misc/e-selection-model.c
+++ b/widgets/misc/e-selection-model.c
@@ -170,7 +170,7 @@ e_selection_model_class_init (ESelectionModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ESelectionModelClass, selection_changed),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	e_selection_model_signals [SELECTION_ROW_CHANGED] =
@@ -179,7 +179,7 @@ e_selection_model_class_init (ESelectionModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ESelectionModelClass, selection_row_changed),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT,
+			      g_cclosure_marshal_VOID__INT,
 			      G_TYPE_NONE, 1, G_TYPE_INT);
 
 	klass->cursor_changed        = NULL;
diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog
index 267662c979..83b5b455da 100644
--- a/widgets/table/ChangeLog
+++ b/widgets/table/ChangeLog
@@ -1,3 +1,14 @@
+2007-09-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
+
+	** Fix for bug #461195
+
+	* e-table-header-item.c:
+	* e-table-item.c:
+	* e-tree.c:
+	* e-table-click-to-add.c:
+	* e-table.c:
+	* e-table-group.c: Use GObject's marshalers.
+
 2007-09-27  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #478871
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index 2ae00894cb..0ebca14447 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -538,7 +538,7 @@ etcta_class_init (ETableClickToAddClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableClickToAddClass, style_set),
 			      NULL, NULL,
-			      e_util_marshal_NONE__OBJECT,
+			      g_cclosure_marshal_VOID__OBJECT,
 			      G_TYPE_NONE, 1, GTK_TYPE_STYLE);
 
 	gal_a11y_e_table_click_to_add_init ();
diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
index 43e68c8bbb..ff2d0c15f5 100644
--- a/widgets/table/e-table-group.c
+++ b/widgets/table/e-table-group.c
@@ -647,7 +647,7 @@ etg_class_init (ETableGroupClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableGroupClass, cursor_change),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT,
+			      g_cclosure_marshal_VOID__INT,
 			      G_TYPE_NONE, 1, G_TYPE_INT);
 
 	etg_signals [CURSOR_ACTIVATED] =
@@ -656,7 +656,7 @@ etg_class_init (ETableGroupClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableGroupClass, cursor_activated),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT,
+			      g_cclosure_marshal_VOID__INT,
 			      G_TYPE_NONE, 1, G_TYPE_INT);
 
 	etg_signals [DOUBLE_CLICK] =
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 3b2adf3280..45e1ee0ba4 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -1937,7 +1937,7 @@ ethi_class_init (ETableHeaderItemClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableHeaderItemClass, button_pressed),
 			      NULL, NULL,
-			      e_util_marshal_NONE__BOXED,
+			      g_cclosure_marshal_VOID__BOXED,
 			      G_TYPE_NONE, 1, GDK_TYPE_EVENT);
 }
 
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 8226707ca3..4c06d3eee6 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -3049,7 +3049,7 @@ eti_class_init (ETableItemClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableItemClass, cursor_change),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT,
+			      g_cclosure_marshal_VOID__INT,
 			      G_TYPE_NONE, 1, G_TYPE_INT);
 
 	eti_signals [CURSOR_ACTIVATED] =
@@ -3058,7 +3058,7 @@ eti_class_init (ETableItemClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableItemClass, cursor_activated),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT,
+			      g_cclosure_marshal_VOID__INT,
 			      G_TYPE_NONE, 1, G_TYPE_INT);
 
 	eti_signals [DOUBLE_CLICK] =
@@ -3117,7 +3117,7 @@ eti_class_init (ETableItemClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableItemClass, style_set),
 			      NULL, NULL,
-			      e_util_marshal_NONE__OBJECT,
+			      g_cclosure_marshal_VOID__OBJECT,
 			      G_TYPE_NONE, 1, GTK_TYPE_STYLE);
 
 	eti_signals[SELECTION_MODEL_REMOVED] =
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 3895170e0e..dfb15bf073 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -3099,7 +3099,7 @@ e_table_class_init (ETableClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableClass, cursor_change),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT,
+			      g_cclosure_marshal_VOID__INT,
 			      G_TYPE_NONE, 1, G_TYPE_INT);
 
 	et_signals [CURSOR_ACTIVATED] =
@@ -3108,7 +3108,7 @@ e_table_class_init (ETableClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableClass, cursor_activated),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT,
+			      g_cclosure_marshal_VOID__INT,
 			      G_TYPE_NONE, 1, G_TYPE_INT);
 
 	et_signals [SELECTION_CHANGE] =
@@ -3117,7 +3117,7 @@ e_table_class_init (ETableClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableClass, selection_change),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	et_signals [DOUBLE_CLICK] =
@@ -3176,7 +3176,7 @@ e_table_class_init (ETableClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETableClass, state_change),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	et_signals [WHITE_SPACE_EVENT] =
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 7c4ca8ad6b..24ee33ff73 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -3100,7 +3100,7 @@ e_tree_class_init (ETreeClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETreeClass, selection_change),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	et_signals [DOUBLE_CLICK] =
@@ -3159,7 +3159,7 @@ e_tree_class_init (ETreeClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETreeClass, state_change),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	et_signals [WHITE_SPACE_EVENT] =
diff --git a/widgets/text/e-completion-view.c b/widgets/text/e-completion-view.c
index 0eba29f958..6195f8b769 100644
--- a/widgets/text/e-completion-view.c
+++ b/widgets/text/e-completion-view.c
@@ -208,7 +208,7 @@ e_completion_view_class_init (ECompletionViewClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECompletionViewClass, nonempty),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	e_completion_view_signals[E_COMPLETION_VIEW_ADDED] =
@@ -217,7 +217,7 @@ e_completion_view_class_init (ECompletionViewClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECompletionViewClass, added),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	e_completion_view_signals[E_COMPLETION_VIEW_FULL] =
@@ -226,7 +226,7 @@ e_completion_view_class_init (ECompletionViewClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECompletionViewClass, full),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	e_completion_view_signals[E_COMPLETION_VIEW_BROWSE] =
@@ -235,7 +235,7 @@ e_completion_view_class_init (ECompletionViewClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECompletionViewClass, browse),
 			      NULL, NULL,
-			      e_util_marshal_NONE__POINTER,
+			      g_cclosure_marshal_VOID__POINTER,
 			      G_TYPE_NONE, 1,
 			      G_TYPE_POINTER);
 
@@ -245,7 +245,7 @@ e_completion_view_class_init (ECompletionViewClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECompletionViewClass, unbrowse),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	e_completion_view_signals[E_COMPLETION_VIEW_ACTIVATE] =
@@ -254,7 +254,7 @@ e_completion_view_class_init (ECompletionViewClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECompletionViewClass, activate),
 			      NULL, NULL,
-			      e_util_marshal_NONE__POINTER,
+			      g_cclosure_marshal_VOID__POINTER,
 			      G_TYPE_NONE, 1,
 			      G_TYPE_POINTER);
 
diff --git a/widgets/text/e-completion.c b/widgets/text/e-completion.c
index 1c0f1804b9..07bdbe754d 100644
--- a/widgets/text/e-completion.c
+++ b/widgets/text/e-completion.c
@@ -87,7 +87,7 @@ e_completion_class_init (ECompletionClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECompletionClass, completion_found),
 			      NULL, NULL,
-			      e_util_marshal_NONE__POINTER,
+			      g_cclosure_marshal_VOID__POINTER,
 			      G_TYPE_NONE, 1,
 			      G_TYPE_POINTER);
 
@@ -97,7 +97,7 @@ e_completion_class_init (ECompletionClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECompletionClass, completion_finished),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	object_class->dispose = e_completion_dispose;
diff --git a/widgets/text/e-entry.c b/widgets/text/e-entry.c
index fea591c8e1..b4754c6f37 100644
--- a/widgets/text/e-entry.c
+++ b/widgets/text/e-entry.c
@@ -1167,7 +1167,7 @@ e_entry_class_init (EEntryClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EEntryClass, changed),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	e_entry_signals[E_ENTRY_ACTIVATE] =
@@ -1176,7 +1176,7 @@ e_entry_class_init (EEntryClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EEntryClass, activate),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	e_entry_signals[E_ENTRY_POPULATE_POPUP] =
diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c
index 1d5446e6dc..1b4a507518 100644
--- a/widgets/text/e-text-model.c
+++ b/widgets/text/e-text-model.c
@@ -77,7 +77,7 @@ e_text_model_class_init (ETextModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETextModelClass, changed),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	e_text_model_signals[E_TEXT_MODEL_REPOSITION] =
@@ -96,7 +96,7 @@ e_text_model_class_init (ETextModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETextModelClass, object_activated),
 			      NULL, NULL,
-			      e_util_marshal_NONE__INT,
+			      g_cclosure_marshal_VOID__INT,
 			      G_TYPE_NONE, 1,
 			      G_TYPE_INT);
 
@@ -106,7 +106,7 @@ e_text_model_class_init (ETextModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETextModelClass, cancel_completion),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 	
 	/* No default signal handlers. */
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index 7956726e2b..1de81f34bc 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -3510,7 +3510,7 @@ e_text_class_init (ETextClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETextClass, changed),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	e_text_signals[E_TEXT_ACTIVATE] =
@@ -3519,7 +3519,7 @@ e_text_class_init (ETextClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETextClass, activate),
 			      NULL, NULL,
-			      e_util_marshal_NONE__NONE,
+			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
 	e_text_signals[E_TEXT_KEYPRESS] =