diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-02-19 00:48:37 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-02-19 00:48:37 +0800 |
| commit | 29a48cb2cee59ddb42c6afb7f87a01e6a37a9895 (patch) | |
| tree | 123d5303c58995f8be0a7da273780eac29b3b3f5 /widgets/table/e-table-item.c | |
| parent | e9dc381d3ace3404d0eafe94eb6da3b9a843abb8 (diff) | |
| download | gsoc2013-evolution-29a48cb2cee59ddb42c6afb7f87a01e6a37a9895.tar gsoc2013-evolution-29a48cb2cee59ddb42c6afb7f87a01e6a37a9895.tar.gz gsoc2013-evolution-29a48cb2cee59ddb42c6afb7f87a01e6a37a9895.tar.bz2 gsoc2013-evolution-29a48cb2cee59ddb42c6afb7f87a01e6a37a9895.tar.lz gsoc2013-evolution-29a48cb2cee59ddb42c6afb7f87a01e6a37a9895.tar.xz gsoc2013-evolution-29a48cb2cee59ddb42c6afb7f87a01e6a37a9895.tar.zst gsoc2013-evolution-29a48cb2cee59ddb42c6afb7f87a01e6a37a9895.zip | |
Fix ETable/ETree signal signatures.
To avoid another case like bug #587014, add GSignalAccumulator functions
to all ETable and ETree signals that return a flag to indicate the signal
has been handled.
See commit e9dc381d3ace3404d0eafe94eb6da3b9a843abb8 for an example of
the kind of problems not having a GSignalAccumulator can cause.
Signals changed:
ETree::click
ETree::right-click
ETree::white-space-event
ETable::click
ETable::key-press
ETable::right-click
ETable::start-drag
ETable::white-space-event
ETableItem::click
ETableItem::right-click
ETableItem::start-drag
ETableGroup::click
ETableGroup::key-press
ETableGroup::right-click
ETableGroup::start-drag
Diffstat (limited to 'widgets/table/e-table-item.c')
| -rw-r--r-- | widgets/table/e-table-item.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 8fa9e2ad4e..06e847f40e 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -2154,7 +2154,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) { ETableItem *eti = E_TABLE_ITEM (item); ECellView *ecell_view; - gint return_val = TRUE; + gboolean return_val = TRUE; #if d(!)0 gboolean leave = FALSE; #endif @@ -2430,7 +2430,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) if (eti->maybe_in_drag) { if (abs (e->motion.x - eti->drag_x) >= 3 || abs (e->motion.y - eti->drag_y) >= 3) { - gint drag_handled; + gboolean drag_handled; eti->maybe_in_drag = 0; g_signal_emit (eti, eti_signals [START_DRAG], 0, @@ -2934,9 +2934,9 @@ eti_class_init (ETableItemClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableItemClass, start_drag), - NULL, NULL, - e_marshal_INT__INT_INT_BOXED, - G_TYPE_INT, 3, G_TYPE_INT, + 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); eti_signals [RIGHT_CLICK] = @@ -2944,9 +2944,9 @@ eti_class_init (ETableItemClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableItemClass, right_click), - NULL, NULL, - e_marshal_INT__INT_INT_BOXED, - G_TYPE_INT, 3, G_TYPE_INT, + 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); eti_signals [CLICK] = @@ -2954,9 +2954,9 @@ eti_class_init (ETableItemClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableItemClass, click), - NULL, NULL, - e_marshal_INT__INT_INT_BOXED, - G_TYPE_INT, 3, G_TYPE_INT, + 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); eti_signals [KEY_PRESS] = |