From 9542740711c9661b47f044600dcc274711d03e82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Fri, 29 Aug 2003 19:28:44 +0000 Subject: [PATCH] Forgot to actually commit this file --- gtk/gtkactiongroup.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c index 32cb7bfa6e..235ee71493 100644 --- a/gtk/gtkactiongroup.c +++ b/gtk/gtkactiongroup.c @@ -425,7 +425,6 @@ gtk_action_group_add_radio_actions_full (GtkActionGroup *action_group, guint i; GtkTranslateFunc translate_func; gpointer translate_data; - GtkRadioAction *radio_action; g_return_if_fail (GTK_IS_ACTION_GROUP (action_group)); @@ -437,8 +436,8 @@ gtk_action_group_add_radio_actions_full (GtkActionGroup *action_group, GtkAction *action; gchar *accel_path; gchar *label; - gchar *tooltip; - + gchar *tooltip; + if (translate_func) { label = translate_func (entries[i].label, translate_data); @@ -457,19 +456,17 @@ gtk_action_group_add_radio_actions_full (GtkActionGroup *action_group, "stock_id", entries[i].stock_id, "value", entries[i].value, NULL); - + if (i == 0) { - radio_action = GTK_RADIO_ACTION (action); - if (on_change) - g_signal_connect_data (radio_action, "changed", + g_signal_connect_data (action, "changed", on_change, user_data, (GClosureNotify)destroy, 0); } else { - GSList *group = gtk_radio_action_get_group (radio_action); + GSList *group = gtk_radio_action_get_group (GTK_RADIO_ACTION (action)); gtk_radio_action_set_group (GTK_RADIO_ACTION (action), group); }