Fix for bug #461195 from Hiroyuki Ikezoe.

Use GObject's marshalers whenever possible.


svn path=/trunk/; revision=34324

11 files changed, 35 insertions, 36 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