Fix for bug #461195 from Hiroyuki Ikezoe.

Use GObject's marshalers whenever possible.


svn path=/trunk/; revision=34324

5 files changed, 15 insertions, 15 deletions

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] =