aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/table/e-tree.c
diff options
context:
space:
mode:
Diffstat (limited to 'widgets/table/e-tree.c')
-rw-r--r--widgets/table/e-tree.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 3286d40907..c5ddbbc52c 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -31,12 +31,12 @@
#include <gtk/gtk.h>
#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
-#include "gal/a11y/e-table/gal-a11y-e-tree.h"
-#include "gal/util/e-i18n.h"
-#include "gal/util/e-util.h"
-#include "gal/util/e-marshal.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-canvas-background.h"
+#include "a11y/e-table/gal-a11y-e-tree.h"
+#include "e-util/e-i18n.h"
+#include "e-util/e-util.h"
+#include "e-util/e-util-marshal.h"
+#include "widgets/misc/e-canvas.h"
+#include "widgets/misc/e-canvas-background.h"
#include "e-table-column-specification.h"
#include "e-table-header-item.h"
@@ -3046,7 +3046,7 @@ e_tree_class_init (ETreeClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeClass, cursor_change),
NULL, NULL,
- e_marshal_NONE__INT_POINTER,
+ e_util_marshal_NONE__INT_POINTER,
G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_POINTER);
et_signals [CURSOR_ACTIVATED] =
@@ -3055,7 +3055,7 @@ e_tree_class_init (ETreeClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeClass, cursor_activated),
NULL, NULL,
- e_marshal_NONE__INT_POINTER,
+ e_util_marshal_NONE__INT_POINTER,
G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_POINTER);
et_signals [SELECTION_CHANGE] =
@@ -3064,7 +3064,7 @@ e_tree_class_init (ETreeClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeClass, selection_change),
NULL, NULL,
- e_marshal_NONE__NONE,
+ e_util_marshal_NONE__NONE,
G_TYPE_NONE, 0);
et_signals [DOUBLE_CLICK] =
@@ -3073,7 +3073,7 @@ e_tree_class_init (ETreeClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeClass, double_click),
NULL, NULL,
- e_marshal_NONE__INT_POINTER_INT_BOXED,
+ e_util_marshal_NONE__INT_POINTER_INT_BOXED,
G_TYPE_NONE, 4, G_TYPE_INT,
G_TYPE_POINTER, G_TYPE_INT, GDK_TYPE_EVENT);
@@ -3083,7 +3083,7 @@ e_tree_class_init (ETreeClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeClass, right_click),
NULL, NULL,
- e_marshal_INT__INT_POINTER_INT_BOXED,
+ e_util_marshal_INT__INT_POINTER_INT_BOXED,
G_TYPE_INT, 4, G_TYPE_INT, G_TYPE_POINTER,
G_TYPE_INT, GDK_TYPE_EVENT);
@@ -3093,7 +3093,7 @@ e_tree_class_init (ETreeClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeClass, click),
NULL, NULL,
- e_marshal_INT__INT_POINTER_INT_BOXED,
+ e_util_marshal_INT__INT_POINTER_INT_BOXED,
G_TYPE_INT, 4, G_TYPE_INT, G_TYPE_POINTER,
G_TYPE_INT, GDK_TYPE_EVENT);
@@ -3103,7 +3103,7 @@ e_tree_class_init (ETreeClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeClass, key_press),
NULL, NULL,
- e_marshal_INT__INT_POINTER_INT_BOXED,
+ e_util_marshal_INT__INT_POINTER_INT_BOXED,
G_TYPE_INT, 4, G_TYPE_INT, G_TYPE_POINTER,
G_TYPE_INT, GDK_TYPE_EVENT);
@@ -3113,7 +3113,7 @@ e_tree_class_init (ETreeClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeClass, start_drag),
NULL, NULL,
- e_marshal_NONE__INT_POINTER_INT_BOXED,
+ e_util_marshal_NONE__INT_POINTER_INT_BOXED,
G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_POINTER,
G_TYPE_INT, GDK_TYPE_EVENT);
@@ -3123,7 +3123,7 @@ e_tree_class_init (ETreeClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeClass, state_change),
NULL, NULL,
- e_marshal_NONE__NONE,
+ e_util_marshal_NONE__NONE,
G_TYPE_NONE, 0);
et_signals [WHITE_SPACE_EVENT] =
@@ -3132,7 +3132,7 @@ e_tree_class_init (ETreeClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeClass, white_space_event),
NULL, NULL,
- e_marshal_INT__POINTER,
+ e_util_marshal_INT__POINTER,
G_TYPE_INT, 1, GDK_TYPE_EVENT);
et_signals[TREE_DRAG_BEGIN] =
@@ -3141,7 +3141,7 @@ e_tree_class_init (ETreeClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeClass, tree_drag_begin),
NULL, NULL,
- e_marshal_NONE__INT_POINTER_INT_BOXED,
+ e_util_marshal_NONE__INT_POINTER_INT_BOXED,
G_TYPE_NONE, 4,
G_TYPE_INT,
G_TYPE_POINTER,
@@ -3153,7 +3153,7 @@ e_tree_class_init (ETreeClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeClass, tree_drag_end),
NULL, NULL,
- e_marshal_NONE__INT_POINTER_INT_BOXED,
+ e_util_marshal_NONE__INT_POINTER_INT_BOXED,
G_TYPE_NONE, 4,
G_TYPE_INT,
G_TYPE_POINTER,
@@ -3165,7 +3165,7 @@ e_tree_class_init (ETreeClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeClass, tree_drag_data_get),
NULL, NULL,
- e_marshal_NONE__INT_POINTER_INT_OBJECT_BOXED_UINT_UINT,
+ e_util_marshal_NONE__INT_POINTER_INT_OBJECT_BOXED_UINT_UINT,
G_TYPE_NONE, 7,
G_TYPE_INT,
G_TYPE_POINTER,
@@ -3180,7 +3180,7 @@ e_tree_class_init (ETreeClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeClass, tree_drag_data_delete),
NULL, NULL,
- e_marshal_NONE__INT_POINTER_INT_OBJECT,
+ e_util_marshal_NONE__INT_POINTER_INT_OBJECT,
G_TYPE_NONE, 4,
G_TYPE_INT,
G_TYPE_POINTER,
@@ -3193,7 +3193,7 @@ e_tree_class_init (ETreeClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeClass, tree_drag_leave),
NULL, NULL,
- e_marshal_NONE__INT_POINTER_INT_OBJECT_UINT,
+ e_util_marshal_NONE__INT_POINTER_INT_OBJECT_UINT,
G_TYPE_NONE, 5,
G_TYPE_INT,
G_TYPE_POINTER,
@@ -3206,7 +3206,7 @@ e_tree_class_init (ETreeClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeClass, tree_drag_motion),
NULL, NULL,
- e_marshal_BOOLEAN__INT_POINTER_INT_OBJECT_INT_INT_UINT,
+ e_util_marshal_BOOLEAN__INT_POINTER_INT_OBJECT_INT_INT_UINT,
G_TYPE_BOOLEAN, 7,
G_TYPE_INT,
G_TYPE_POINTER,
@@ -3221,7 +3221,7 @@ e_tree_class_init (ETreeClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeClass, tree_drag_drop),
NULL, NULL,
- e_marshal_BOOLEAN__INT_POINTER_INT_OBJECT_INT_INT_UINT,
+ e_util_marshal_BOOLEAN__INT_POINTER_INT_OBJECT_INT_INT_UINT,
G_TYPE_BOOLEAN, 7,
G_TYPE_INT,
G_TYPE_POINTER,
@@ -3236,7 +3236,7 @@ e_tree_class_init (ETreeClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeClass, tree_drag_data_received),
NULL, NULL,
- e_marshal_NONE__INT_POINTER_INT_OBJECT_INT_INT_BOXED_UINT_UINT,
+ e_util_marshal_NONE__INT_POINTER_INT_OBJECT_INT_INT_BOXED_UINT_UINT,
G_TYPE_NONE, 9,
G_TYPE_INT,
G_TYPE_POINTER,
@@ -3256,7 +3256,7 @@ e_tree_class_init (ETreeClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeClass, set_scroll_adjustments),
NULL, NULL,
- e_marshal_NONE__POINTER_POINTER,
+ e_util_marshal_NONE__POINTER_POINTER,
G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT,
GTK_TYPE_ADJUSTMENT);