diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2011-02-25 03:06:09 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2011-02-25 03:19:20 +0800 |
commit | 1a4be6c521d674c4a60e54203521e2721b81b921 (patch) | |
tree | 3260ff2bf25a454f5fe42ae8dc056b8f6a6cc45c | |
parent | fde6eab197d3e3c253d8479eb9bd1a377a426fa4 (diff) | |
download | gsoc2013-evolution-1a4be6c521d674c4a60e54203521e2721b81b921.tar.gz gsoc2013-evolution-1a4be6c521d674c4a60e54203521e2721b81b921.tar.zst gsoc2013-evolution-1a4be6c521d674c4a60e54203521e2721b81b921.zip |
Use G_SIGNAL_TYPE_STATIC_SCOPE for all GdkEvent signal params.
I thought this might be the cause of bug #643089.
Turns out it wasn't, but it's a good thing to do anyway.
-rw-r--r-- | mail/em-folder-tree.c | 17 | ||||
-rw-r--r-- | widgets/table/e-table-group.c | 30 | ||||
-rw-r--r-- | widgets/table/e-table-header-item.c | 3 | ||||
-rw-r--r-- | widgets/table/e-table-item.c | 30 | ||||
-rw-r--r-- | widgets/table/e-table.c | 33 | ||||
-rw-r--r-- | widgets/table/e-tree.c | 38 | ||||
-rw-r--r-- | widgets/text/e-reflow.c | 5 |
7 files changed, 103 insertions, 53 deletions
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 86a0bda6d6..94d5061866 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -1164,14 +1164,15 @@ folder_tree_class_init (EMFolderTreeClass *class) G_TYPE_NONE, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); - signals[HIDDEN_KEY_EVENT] = - g_signal_new ("hidden-key-event", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EMFolderTreeClass, hidden_key_event), - NULL, NULL, - g_cclosure_marshal_VOID__BOXED, - G_TYPE_NONE, 1, GDK_TYPE_EVENT); + signals[HIDDEN_KEY_EVENT] = g_signal_new ( + "hidden-key-event", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (EMFolderTreeClass, hidden_key_event), + NULL, NULL, + g_cclosure_marshal_VOID__BOXED, + G_TYPE_NONE, 1, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); } static gboolean diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c index 8f67a02ba6..0efc08dd71 100644 --- a/widgets/table/e-table-group.c +++ b/widgets/table/e-table-group.c @@ -698,8 +698,10 @@ etg_class_init (ETableGroupClass *class) G_STRUCT_OFFSET (ETableGroupClass, double_click), NULL, NULL, e_marshal_NONE__INT_INT_BOXED, - G_TYPE_NONE, 3, G_TYPE_INT, - G_TYPE_INT, GDK_TYPE_EVENT); + G_TYPE_NONE, 3, + G_TYPE_INT, + G_TYPE_INT, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); etg_signals[RIGHT_CLICK] = g_signal_new ("right_click", @@ -708,8 +710,10 @@ etg_class_init (ETableGroupClass *class) G_STRUCT_OFFSET (ETableGroupClass, right_click), g_signal_accumulator_true_handled, NULL, e_marshal_BOOLEAN__INT_INT_BOXED, - G_TYPE_BOOLEAN, 3, G_TYPE_INT, - G_TYPE_INT, GDK_TYPE_EVENT); + G_TYPE_BOOLEAN, 3, + G_TYPE_INT, + G_TYPE_INT, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); etg_signals[CLICK] = g_signal_new ("click", @@ -718,8 +722,10 @@ etg_class_init (ETableGroupClass *class) G_STRUCT_OFFSET (ETableGroupClass, click), g_signal_accumulator_true_handled, NULL, e_marshal_BOOLEAN__INT_INT_BOXED, - G_TYPE_BOOLEAN, 3, G_TYPE_INT, - G_TYPE_INT, GDK_TYPE_EVENT); + G_TYPE_BOOLEAN, 3, + G_TYPE_INT, + G_TYPE_INT, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); etg_signals[KEY_PRESS] = g_signal_new ("key_press", @@ -728,8 +734,10 @@ etg_class_init (ETableGroupClass *class) G_STRUCT_OFFSET (ETableGroupClass, key_press), g_signal_accumulator_true_handled, NULL, e_marshal_BOOLEAN__INT_INT_BOXED, - G_TYPE_BOOLEAN, 3, G_TYPE_INT, - G_TYPE_INT, GDK_TYPE_EVENT); + G_TYPE_BOOLEAN, 3, + G_TYPE_INT, + G_TYPE_INT, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); etg_signals[START_DRAG] = g_signal_new ("start_drag", @@ -738,8 +746,10 @@ etg_class_init (ETableGroupClass *class) G_STRUCT_OFFSET (ETableGroupClass, start_drag), g_signal_accumulator_true_handled, NULL, e_marshal_BOOLEAN__INT_INT_BOXED, - G_TYPE_BOOLEAN, 3, G_TYPE_INT, - G_TYPE_INT, GDK_TYPE_EVENT); + G_TYPE_BOOLEAN, 3, + G_TYPE_INT, + G_TYPE_INT, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); } static void diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 897bae1948..2bbd5c83d2 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -2025,7 +2025,8 @@ ethi_class_init (ETableHeaderItemClass *class) G_STRUCT_OFFSET (ETableHeaderItemClass, button_pressed), NULL, NULL, g_cclosure_marshal_VOID__BOXED, - G_TYPE_NONE, 1, GDK_TYPE_EVENT); + G_TYPE_NONE, 1, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); } static void diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 2276bb58c8..746e4c41b4 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -2918,8 +2918,10 @@ eti_class_init (ETableItemClass *class) G_STRUCT_OFFSET (ETableItemClass, double_click), NULL, NULL, e_marshal_NONE__INT_INT_BOXED, - G_TYPE_NONE, 3, G_TYPE_INT, - G_TYPE_INT, GDK_TYPE_EVENT); + G_TYPE_NONE, 3, + G_TYPE_INT, + G_TYPE_INT, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); eti_signals[START_DRAG] = g_signal_new ("start_drag", @@ -2928,8 +2930,10 @@ eti_class_init (ETableItemClass *class) G_STRUCT_OFFSET (ETableItemClass, start_drag), g_signal_accumulator_true_handled, NULL, e_marshal_BOOLEAN__INT_INT_BOXED, - G_TYPE_BOOLEAN, 3, G_TYPE_INT, - G_TYPE_INT, GDK_TYPE_EVENT); + G_TYPE_BOOLEAN, 3, + G_TYPE_INT, + G_TYPE_INT, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); eti_signals[RIGHT_CLICK] = g_signal_new ("right_click", @@ -2938,8 +2942,10 @@ eti_class_init (ETableItemClass *class) G_STRUCT_OFFSET (ETableItemClass, right_click), g_signal_accumulator_true_handled, NULL, e_marshal_BOOLEAN__INT_INT_BOXED, - G_TYPE_BOOLEAN, 3, G_TYPE_INT, - G_TYPE_INT, GDK_TYPE_EVENT); + G_TYPE_BOOLEAN, 3, + G_TYPE_INT, + G_TYPE_INT, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); eti_signals[CLICK] = g_signal_new ("click", @@ -2948,8 +2954,10 @@ eti_class_init (ETableItemClass *class) G_STRUCT_OFFSET (ETableItemClass, click), g_signal_accumulator_true_handled, NULL, e_marshal_BOOLEAN__INT_INT_BOXED, - G_TYPE_BOOLEAN, 3, G_TYPE_INT, - G_TYPE_INT, GDK_TYPE_EVENT); + G_TYPE_BOOLEAN, 3, + G_TYPE_INT, + G_TYPE_INT, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); eti_signals[KEY_PRESS] = g_signal_new ("key_press", @@ -2958,8 +2966,10 @@ eti_class_init (ETableItemClass *class) G_STRUCT_OFFSET (ETableItemClass, key_press), g_signal_accumulator_true_handled, NULL, e_marshal_BOOLEAN__INT_INT_BOXED, - G_TYPE_BOOLEAN, 3, G_TYPE_INT, - G_TYPE_INT, GDK_TYPE_EVENT); + G_TYPE_BOOLEAN, 3, + G_TYPE_INT, + G_TYPE_INT, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); eti_signals[STYLE_SET] = g_signal_new ("style_set", diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index c7e955efba..70b973c5b3 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -3329,8 +3329,10 @@ e_table_class_init (ETableClass *class) G_STRUCT_OFFSET (ETableClass, double_click), NULL, NULL, e_marshal_NONE__INT_INT_BOXED, - G_TYPE_NONE, 3, G_TYPE_INT, - G_TYPE_INT, GDK_TYPE_EVENT); + G_TYPE_NONE, 3, + G_TYPE_INT, + G_TYPE_INT, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); et_signals[RIGHT_CLICK] = g_signal_new ("right_click", @@ -3339,8 +3341,10 @@ e_table_class_init (ETableClass *class) G_STRUCT_OFFSET (ETableClass, right_click), g_signal_accumulator_true_handled, NULL, e_marshal_BOOLEAN__INT_INT_BOXED, - G_TYPE_BOOLEAN, 3, G_TYPE_INT, - G_TYPE_INT, GDK_TYPE_EVENT); + G_TYPE_BOOLEAN, 3, + G_TYPE_INT, + G_TYPE_INT, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); et_signals[CLICK] = g_signal_new ("click", @@ -3349,8 +3353,10 @@ e_table_class_init (ETableClass *class) G_STRUCT_OFFSET (ETableClass, click), g_signal_accumulator_true_handled, NULL, e_marshal_BOOLEAN__INT_INT_BOXED, - G_TYPE_BOOLEAN, 3, G_TYPE_INT, - G_TYPE_INT, GDK_TYPE_EVENT); + G_TYPE_BOOLEAN, 3, + G_TYPE_INT, + G_TYPE_INT, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); et_signals[KEY_PRESS] = g_signal_new ("key_press", @@ -3359,8 +3365,10 @@ e_table_class_init (ETableClass *class) G_STRUCT_OFFSET (ETableClass, key_press), g_signal_accumulator_true_handled, NULL, e_marshal_BOOLEAN__INT_INT_BOXED, - G_TYPE_BOOLEAN, 3, G_TYPE_INT, - G_TYPE_INT, GDK_TYPE_EVENT); + G_TYPE_BOOLEAN, 3, + G_TYPE_INT, + G_TYPE_INT, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); et_signals[START_DRAG] = g_signal_new ("start_drag", @@ -3369,8 +3377,10 @@ e_table_class_init (ETableClass *class) G_STRUCT_OFFSET (ETableClass, start_drag), g_signal_accumulator_true_handled, NULL, e_marshal_BOOLEAN__INT_INT_BOXED, - G_TYPE_BOOLEAN, 3, G_TYPE_INT, - G_TYPE_INT, GDK_TYPE_EVENT); + G_TYPE_BOOLEAN, 3, + G_TYPE_INT, + G_TYPE_INT, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); et_signals[STATE_CHANGE] = g_signal_new ("state_change", @@ -3388,7 +3398,8 @@ e_table_class_init (ETableClass *class) G_STRUCT_OFFSET (ETableClass, white_space_event), g_signal_accumulator_true_handled, NULL, e_marshal_BOOLEAN__BOXED, - G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT); + G_TYPE_BOOLEAN, 1, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); et_signals[TABLE_DRAG_BEGIN] = g_signal_new ("table_drag_begin", diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index b77bda8ef7..fd5340dcad 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -3323,8 +3323,11 @@ e_tree_class_init (ETreeClass *class) G_STRUCT_OFFSET (ETreeClass, double_click), NULL, NULL, e_marshal_NONE__INT_POINTER_INT_BOXED, - G_TYPE_NONE, 4, G_TYPE_INT, - G_TYPE_POINTER, G_TYPE_INT, GDK_TYPE_EVENT); + G_TYPE_NONE, 4, + G_TYPE_INT, + G_TYPE_POINTER, + G_TYPE_INT, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); et_signals[RIGHT_CLICK] = g_signal_new ("right_click", @@ -3333,8 +3336,11 @@ e_tree_class_init (ETreeClass *class) G_STRUCT_OFFSET (ETreeClass, right_click), g_signal_accumulator_true_handled, NULL, e_marshal_BOOLEAN__INT_POINTER_INT_BOXED, - G_TYPE_BOOLEAN, 4, G_TYPE_INT, G_TYPE_POINTER, - G_TYPE_INT, GDK_TYPE_EVENT); + G_TYPE_BOOLEAN, 4, + G_TYPE_INT, + G_TYPE_POINTER, + G_TYPE_INT, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); et_signals[CLICK] = g_signal_new ("click", @@ -3343,8 +3349,11 @@ e_tree_class_init (ETreeClass *class) G_STRUCT_OFFSET (ETreeClass, click), g_signal_accumulator_true_handled, NULL, e_marshal_BOOLEAN__INT_POINTER_INT_BOXED, - G_TYPE_BOOLEAN, 4, G_TYPE_INT, G_TYPE_POINTER, - G_TYPE_INT, GDK_TYPE_EVENT); + G_TYPE_BOOLEAN, 4, + G_TYPE_INT, + G_TYPE_POINTER, + G_TYPE_INT, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); et_signals[KEY_PRESS] = g_signal_new ("key_press", @@ -3353,8 +3362,11 @@ e_tree_class_init (ETreeClass *class) G_STRUCT_OFFSET (ETreeClass, key_press), g_signal_accumulator_true_handled, NULL, e_marshal_BOOLEAN__INT_POINTER_INT_BOXED, - G_TYPE_BOOLEAN, 4, G_TYPE_INT, G_TYPE_POINTER, - G_TYPE_INT, GDK_TYPE_EVENT); + G_TYPE_BOOLEAN, 4, + G_TYPE_INT, + G_TYPE_POINTER, + G_TYPE_INT, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); et_signals[START_DRAG] = g_signal_new ("start_drag", @@ -3363,8 +3375,11 @@ e_tree_class_init (ETreeClass *class) G_STRUCT_OFFSET (ETreeClass, start_drag), NULL, NULL, e_marshal_NONE__INT_POINTER_INT_BOXED, - G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_POINTER, - G_TYPE_INT, GDK_TYPE_EVENT); + G_TYPE_NONE, 4, + G_TYPE_INT, + G_TYPE_POINTER, + G_TYPE_INT, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); et_signals[STATE_CHANGE] = g_signal_new ("state_change", @@ -3382,7 +3397,8 @@ e_tree_class_init (ETreeClass *class) G_STRUCT_OFFSET (ETreeClass, white_space_event), g_signal_accumulator_true_handled, NULL, e_marshal_BOOLEAN__POINTER, - G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT); + G_TYPE_BOOLEAN, 1, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); et_signals[TREE_DRAG_BEGIN] = g_signal_new ("tree_drag_begin", diff --git a/widgets/text/e-reflow.c b/widgets/text/e-reflow.c index 8adbace707..e6c5768d4e 100644 --- a/widgets/text/e-reflow.c +++ b/widgets/text/e-reflow.c @@ -1548,8 +1548,9 @@ e_reflow_class_init (EReflowClass *klass) G_STRUCT_OFFSET (EReflowClass, selection_event), NULL, NULL, e_marshal_INT__OBJECT_BOXED, - G_TYPE_INT, 2, G_TYPE_OBJECT, - GDK_TYPE_EVENT); + G_TYPE_INT, 2, + G_TYPE_OBJECT, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); signals[COLUMN_WIDTH_CHANGED] = g_signal_new ("column_width_changed", |