diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2004-11-28 05:13:00 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-11-28 05:13:00 +0000 |
| commit | f22bb955819abf495c438fd238ff059d549b3b1b (patch) | |
| tree | 8952ef0433b99d9e30a73d8a639db8fecb60b6a3 | |
| parent | 5e3426947f1cda36206b823802f0b2551b7df65f (diff) | |
| download | gtk+-f22bb955819abf495c438fd238ff059d549b3b1b.tar.gz | |
Don't claim to have handled the accelerator if the action is insensitive.
2004-11-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaction.c (closure_accel_activate): Don't claim to have
handled the accelerator if the action is insensitive. (#151541,
Jody Goldberg)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 4 | ||||
| -rw-r--r-- | gtk/gtkaction.c | 10 |
5 files changed, 22 insertions, 4 deletions
@@ -1,5 +1,9 @@ 2004-11-28 Matthias Clasen <mclasen@redhat.com> + * 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 <mclasen@redhat.com> 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 <mclasen@redhat.com> + * 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 <mclasen@redhat.com> 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 <mclasen@redhat.com> + * 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 <mclasen@redhat.com> 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 <mclasen@redhat.com> + * 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 <mclasen@redhat.com> 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 |