From 6aa252e720a31303c00329192e4c49a7524061fe Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 14 Jan 2004 20:10:27 +0000 Subject: [PATCH] Don't leak name and stock_id. (#131358, Morten Welinder) Wed Jan 14 21:00:49 2004 Matthias Clasen * gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): Don't leak name and stock_id. (#131358, Morten Welinder) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkactiongroup.c | 10 ++++++---- 6 files changed, 31 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7cce348f5..aeec1c1608 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jan 14 21:00:49 2004 Matthias Clasen + + * gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): + Don't leak name and stock_id. (#131358, Morten Welinder) + Wed Jan 14 13:07:30 GMT 2004 Tony Gale * docs/faq/gtk-faq.sgml: Updates to Section 5 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c7cce348f5..aeec1c1608 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Jan 14 21:00:49 2004 Matthias Clasen + + * gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): + Don't leak name and stock_id. (#131358, Morten Welinder) + Wed Jan 14 13:07:30 GMT 2004 Tony Gale * docs/faq/gtk-faq.sgml: Updates to Section 5 diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c7cce348f5..aeec1c1608 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Wed Jan 14 21:00:49 2004 Matthias Clasen + + * gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): + Don't leak name and stock_id. (#131358, Morten Welinder) + Wed Jan 14 13:07:30 GMT 2004 Tony Gale * docs/faq/gtk-faq.sgml: Updates to Section 5 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c7cce348f5..aeec1c1608 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Wed Jan 14 21:00:49 2004 Matthias Clasen + + * gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): + Don't leak name and stock_id. (#131358, Morten Welinder) + Wed Jan 14 13:07:30 GMT 2004 Tony Gale * docs/faq/gtk-faq.sgml: Updates to Section 5 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c7cce348f5..aeec1c1608 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Jan 14 21:00:49 2004 Matthias Clasen + + * gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): + Don't leak name and stock_id. (#131358, Morten Welinder) + Wed Jan 14 13:07:30 GMT 2004 Tony Gale * docs/faq/gtk-faq.sgml: Updates to Section 5 diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c index 4c3ef728e1..8a3c2974db 100644 --- a/gtk/gtkactiongroup.c +++ b/gtk/gtkactiongroup.c @@ -562,8 +562,8 @@ gtk_action_group_add_action_with_accel (GtkActionGroup *action_group, guint accel_key = 0; GdkModifierType accel_mods; GtkStockItem stock_item; - const gchar *name; - const gchar *stock_id; + gchar *name; + gchar *stock_id; g_object_get (action, "name", &name, "stock_id", &stock_id, NULL); @@ -582,9 +582,11 @@ gtk_action_group_add_action_with_accel (GtkActionGroup *action_group, gtk_accel_map_add_entry (accel_path, accel_key, accel_mods); gtk_action_set_accel_path (action, accel_path); - g_free (accel_path); - gtk_action_group_add_action (action_group, action); + + g_free (accel_path); + g_free (stock_id); + g_free (name); } /**