From f22bb955819abf495c438fd238ff059d549b3b1b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 28 Nov 2004 05:13:00 +0000 Subject: [PATCH] Don't claim to have handled the accelerator if the action is insensitive. 2004-11-28 Matthias Clasen * gtk/gtkaction.c (closure_accel_activate): Don't claim to have handled the accelerator if the action is insensitive. (#151541, Jody Goldberg) --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gtk/gtkaction.c | 10 ++++++---- 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e310fe45a2..199d702fa3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2004-11-28 Matthias Clasen + * gtk/gtkaction.c (closure_accel_activate): Don't claim to have + handled the accelerator if the action is insensitive. (#151541, + Jody Goldberg) + * docs/tools/widgets.c: Add a combo box. 2004-11-27 Matthias Clasen diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e310fe45a2..199d702fa3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2004-11-28 Matthias Clasen + * gtk/gtkaction.c (closure_accel_activate): Don't claim to have + handled the accelerator if the action is insensitive. (#151541, + Jody Goldberg) + * docs/tools/widgets.c: Add a combo box. 2004-11-27 Matthias Clasen diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e310fe45a2..199d702fa3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,9 @@ 2004-11-28 Matthias Clasen + * gtk/gtkaction.c (closure_accel_activate): Don't claim to have + handled the accelerator if the action is insensitive. (#151541, + Jody Goldberg) + * docs/tools/widgets.c: Add a combo box. 2004-11-27 Matthias Clasen diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e310fe45a2..199d702fa3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 2004-11-28 Matthias Clasen + * gtk/gtkaction.c (closure_accel_activate): Don't claim to have + handled the accelerator if the action is insensitive. (#151541, + Jody Goldberg) + * docs/tools/widgets.c: Add a combo box. 2004-11-27 Matthias Clasen diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c index 0df7a21868..bb3c4242d3 100644 --- a/gtk/gtkaction.c +++ b/gtk/gtkaction.c @@ -1398,10 +1398,12 @@ closure_accel_activate (GClosure *closure, gpointer marshal_data) { if (gtk_action_is_sensitive (GTK_ACTION (closure->data))) - _gtk_action_emit_activate (GTK_ACTION (closure->data)); - - /* we handled the accelerator */ - g_value_set_boolean (return_value, TRUE); + { + _gtk_action_emit_activate (GTK_ACTION (closure->data)); + + /* we handled the accelerator */ + g_value_set_boolean (return_value, TRUE); + } } static void