diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 14 | ||||
| -rw-r--r-- | gtk/gtkaction.c | 8 | ||||
| -rw-r--r-- | gtk/gtkaction.h | 2 | ||||
| -rw-r--r-- | gtk/gtkradioaction.c | 2 | ||||
| -rw-r--r-- | gtk/gtktoggleaction.c | 2 |
9 files changed, 81 insertions, 3 deletions
@@ -1,3 +1,17 @@ +Fri Dec 19 01:35:34 2003 Matthias Clasen <maclas@gmx.de> + + Fix the behaviour of insensitive actions, which was broken + when gtk_action_activate() was changed to pay attention to + sensitivity (#129557, Christian Persch) + + * gtk/gtkaction.h: + * gtk/gtkaction.c (_gtk_action_emit_activate): New auxiliary + function to emit an activate signal without regard to sensitivity. + + * gtk/gtkradioaction.c: + * gtk/gtktoggleaction.c: Always use _gtk_action_emit_activate() + instead of gtk_action_activate(). + Thu Dec 18 19:13:12 2003 Kristian Rietveld <kris@gtk.org> Fixes #110249, reworked patch from Joshua N Pritikin. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4508f1ac7..c89b1614d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,17 @@ +Fri Dec 19 01:35:34 2003 Matthias Clasen <maclas@gmx.de> + + Fix the behaviour of insensitive actions, which was broken + when gtk_action_activate() was changed to pay attention to + sensitivity (#129557, Christian Persch) + + * gtk/gtkaction.h: + * gtk/gtkaction.c (_gtk_action_emit_activate): New auxiliary + function to emit an activate signal without regard to sensitivity. + + * gtk/gtkradioaction.c: + * gtk/gtktoggleaction.c: Always use _gtk_action_emit_activate() + instead of gtk_action_activate(). + Thu Dec 18 19:13:12 2003 Kristian Rietveld <kris@gtk.org> Fixes #110249, reworked patch from Joshua N Pritikin. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4508f1ac7..c89b1614d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,17 @@ +Fri Dec 19 01:35:34 2003 Matthias Clasen <maclas@gmx.de> + + Fix the behaviour of insensitive actions, which was broken + when gtk_action_activate() was changed to pay attention to + sensitivity (#129557, Christian Persch) + + * gtk/gtkaction.h: + * gtk/gtkaction.c (_gtk_action_emit_activate): New auxiliary + function to emit an activate signal without regard to sensitivity. + + * gtk/gtkradioaction.c: + * gtk/gtktoggleaction.c: Always use _gtk_action_emit_activate() + instead of gtk_action_activate(). + Thu Dec 18 19:13:12 2003 Kristian Rietveld <kris@gtk.org> Fixes #110249, reworked patch from Joshua N Pritikin. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4508f1ac7..c89b1614d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,17 @@ +Fri Dec 19 01:35:34 2003 Matthias Clasen <maclas@gmx.de> + + Fix the behaviour of insensitive actions, which was broken + when gtk_action_activate() was changed to pay attention to + sensitivity (#129557, Christian Persch) + + * gtk/gtkaction.h: + * gtk/gtkaction.c (_gtk_action_emit_activate): New auxiliary + function to emit an activate signal without regard to sensitivity. + + * gtk/gtkradioaction.c: + * gtk/gtktoggleaction.c: Always use _gtk_action_emit_activate() + instead of gtk_action_activate(). + Thu Dec 18 19:13:12 2003 Kristian Rietveld <kris@gtk.org> Fixes #110249, reworked patch from Joshua N Pritikin. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4508f1ac7..c89b1614d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,17 @@ +Fri Dec 19 01:35:34 2003 Matthias Clasen <maclas@gmx.de> + + Fix the behaviour of insensitive actions, which was broken + when gtk_action_activate() was changed to pay attention to + sensitivity (#129557, Christian Persch) + + * gtk/gtkaction.h: + * gtk/gtkaction.c (_gtk_action_emit_activate): New auxiliary + function to emit an activate signal without regard to sensitivity. + + * gtk/gtkradioaction.c: + * gtk/gtktoggleaction.c: Always use _gtk_action_emit_activate() + instead of gtk_action_activate(). + Thu Dec 18 19:13:12 2003 Kristian Rietveld <kris@gtk.org> Fixes #110249, reworked patch from Joshua N Pritikin. diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c index 7193312bf..19730370f 100644 --- a/gtk/gtkaction.c +++ b/gtk/gtkaction.c @@ -871,6 +871,12 @@ disconnect_proxy (GtkAction *action, g_signal_emit (action, action_signals[DISCONNECT_PROXY], 0, proxy); } +void +_gtk_action_emit_activate (GtkAction *action) +{ + g_signal_emit (action, action_signals[ACTIVATE], 0); +} + /** * gtk_action_activate: * @action: the action object @@ -889,7 +895,7 @@ gtk_action_activate (GtkAction *action) g_return_if_fail (GTK_IS_ACTION (action)); if (action->private_data->sensitive) - g_signal_emit (action, action_signals[ACTIVATE], 0); + _gtk_action_emit_activate (action); } /** diff --git a/gtk/gtkaction.h b/gtk/gtkaction.h index df0464e27..e855052d6 100644 --- a/gtk/gtkaction.h +++ b/gtk/gtkaction.h @@ -100,6 +100,7 @@ void gtk_action_block_activate_from (GtkAction *action, GtkWidget *proxy); void gtk_action_unblock_activate_from (GtkAction *action, GtkWidget *proxy); +void _gtk_action_emit_activate (GtkAction *action); /* protected ... for use by action groups */ void gtk_action_set_accel_path (GtkAction *action, @@ -107,6 +108,7 @@ void gtk_action_set_accel_path (GtkAction *action, void gtk_action_set_accel_group (GtkAction *action, GtkAccelGroup *accel_group); + G_END_DECLS #endif /* __GTK_ACTION_H__ */ diff --git a/gtk/gtkradioaction.c b/gtk/gtkradioaction.c index 38959da49..e6ae02742 100644 --- a/gtk/gtkradioaction.c +++ b/gtk/gtkradioaction.c @@ -276,7 +276,7 @@ gtk_radio_action_activate (GtkAction *action) if (tmp_action->private_data->active && (tmp_action != toggle_action)) { - gtk_action_activate (GTK_ACTION (tmp_action)); + _gtk_action_emit_activate (GTK_ACTION (tmp_action)); break; } } diff --git a/gtk/gtktoggleaction.c b/gtk/gtktoggleaction.c index dd58e6199..c3ac2d71f 100644 --- a/gtk/gtktoggleaction.c +++ b/gtk/gtktoggleaction.c @@ -301,7 +301,7 @@ gtk_toggle_action_set_active (GtkToggleAction *action, if (action->private_data->active != is_active) { - gtk_action_activate (GTK_ACTION (action)); + _gtk_action_emit_activate (GTK_ACTION (action)); } } |