From eda4f1134f86b271d8b042574df84a95937d4323 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 17 Nov 2003 22:36:27 +0000 Subject: [PATCH] Only activate if the action is sensitive. (#127187, Christian Persch) Mon Nov 17 23:36:02 2003 Matthias Clasen * gtk/gtkaction.c (gtk_action_activate): Only activate if the action is sensitive. (#127187, Christian Persch) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkaction.c | 10 +++++++--- 6 files changed, 32 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e933565a5..e1d5f74e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Nov 17 23:36:02 2003 Matthias Clasen + + * gtk/gtkaction.c (gtk_action_activate): Only activate if + the action is sensitive. (#127187, Christian Persch) + Mon Nov 17 23:23:49 2003 Matthias Clasen * gtk/gtkcombobox.c: Add mouse wheel support. (#126517) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e933565a5..e1d5f74e3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon Nov 17 23:36:02 2003 Matthias Clasen + + * gtk/gtkaction.c (gtk_action_activate): Only activate if + the action is sensitive. (#127187, Christian Persch) + Mon Nov 17 23:23:49 2003 Matthias Clasen * gtk/gtkcombobox.c: Add mouse wheel support. (#126517) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e933565a5..e1d5f74e3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Mon Nov 17 23:36:02 2003 Matthias Clasen + + * gtk/gtkaction.c (gtk_action_activate): Only activate if + the action is sensitive. (#127187, Christian Persch) + Mon Nov 17 23:23:49 2003 Matthias Clasen * gtk/gtkcombobox.c: Add mouse wheel support. (#126517) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e933565a5..e1d5f74e3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon Nov 17 23:36:02 2003 Matthias Clasen + + * gtk/gtkaction.c (gtk_action_activate): Only activate if + the action is sensitive. (#127187, Christian Persch) + Mon Nov 17 23:23:49 2003 Matthias Clasen * gtk/gtkcombobox.c: Add mouse wheel support. (#126517) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e933565a5..e1d5f74e3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon Nov 17 23:36:02 2003 Matthias Clasen + + * gtk/gtkaction.c (gtk_action_activate): Only activate if + the action is sensitive. (#127187, Christian Persch) + Mon Nov 17 23:23:49 2003 Matthias Clasen * gtk/gtkcombobox.c: Add mouse wheel support. (#126517) diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c index 28694bab2..7193312bf 100644 --- a/gtk/gtkaction.c +++ b/gtk/gtkaction.c @@ -875,8 +875,9 @@ disconnect_proxy (GtkAction *action, * gtk_action_activate: * @action: the action object * - * Emits the "activate" signal on the specified action. - * This gets called by the proxy widgets when they get activated. + * Emits the "activate" signal on the specified action, if it isn't + * insensitive. This gets called by the proxy widgets when they get + * activated. * * It can also be used to manually activate an action. * @@ -885,7 +886,10 @@ disconnect_proxy (GtkAction *action, void gtk_action_activate (GtkAction *action) { - g_signal_emit (action, action_signals[ACTIVATE], 0); + g_return_if_fail (GTK_IS_ACTION (action)); + + if (action->private_data->sensitive) + g_signal_emit (action, action_signals[ACTIVATE], 0); } /**