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)

diff --git a/ChangeLog b/ChangeLog
index fb03cd1d99add6c1763f9763ec6f8d76d857142a..935a6f64f0c6020499dcf72fb8e7b74767d01839 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fb03cd1d99add6c1763f9763ec6f8d76d857142a..935a6f64f0c6020499dcf72fb8e7b74767d01839 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fb03cd1d99add6c1763f9763ec6f8d76d857142a..935a6f64f0c6020499dcf72fb8e7b74767d01839 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fb03cd1d99add6c1763f9763ec6f8d76d857142a..935a6f64f0c6020499dcf72fb8e7b74767d01839 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fb03cd1d99add6c1763f9763ec6f8d76d857142a..935a6f64f0c6020499dcf72fb8e7b74767d01839 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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:

diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index f09e2e4ae96668b727a31e902655d5e0ec66082f..f58a44273e500196bcafaf4cf852a7c9858e5304 100644 (file)
--- 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)
        {

diff --git a/tests/testmerge.c b/tests/testmerge.c
index c79090b20d5b90f2a64bde5a1f29cc5fde996ab4..ea794ddfa7934bb8b84348863e2d5e09cf53d7f9 100644 (file)
--- a/tests/testmerge.c
+++ b/tests/testmerge.c
@@ -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;
 }