[evolution] Replace deprecated NONE with VOID in e-marshal.list
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Replace deprecated NONE with VOID in e-marshal.list
- Date: Tue, 5 Dec 2017 16:35:56 +0000 (UTC)
commit 1aa99326a5c80991d9298a55d188d567f16b4a14
Author: Milan Crha <mcrha redhat com>
Date: Tue Dec 5 17:35:37 2017 +0100
Replace deprecated NONE with VOID in e-marshal.list
src/addressbook/gui/contact-editor/eab-editor.c | 6 +-
src/addressbook/gui/widgets/e-addressbook-model.c | 2 +-
src/e-util/e-marshal.list | 68 ++++++++++----------
src/e-util/e-printable.c | 4 +-
src/e-util/e-reflow-model.c | 2 +-
src/e-util/e-selection-model.c | 4 +-
src/e-util/e-table-group.c | 2 +-
src/e-util/e-table-item.c | 2 +-
src/e-util/e-table.c | 14 ++--
src/e-util/e-text-model.c | 2 +-
src/e-util/e-text.c | 4 +-
src/e-util/e-tree-table-adapter.c | 2 +-
src/e-util/e-tree.c | 20 +++---
13 files changed, 66 insertions(+), 66 deletions(-)
---
diff --git a/src/addressbook/gui/contact-editor/eab-editor.c b/src/addressbook/gui/contact-editor/eab-editor.c
index c1ed5b0..2de6ccf 100644
--- a/src/addressbook/gui/contact-editor/eab-editor.c
+++ b/src/addressbook/gui/contact-editor/eab-editor.c
@@ -178,7 +178,7 @@ eab_editor_class_init (EABEditorClass *class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EABEditorClass, contact_added),
NULL, NULL,
- e_marshal_NONE__POINTER_OBJECT,
+ e_marshal_VOID__POINTER_OBJECT,
G_TYPE_NONE, 2,
G_TYPE_POINTER,
G_TYPE_OBJECT);
@@ -189,7 +189,7 @@ eab_editor_class_init (EABEditorClass *class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EABEditorClass, contact_modified),
NULL, NULL,
- e_marshal_NONE__POINTER_OBJECT,
+ e_marshal_VOID__POINTER_OBJECT,
G_TYPE_NONE, 2,
G_TYPE_POINTER,
G_TYPE_OBJECT);
@@ -200,7 +200,7 @@ eab_editor_class_init (EABEditorClass *class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EABEditorClass, contact_deleted),
NULL, NULL,
- e_marshal_NONE__POINTER_OBJECT,
+ e_marshal_VOID__POINTER_OBJECT,
G_TYPE_NONE, 2,
G_TYPE_POINTER,
G_TYPE_OBJECT);
diff --git a/src/addressbook/gui/widgets/e-addressbook-model.c
b/src/addressbook/gui/widgets/e-addressbook-model.c
index 9eb38fe..0e3d93c 100644
--- a/src/addressbook/gui/widgets/e-addressbook-model.c
+++ b/src/addressbook/gui/widgets/e-addressbook-model.c
@@ -719,7 +719,7 @@ e_addressbook_model_class_init (EAddressbookModelClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EAddressbookModelClass, contact_added),
NULL, NULL,
- e_marshal_NONE__INT_INT,
+ e_marshal_VOID__INT_INT,
G_TYPE_NONE, 2,
G_TYPE_INT,
G_TYPE_INT);
diff --git a/src/e-util/e-marshal.list b/src/e-util/e-marshal.list
index 9b20cef..b56b42f 100644
--- a/src/e-util/e-marshal.list
+++ b/src/e-util/e-marshal.list
@@ -5,7 +5,7 @@ BOOLEAN:INT,BOXED
BOOLEAN:INT,INT,OBJECT,INT,INT,UINT
BOOLEAN:INT,POINTER,INT,BOXED
BOOLEAN:INT,POINTER,INT,OBJECT,INT,INT,UINT
-BOOLEAN:NONE
+BOOLEAN:VOID
BOOLEAN:OBJECT
BOOLEAN:OBJECT,OBJECT
BOOLEAN:OBJECT,DOUBLE,DOUBLE,BOOLEAN
@@ -19,36 +19,36 @@ DOUBLE:OBJECT,DOUBLE,DOUBLE,BOOLEAN
INT:INT
INT:OBJECT,BOXED
INT:POINTER
-NONE:BOXED,INT
-NONE:ENUM,OBJECT,OBJECT
-NONE:INT,INT
-NONE:INT,INT,BOXED
-NONE:INT,INT,OBJECT
-NONE:INT,INT,OBJECT,BOXED,UINT,UINT
-NONE:INT,INT,OBJECT,INT,INT,BOXED,UINT,UINT
-NONE:INT,INT,OBJECT,UINT
-NONE:INT,OBJECT
-NONE:INT,POINTER
-NONE:INT,POINTER,INT,BOXED
-NONE:INT,POINTER,INT,OBJECT
-NONE:INT,POINTER,INT,OBJECT,BOXED,UINT,UINT
-NONE:INT,POINTER,INT,OBJECT,INT,INT,BOXED,UINT,UINT
-NONE:INT,POINTER,INT,OBJECT,UINT
-NONE:INT64,INT64
-NONE:OBJECT,BOOLEAN
-NONE:OBJECT,INT
-NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN
-NONE:OBJECT,OBJECT
-NONE:OBJECT,STRING
-NONE:OBJECT,STRING,UINT
-NONE:POINTER,INT
-NONE:POINTER,INT,INT,INT,INT
-NONE:POINTER,INT,OBJECT
-NONE:POINTER,OBJECT
-NONE:POINTER,POINTER
-NONE:POINTER,POINTER,INT
-NONE:STRING,DOUBLE
-NONE:STRING,INT
-NONE:STRING,INT,INT
-NONE:STRING,OBJECT
-NONE:STRING,POINTER,POINTER
+VOID:BOXED,INT
+VOID:ENUM,OBJECT,OBJECT
+VOID:INT,INT
+VOID:INT,INT,BOXED
+VOID:INT,INT,OBJECT
+VOID:INT,INT,OBJECT,BOXED,UINT,UINT
+VOID:INT,INT,OBJECT,INT,INT,BOXED,UINT,UINT
+VOID:INT,INT,OBJECT,UINT
+VOID:INT,OBJECT
+VOID:INT,POINTER
+VOID:INT,POINTER,INT,BOXED
+VOID:INT,POINTER,INT,OBJECT
+VOID:INT,POINTER,INT,OBJECT,BOXED,UINT,UINT
+VOID:INT,POINTER,INT,OBJECT,INT,INT,BOXED,UINT,UINT
+VOID:INT,POINTER,INT,OBJECT,UINT
+VOID:INT64,INT64
+VOID:OBJECT,BOOLEAN
+VOID:OBJECT,INT
+VOID:OBJECT,DOUBLE,DOUBLE,BOOLEAN
+VOID:OBJECT,OBJECT
+VOID:OBJECT,STRING
+VOID:OBJECT,STRING,UINT
+VOID:POINTER,INT
+VOID:POINTER,INT,INT,INT,INT
+VOID:POINTER,INT,OBJECT
+VOID:POINTER,OBJECT
+VOID:POINTER,POINTER
+VOID:POINTER,POINTER,INT
+VOID:STRING,DOUBLE
+VOID:STRING,INT
+VOID:STRING,INT,INT
+VOID:STRING,OBJECT
+VOID:STRING,POINTER,POINTER
diff --git a/src/e-util/e-printable.c b/src/e-util/e-printable.c
index 325e994..644f491 100644
--- a/src/e-util/e-printable.c
+++ b/src/e-util/e-printable.c
@@ -56,7 +56,7 @@ e_printable_class_init (EPrintableClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EPrintableClass, print_page),
NULL, NULL,
- e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOLEAN,
+ e_marshal_VOID__OBJECT_DOUBLE_DOUBLE_BOOLEAN,
G_TYPE_NONE, 4,
G_TYPE_OBJECT,
G_TYPE_DOUBLE,
@@ -69,7 +69,7 @@ e_printable_class_init (EPrintableClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EPrintableClass, data_left),
NULL, NULL,
- e_marshal_BOOLEAN__NONE,
+ e_marshal_BOOLEAN__VOID,
G_TYPE_BOOLEAN, 0,
G_TYPE_NONE);
diff --git a/src/e-util/e-reflow-model.c b/src/e-util/e-reflow-model.c
index bce9e40..abffdd4 100644
--- a/src/e-util/e-reflow-model.c
+++ b/src/e-util/e-reflow-model.c
@@ -248,7 +248,7 @@ e_reflow_model_class_init (EReflowModelClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EReflowModelClass, model_items_inserted),
NULL, NULL,
- e_marshal_NONE__INT_INT,
+ e_marshal_VOID__INT_INT,
G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
signals[MODEL_ITEM_CHANGED] = g_signal_new (
diff --git a/src/e-util/e-selection-model.c b/src/e-util/e-selection-model.c
index 99e8d29..6a39b8a 100644
--- a/src/e-util/e-selection-model.c
+++ b/src/e-util/e-selection-model.c
@@ -152,7 +152,7 @@ e_selection_model_class_init (ESelectionModelClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ESelectionModelClass, cursor_changed),
NULL, NULL,
- e_marshal_NONE__INT_INT,
+ e_marshal_VOID__INT_INT,
G_TYPE_NONE, 2,
G_TYPE_INT,
G_TYPE_INT);
@@ -163,7 +163,7 @@ e_selection_model_class_init (ESelectionModelClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ESelectionModelClass, cursor_activated),
NULL, NULL,
- e_marshal_NONE__INT_INT,
+ e_marshal_VOID__INT_INT,
G_TYPE_NONE, 2,
G_TYPE_INT,
G_TYPE_INT);
diff --git a/src/e-util/e-table-group.c b/src/e-util/e-table-group.c
index d41d82e..e95c5d5 100644
--- a/src/e-util/e-table-group.c
+++ b/src/e-util/e-table-group.c
@@ -722,7 +722,7 @@ e_table_group_class_init (ETableGroupClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETableGroupClass, double_click),
NULL, NULL,
- e_marshal_NONE__INT_INT_BOXED,
+ e_marshal_VOID__INT_INT_BOXED,
G_TYPE_NONE, 3,
G_TYPE_INT,
G_TYPE_INT,
diff --git a/src/e-util/e-table-item.c b/src/e-util/e-table-item.c
index a28829a..61b2dd6 100644
--- a/src/e-util/e-table-item.c
+++ b/src/e-util/e-table-item.c
@@ -3324,7 +3324,7 @@ e_table_item_class_init (ETableItemClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETableItemClass, double_click),
NULL, NULL,
- e_marshal_NONE__INT_INT_BOXED,
+ e_marshal_VOID__INT_INT_BOXED,
G_TYPE_NONE, 3,
G_TYPE_INT,
G_TYPE_INT,
diff --git a/src/e-util/e-table.c b/src/e-util/e-table.c
index 3cf7ab4..98c8dec 100644
--- a/src/e-util/e-table.c
+++ b/src/e-util/e-table.c
@@ -3264,7 +3264,7 @@ e_table_class_init (ETableClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETableClass, double_click),
NULL, NULL,
- e_marshal_NONE__INT_INT_BOXED,
+ e_marshal_VOID__INT_INT_BOXED,
G_TYPE_NONE, 3,
G_TYPE_INT,
G_TYPE_INT,
@@ -3343,7 +3343,7 @@ e_table_class_init (ETableClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETableClass, table_drag_begin),
NULL, NULL,
- e_marshal_NONE__INT_INT_OBJECT,
+ e_marshal_VOID__INT_INT_OBJECT,
G_TYPE_NONE, 3,
G_TYPE_INT,
G_TYPE_INT,
@@ -3355,7 +3355,7 @@ e_table_class_init (ETableClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETableClass, table_drag_end),
NULL, NULL,
- e_marshal_NONE__INT_INT_OBJECT,
+ e_marshal_VOID__INT_INT_OBJECT,
G_TYPE_NONE, 3,
G_TYPE_INT,
G_TYPE_INT,
@@ -3367,7 +3367,7 @@ e_table_class_init (ETableClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETableClass, table_drag_data_get),
NULL, NULL,
- e_marshal_NONE__INT_INT_OBJECT_BOXED_UINT_UINT,
+ e_marshal_VOID__INT_INT_OBJECT_BOXED_UINT_UINT,
G_TYPE_NONE, 6,
G_TYPE_INT,
G_TYPE_INT,
@@ -3382,7 +3382,7 @@ e_table_class_init (ETableClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETableClass, table_drag_data_delete),
NULL, NULL,
- e_marshal_NONE__INT_INT_OBJECT,
+ e_marshal_VOID__INT_INT_OBJECT,
G_TYPE_NONE, 3,
G_TYPE_INT,
G_TYPE_INT,
@@ -3394,7 +3394,7 @@ e_table_class_init (ETableClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETableClass, table_drag_leave),
NULL, NULL,
- e_marshal_NONE__INT_INT_OBJECT_UINT,
+ e_marshal_VOID__INT_INT_OBJECT_UINT,
G_TYPE_NONE, 4,
G_TYPE_INT,
G_TYPE_INT,
@@ -3437,7 +3437,7 @@ e_table_class_init (ETableClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETableClass, table_drag_data_received),
NULL, NULL,
- e_marshal_NONE__INT_INT_OBJECT_INT_INT_BOXED_UINT_UINT,
+ e_marshal_VOID__INT_INT_OBJECT_INT_INT_BOXED_UINT_UINT,
G_TYPE_NONE, 8,
G_TYPE_INT,
G_TYPE_INT,
diff --git a/src/e-util/e-text-model.c b/src/e-util/e-text-model.c
index a0bc2fe..2330bcd 100644
--- a/src/e-util/e-text-model.c
+++ b/src/e-util/e-text-model.c
@@ -110,7 +110,7 @@ e_text_model_class_init (ETextModelClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETextModelClass, reposition),
NULL, NULL,
- e_marshal_NONE__POINTER_POINTER,
+ e_marshal_VOID__POINTER_POINTER,
G_TYPE_NONE, 2,
G_TYPE_POINTER,
G_TYPE_POINTER);
diff --git a/src/e-util/e-text.c b/src/e-util/e-text.c
index df58522..b6159d2 100644
--- a/src/e-util/e-text.c
+++ b/src/e-util/e-text.c
@@ -2967,7 +2967,7 @@ e_text_class_init (ETextClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETextClass, keypress),
NULL, NULL,
- e_marshal_NONE__INT_INT,
+ e_marshal_VOID__INT_INT,
G_TYPE_NONE, 2,
G_TYPE_UINT,
G_TYPE_UINT);
@@ -2978,7 +2978,7 @@ e_text_class_init (ETextClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETextClass, populate_popup),
NULL, NULL,
- e_marshal_NONE__POINTER_INT_OBJECT,
+ e_marshal_VOID__POINTER_INT_OBJECT,
G_TYPE_NONE, 3,
G_TYPE_POINTER,
G_TYPE_INT,
diff --git a/src/e-util/e-tree-table-adapter.c b/src/e-util/e-tree-table-adapter.c
index 8430476..044ed42 100644
--- a/src/e-util/e-tree-table-adapter.c
+++ b/src/e-util/e-tree-table-adapter.c
@@ -1109,7 +1109,7 @@ e_tree_table_adapter_class_init (ETreeTableAdapterClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeTableAdapterClass, sorting_changed),
NULL, NULL,
- e_marshal_BOOLEAN__NONE,
+ e_marshal_BOOLEAN__VOID,
G_TYPE_BOOLEAN, 0,
G_TYPE_NONE);
}
diff --git a/src/e-util/e-tree.c b/src/e-util/e-tree.c
index 9cd4dca..da36727 100644
--- a/src/e-util/e-tree.c
+++ b/src/e-util/e-tree.c
@@ -2888,7 +2888,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_marshal_VOID__INT_POINTER,
G_TYPE_NONE, 2,
G_TYPE_INT,
G_TYPE_POINTER);
@@ -2899,7 +2899,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_marshal_VOID__INT_POINTER,
G_TYPE_NONE, 2,
G_TYPE_INT,
G_TYPE_POINTER);
@@ -2919,7 +2919,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_marshal_VOID__INT_POINTER_INT_BOXED,
G_TYPE_NONE, 4,
G_TYPE_INT,
G_TYPE_POINTER,
@@ -2971,7 +2971,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_marshal_VOID__INT_POINTER_INT_BOXED,
G_TYPE_NONE, 4,
G_TYPE_INT,
G_TYPE_POINTER,
@@ -3003,7 +3003,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_marshal_VOID__INT_POINTER_INT_BOXED,
G_TYPE_NONE, 4,
G_TYPE_INT,
G_TYPE_POINTER,
@@ -3016,7 +3016,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_marshal_VOID__INT_POINTER_INT_BOXED,
G_TYPE_NONE, 4,
G_TYPE_INT,
G_TYPE_POINTER,
@@ -3029,7 +3029,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_marshal_VOID__INT_POINTER_INT_OBJECT_BOXED_UINT_UINT,
G_TYPE_NONE, 7,
G_TYPE_INT,
G_TYPE_POINTER,
@@ -3045,7 +3045,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_marshal_VOID__INT_POINTER_INT_OBJECT,
G_TYPE_NONE, 4,
G_TYPE_INT,
G_TYPE_POINTER,
@@ -3058,7 +3058,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_marshal_VOID__INT_POINTER_INT_OBJECT_UINT,
G_TYPE_NONE, 5,
G_TYPE_INT,
G_TYPE_POINTER,
@@ -3104,7 +3104,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_marshal_VOID__INT_POINTER_INT_OBJECT_INT_INT_BOXED_UINT_UINT,
G_TYPE_NONE, 9,
G_TYPE_INT,
G_TYPE_POINTER,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
