From e42f27652709397453431b75c32601a4f4effd48 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 23 Apr 2009 10:02:07 -0400 Subject: =?UTF-8?q?Bug=20577929=20=E2=80=93=20Consolidate=20marshallers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Consolidate all marshalling specifications to e-util/e-marshal.list. This reduces code duplication and makes it slightly easier to locate unused marshallers. --- widgets/table/e-cell-text.c | 4 ++-- widgets/table/e-table-click-to-add.c | 3 +-- widgets/table/e-table-column.c | 4 ++-- widgets/table/e-table-group.c | 10 +++++----- widgets/table/e-table-header-item.c | 1 - widgets/table/e-table-header.c | 2 +- widgets/table/e-table-item.c | 10 +++++----- widgets/table/e-table-model.c | 7 +++---- widgets/table/e-table-search.c | 2 +- widgets/table/e-table.c | 30 +++++++++++++++--------------- widgets/table/e-tree-model.c | 6 +++--- widgets/table/e-tree.c | 35 +++++++++++++++++------------------ 12 files changed, 55 insertions(+), 59 deletions(-) (limited to 'widgets/table') diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index bb767c7bb0..15bd0504ec 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -1776,7 +1776,7 @@ e_cell_text_class_init (ECellTextClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (ECellTextClass, text_inserted), NULL, NULL, - e_util_marshal_VOID__POINTER_INT_INT_INT_INT, + e_marshal_VOID__POINTER_INT_INT_INT_INT, G_TYPE_NONE, 5, G_TYPE_POINTER, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT); @@ -1787,7 +1787,7 @@ e_cell_text_class_init (ECellTextClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (ECellTextClass, text_deleted), NULL, NULL, - e_util_marshal_VOID__POINTER_INT_INT_INT_INT, + e_marshal_VOID__POINTER_INT_INT_INT_INT, G_TYPE_NONE, 5, G_TYPE_POINTER, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT); diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c index c4d72e314b..4871b055eb 100644 --- a/widgets/table/e-table-click-to-add.c +++ b/widgets/table/e-table-click-to-add.c @@ -32,7 +32,6 @@ #include "a11y/e-table/gal-a11y-e-table-click-to-add.h" #include "text/e-text.h" #include -#include "e-util/e-util-marshal.h" #include "e-util/e-util.h" #include "misc/e-canvas-utils.h" #include "misc/e-canvas.h" @@ -538,7 +537,7 @@ etcta_class_init (ETableClickToAddClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClickToAddClass, cursor_change), NULL, NULL, - e_util_marshal_VOID__INT_INT, + e_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); etcta_signals [STYLE_SET] = diff --git a/widgets/table/e-table-column.c b/widgets/table/e-table-column.c index bf9ed10afe..54909a079d 100644 --- a/widgets/table/e-table-column.c +++ b/widgets/table/e-table-column.c @@ -70,14 +70,14 @@ e_table_column_class_init (GtkObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableColumn, structure_change), NULL, NULL, - e_util_marshal_NONE__NONE, + e_marshal_NONE__NONE, G_TYPE_NONE, 0); etc_signals [DIMENSION_CHANGE] = g_signal_new ("dimension_change", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableColumn, dimension_change), - e_util_marshal_NONE__INT, + e_marshal_NONE__INT, G_TYPE_NONE, 1, G_TYPE_INT); } diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c index 9e558bcb3f..257d23fb66 100644 --- a/widgets/table/e-table-group.c +++ b/widgets/table/e-table-group.c @@ -675,7 +675,7 @@ etg_class_init (ETableGroupClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableGroupClass, double_click), NULL, NULL, - e_util_marshal_NONE__INT_INT_BOXED, + e_marshal_NONE__INT_INT_BOXED, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -685,7 +685,7 @@ etg_class_init (ETableGroupClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableGroupClass, right_click), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); etg_signals [CLICK] = @@ -694,7 +694,7 @@ etg_class_init (ETableGroupClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableGroupClass, click), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -704,7 +704,7 @@ etg_class_init (ETableGroupClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableGroupClass, key_press), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -714,7 +714,7 @@ etg_class_init (ETableGroupClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableGroupClass, start_drag), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); } diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 03cdf70754..7ffb1776ae 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -35,7 +35,6 @@ #include #include -#include "e-util/e-util-marshal.h" #include "e-util/e-util.h" #include "e-util/e-xml-utils.h" #include "misc/e-canvas.h" diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c index 66e7d68680..3bd1409ade 100644 --- a/widgets/table/e-table-header.c +++ b/widgets/table/e-table-header.c @@ -304,7 +304,7 @@ e_table_header_class_init (ETableHeaderClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableHeaderClass, request_width), (GSignalAccumulator) NULL, NULL, - e_util_marshal_INT__INT, + e_marshal_INT__INT, G_TYPE_INT, 1, G_TYPE_INT); klass->structure_change = NULL; diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 112865f01a..58d6c65f03 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -3123,7 +3123,7 @@ eti_class_init (ETableItemClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableItemClass, double_click), NULL, NULL, - e_util_marshal_NONE__INT_INT_BOXED, + e_marshal_NONE__INT_INT_BOXED, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3133,7 +3133,7 @@ eti_class_init (ETableItemClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableItemClass, start_drag), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3143,7 +3143,7 @@ eti_class_init (ETableItemClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableItemClass, right_click), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3153,7 +3153,7 @@ eti_class_init (ETableItemClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableItemClass, click), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3163,7 +3163,7 @@ eti_class_init (ETableItemClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableItemClass, key_press), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c index a7b6f9e714..41664e4757 100644 --- a/widgets/table/e-table-model.c +++ b/widgets/table/e-table-model.c @@ -25,7 +25,6 @@ #include -#include "e-util/e-util-marshal.h" #include "e-util/e-util.h" #include "e-table-model.h" @@ -324,7 +323,7 @@ e_table_model_class_init (ETableModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableModelClass, model_cell_changed), (GSignalAccumulator) NULL, NULL, - e_util_marshal_VOID__INT_INT, + e_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); e_table_model_signals [MODEL_ROWS_INSERTED] = @@ -333,7 +332,7 @@ e_table_model_class_init (ETableModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableModelClass, model_rows_inserted), (GSignalAccumulator) NULL, NULL, - e_util_marshal_VOID__INT_INT, + e_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); e_table_model_signals [MODEL_ROWS_DELETED] = @@ -342,7 +341,7 @@ e_table_model_class_init (ETableModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableModelClass, model_rows_deleted), (GSignalAccumulator) NULL, NULL, - e_util_marshal_VOID__INT_INT, + e_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); klass->column_count = NULL; diff --git a/widgets/table/e-table-search.c b/widgets/table/e-table-search.c index 99fa7acb17..7a51b62f1c 100644 --- a/widgets/table/e-table-search.c +++ b/widgets/table/e-table-search.c @@ -129,7 +129,7 @@ e_table_search_class_init (ETableSearchClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableSearchClass, search), (GSignalAccumulator) NULL, NULL, - e_util_marshal_BOOLEAN__STRING_INT, + e_marshal_BOOLEAN__STRING_INT, G_TYPE_BOOLEAN, 2, G_TYPE_STRING, G_TYPE_INT); e_table_search_signals [SEARCH_ACCEPT] = diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index b2e6b0ecaf..69a300d950 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -3141,7 +3141,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, double_click), NULL, NULL, - e_util_marshal_NONE__INT_INT_BOXED, + e_marshal_NONE__INT_INT_BOXED, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3151,7 +3151,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, right_click), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3161,7 +3161,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, click), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3171,7 +3171,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, key_press), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3181,7 +3181,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, start_drag), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3200,7 +3200,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, white_space_event), NULL, NULL, - e_util_marshal_INT__BOXED, + e_marshal_INT__BOXED, G_TYPE_INT, 1, GDK_TYPE_EVENT); et_signals[TABLE_DRAG_BEGIN] = @@ -3209,7 +3209,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_begin), NULL, NULL, - e_util_marshal_NONE__INT_INT_OBJECT, + e_marshal_NONE__INT_INT_OBJECT, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_INT, @@ -3220,7 +3220,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_end), NULL, NULL, - e_util_marshal_NONE__INT_INT_OBJECT, + e_marshal_NONE__INT_INT_OBJECT, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_INT, @@ -3231,7 +3231,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_data_get), NULL, NULL, - e_util_marshal_NONE__INT_INT_OBJECT_BOXED_UINT_UINT, + e_marshal_NONE__INT_INT_OBJECT_BOXED_UINT_UINT, G_TYPE_NONE, 6, G_TYPE_INT, G_TYPE_INT, @@ -3245,7 +3245,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_data_delete), NULL, NULL, - e_util_marshal_NONE__INT_INT_OBJECT, + e_marshal_NONE__INT_INT_OBJECT, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_INT, @@ -3257,7 +3257,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_leave), NULL, NULL, - e_util_marshal_NONE__INT_INT_OBJECT_UINT, + e_marshal_NONE__INT_INT_OBJECT_UINT, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_INT, @@ -3269,7 +3269,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_motion), NULL, NULL, - e_util_marshal_BOOLEAN__INT_INT_OBJECT_INT_INT_UINT, + e_marshal_BOOLEAN__INT_INT_OBJECT_INT_INT_UINT, G_TYPE_BOOLEAN, 6, G_TYPE_INT, G_TYPE_INT, @@ -3283,7 +3283,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_drop), NULL, NULL, - e_util_marshal_BOOLEAN__INT_INT_OBJECT_INT_INT_UINT, + e_marshal_BOOLEAN__INT_INT_OBJECT_INT_INT_UINT, G_TYPE_BOOLEAN, 6, G_TYPE_INT, G_TYPE_INT, @@ -3297,7 +3297,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_data_received), NULL, NULL, - e_util_marshal_NONE__INT_INT_OBJECT_INT_INT_BOXED_UINT_UINT, + e_marshal_NONE__INT_INT_OBJECT_INT_INT_BOXED_UINT_UINT, G_TYPE_NONE, 8, G_TYPE_INT, G_TYPE_INT, @@ -3316,7 +3316,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, 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); g_object_class_install_property (object_class, PROP_LENGTH_THRESHOLD, diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c index ed793ec426..10c7afeb54 100644 --- a/widgets/table/e-tree-model.c +++ b/widgets/table/e-tree-model.c @@ -106,7 +106,7 @@ e_tree_model_class_init (ETreeModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeModelClass, node_col_changed), (GSignalAccumulator) NULL, NULL, - e_util_marshal_VOID__POINTER_INT, + e_marshal_VOID__POINTER_INT, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_INT); e_tree_model_signals [NODE_INSERTED] = @@ -115,7 +115,7 @@ e_tree_model_class_init (ETreeModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeModelClass, node_inserted), (GSignalAccumulator) NULL, NULL, - e_util_marshal_VOID__POINTER_POINTER, + e_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); e_tree_model_signals [NODE_REMOVED] = @@ -124,7 +124,7 @@ e_tree_model_class_init (ETreeModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeModelClass, node_removed), (GSignalAccumulator) NULL, NULL, - e_util_marshal_VOID__POINTER_POINTER_INT, + e_marshal_VOID__POINTER_POINTER_INT, G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_INT); e_tree_model_signals [NODE_DELETED] = diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index ae60bb3cf3..0963229c94 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -33,7 +33,6 @@ #include "a11y/e-table/gal-a11y-e-tree.h" #include #include "e-util/e-util.h" -#include "e-util/e-util-marshal.h" #include "misc/e-canvas.h" #include "misc/e-canvas-utils.h" #include "misc/e-canvas-background.h" @@ -3118,7 +3117,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, cursor_change), NULL, NULL, - e_util_marshal_NONE__INT_POINTER, + e_marshal_NONE__INT_POINTER, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_POINTER); et_signals [CURSOR_ACTIVATED] = @@ -3127,7 +3126,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, cursor_activated), NULL, NULL, - e_util_marshal_NONE__INT_POINTER, + e_marshal_NONE__INT_POINTER, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_POINTER); et_signals [SELECTION_CHANGE] = @@ -3145,7 +3144,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, double_click), NULL, NULL, - e_util_marshal_NONE__INT_POINTER_INT_BOXED, + e_marshal_NONE__INT_POINTER_INT_BOXED, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3155,7 +3154,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, right_click), NULL, NULL, - e_util_marshal_INT__INT_POINTER_INT_BOXED, + e_marshal_INT__INT_POINTER_INT_BOXED, G_TYPE_INT, 4, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3165,7 +3164,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, click), NULL, NULL, - e_util_marshal_INT__INT_POINTER_INT_BOXED, + e_marshal_INT__INT_POINTER_INT_BOXED, G_TYPE_INT, 4, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3175,7 +3174,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, key_press), NULL, NULL, - e_util_marshal_INT__INT_POINTER_INT_BOXED, + e_marshal_INT__INT_POINTER_INT_BOXED, G_TYPE_INT, 4, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3185,7 +3184,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, start_drag), NULL, NULL, - e_util_marshal_NONE__INT_POINTER_INT_BOXED, + e_marshal_NONE__INT_POINTER_INT_BOXED, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3204,7 +3203,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, white_space_event), NULL, NULL, - e_util_marshal_INT__POINTER, + e_marshal_INT__POINTER, G_TYPE_INT, 1, GDK_TYPE_EVENT); et_signals[TREE_DRAG_BEGIN] = @@ -3213,7 +3212,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_begin), NULL, NULL, - e_util_marshal_NONE__INT_POINTER_INT_BOXED, + e_marshal_NONE__INT_POINTER_INT_BOXED, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_POINTER, @@ -3225,7 +3224,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_end), NULL, NULL, - e_util_marshal_NONE__INT_POINTER_INT_BOXED, + e_marshal_NONE__INT_POINTER_INT_BOXED, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_POINTER, @@ -3237,7 +3236,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_data_get), NULL, NULL, - e_util_marshal_NONE__INT_POINTER_INT_OBJECT_BOXED_UINT_UINT, + e_marshal_NONE__INT_POINTER_INT_OBJECT_BOXED_UINT_UINT, G_TYPE_NONE, 7, G_TYPE_INT, G_TYPE_POINTER, @@ -3252,7 +3251,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_data_delete), NULL, NULL, - e_util_marshal_NONE__INT_POINTER_INT_OBJECT, + e_marshal_NONE__INT_POINTER_INT_OBJECT, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_POINTER, @@ -3265,7 +3264,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_leave), NULL, NULL, - e_util_marshal_NONE__INT_POINTER_INT_OBJECT_UINT, + e_marshal_NONE__INT_POINTER_INT_OBJECT_UINT, G_TYPE_NONE, 5, G_TYPE_INT, G_TYPE_POINTER, @@ -3278,7 +3277,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_motion), NULL, NULL, - e_util_marshal_BOOLEAN__INT_POINTER_INT_OBJECT_INT_INT_UINT, + e_marshal_BOOLEAN__INT_POINTER_INT_OBJECT_INT_INT_UINT, G_TYPE_BOOLEAN, 7, G_TYPE_INT, G_TYPE_POINTER, @@ -3293,7 +3292,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_drop), NULL, NULL, - e_util_marshal_BOOLEAN__INT_POINTER_INT_OBJECT_INT_INT_UINT, + e_marshal_BOOLEAN__INT_POINTER_INT_OBJECT_INT_INT_UINT, G_TYPE_BOOLEAN, 7, G_TYPE_INT, G_TYPE_POINTER, @@ -3308,7 +3307,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_data_received), NULL, NULL, - e_util_marshal_NONE__INT_POINTER_INT_OBJECT_INT_INT_BOXED_UINT_UINT, + e_marshal_NONE__INT_POINTER_INT_OBJECT_INT_INT_BOXED_UINT_UINT, G_TYPE_NONE, 9, G_TYPE_INT, G_TYPE_POINTER, @@ -3328,7 +3327,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, 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); -- cgit v1.2.3