diff options
| author | Matthias Clasen <maclas@gmx.de> | 2003-09-22 08:54:23 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2003-09-22 08:54:23 +0000 |
| commit | cf639f41686877c0b44bc4ca34edd2f1ee98fd2e (patch) | |
| tree | 7b7cc4f6282b575c4b9012f01ba65fd34cb81aa8 /gtk/gtkactiongroup.c | |
| parent | df64ae4434a75311e490c0d648a79bb61428ac2e (diff) | |
| download | gtk+-cf639f41686877c0b44bc4ca34edd2f1ee98fd2e.tar.gz | |
Initially activate the JUSTIFY_RIGHT group member to test the fix for
2003-09-22 Matthias Clasen <maclas@gmx.de>
* tests/testmerge.c (main): Initially activate the JUSTIFY_RIGHT
group member to test the fix for #122904.
* gtk/gtkactiongroup.c (gtk_action_group_add_radio_actions_full):
Add the action to the group before activating it, otherwise we
may end up with multiple active group members. (#122904, Marco
Pesenti Gritti)
Diffstat (limited to 'gtk/gtkactiongroup.c')
| -rw-r--r-- | gtk/gtkactiongroup.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c index f09e2e4ae9..f58a44273e 100644 --- a/gtk/gtkactiongroup.c +++ b/gtk/gtkactiongroup.c @@ -597,14 +597,15 @@ gtk_action_group_add_radio_actions_full (GtkActionGroup *action_group, if (i == 0) first_action = action; - if (value == entries[i].value) - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE); - gtk_radio_action_set_group (GTK_RADIO_ACTION (action), group); group = gtk_radio_action_get_group (GTK_RADIO_ACTION (action)); + if (value == entries[i].value) + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE); + /* set the accel path for the menu item */ - accel_path = g_strconcat ("<Actions>/", action_group->private_data->name, "/", + accel_path = g_strconcat ("<Actions>/", + action_group->private_data->name, "/", entries[i].name, NULL); if (entries[i].accelerator) { |