Only activate if the action is sensitive. (#127187, Christian Persch)

Mon Nov 17 23:36:02 2003  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkaction.c (gtk_action_activate): Only activate if
	the action is sensitive.  (#127187, Christian Persch)
This commit is contained in:
Matthias Clasen 2003-11-17 22:36:27 +00:00 committed by Matthias Clasen
parent 03522ef802
commit eda4f1134f
6 changed files with 32 additions and 3 deletions

View File

@ -1,3 +1,8 @@
Mon Nov 17 23:36:02 2003 Matthias Clasen <maclas@gmx.de>
* 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 <maclas@gmx.de> Mon Nov 17 23:23:49 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c: Add mouse wheel support. (#126517) * gtk/gtkcombobox.c: Add mouse wheel support. (#126517)

View File

@ -1,3 +1,8 @@
Mon Nov 17 23:36:02 2003 Matthias Clasen <maclas@gmx.de>
* 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 <maclas@gmx.de> Mon Nov 17 23:23:49 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c: Add mouse wheel support. (#126517) * gtk/gtkcombobox.c: Add mouse wheel support. (#126517)

View File

@ -1,3 +1,8 @@
Mon Nov 17 23:36:02 2003 Matthias Clasen <maclas@gmx.de>
* 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 <maclas@gmx.de> Mon Nov 17 23:23:49 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c: Add mouse wheel support. (#126517) * gtk/gtkcombobox.c: Add mouse wheel support. (#126517)

View File

@ -1,3 +1,8 @@
Mon Nov 17 23:36:02 2003 Matthias Clasen <maclas@gmx.de>
* 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 <maclas@gmx.de> Mon Nov 17 23:23:49 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c: Add mouse wheel support. (#126517) * gtk/gtkcombobox.c: Add mouse wheel support. (#126517)

View File

@ -1,3 +1,8 @@
Mon Nov 17 23:36:02 2003 Matthias Clasen <maclas@gmx.de>
* 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 <maclas@gmx.de> Mon Nov 17 23:23:49 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c: Add mouse wheel support. (#126517) * gtk/gtkcombobox.c: Add mouse wheel support. (#126517)

View File

@ -875,8 +875,9 @@ disconnect_proxy (GtkAction *action,
* gtk_action_activate: * gtk_action_activate:
* @action: the action object * @action: the action object
* *
* Emits the "activate" signal on the specified action. * Emits the "activate" signal on the specified action, if it isn't
* This gets called by the proxy widgets when they get activated. * insensitive. This gets called by the proxy widgets when they get
* activated.
* *
* It can also be used to manually activate an action. * It can also be used to manually activate an action.
* *
@ -885,7 +886,10 @@ disconnect_proxy (GtkAction *action,
void void
gtk_action_activate (GtkAction *action) 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);
} }
/** /**