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)
This commit is contained in:
Matthias Clasen 2003-09-22 08:54:23 +00:00 committed by Matthias Clasen
parent df64ae4434
commit cf639f4168
7 changed files with 58 additions and 5 deletions

View File

@ -1,3 +1,13 @@
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)
2003-09-21 Matthias Clasen <maclas@gmx.de>
Changes to make cross-process merging feasible:

View File

@ -1,3 +1,13 @@
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)
2003-09-21 Matthias Clasen <maclas@gmx.de>
Changes to make cross-process merging feasible:

View File

@ -1,3 +1,13 @@
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)
2003-09-21 Matthias Clasen <maclas@gmx.de>
Changes to make cross-process merging feasible:

View File

@ -1,3 +1,13 @@
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)
2003-09-21 Matthias Clasen <maclas@gmx.de>
Changes to make cross-process merging feasible:

View File

@ -1,3 +1,13 @@
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)
2003-09-21 Matthias Clasen <maclas@gmx.de>
Changes to make cross-process merging feasible:

View File

@ -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)
{

View File

@ -462,7 +462,7 @@ main (int argc, char **argv)
NULL);
gtk_action_group_add_radio_actions (action_group,
radio_entries, n_radio_entries,
JUSTIFY_LEFT,
JUSTIFY_RIGHT,
G_CALLBACK (radio_action_changed), NULL);
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@ -556,6 +556,8 @@ main (int argc, char **argv)
gtk_widget_show_all (window);
gtk_main ();
g_object_unref (action_group);
g_object_unref (merge);
return 0;
}