diff options
Diffstat (limited to 'widgets/table/e-tree.c')
| -rw-r--r-- | widgets/table/e-tree.c | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index 6d375cdfc1..90cce8e1bb 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -34,7 +34,6 @@ #include "a11y/e-table/gal-a11y-e-tree.h" #include <glib/gi18n.h> #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" @@ -3119,7 +3118,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] = @@ -3128,7 +3127,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] = @@ -3146,7 +3145,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); @@ -3156,7 +3155,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); @@ -3166,7 +3165,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); @@ -3176,7 +3175,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); @@ -3186,7 +3185,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); @@ -3205,7 +3204,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] = @@ -3214,7 +3213,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, @@ -3226,7 +3225,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, @@ -3238,7 +3237,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, @@ -3253,7 +3252,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, @@ -3266,7 +3265,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, @@ -3279,7 +3278,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, @@ -3294,7 +3293,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, @@ -3309,7 +3308,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, @@ -3329,7 +3328,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); |