Don't leak name and stock_id. (#131358, Morten Welinder)

Wed Jan 14 21:00:49 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel):
	Don't leak name and stock_id.  (#131358, Morten Welinder)

diff --git a/ChangeLog b/ChangeLog
index c7cce348f5ce60d11f314be007b6bf0fbab3808f..aeec1c1608b0ab4a0fb762a428732db588a8dfd0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 14 21:00:49 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * 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 <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Updates to Section 5

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c7cce348f5ce60d11f314be007b6bf0fbab3808f..aeec1c1608b0ab4a0fb762a428732db588a8dfd0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Jan 14 21:00:49 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * 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 <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Updates to Section 5

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c7cce348f5ce60d11f314be007b6bf0fbab3808f..aeec1c1608b0ab4a0fb762a428732db588a8dfd0 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Wed Jan 14 21:00:49 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * 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 <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Updates to Section 5

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c7cce348f5ce60d11f314be007b6bf0fbab3808f..aeec1c1608b0ab4a0fb762a428732db588a8dfd0 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Jan 14 21:00:49 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * 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 <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Updates to Section 5

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c7cce348f5ce60d11f314be007b6bf0fbab3808f..aeec1c1608b0ab4a0fb762a428732db588a8dfd0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Jan 14 21:00:49 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * 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 <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Updates to Section 5

diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index 4c3ef728e197d5fb0ef1107231ad9b1a5362fe23..8a3c2974dbfcf862d5a6b005a968bc39ef488fba 100644 (file)
--- 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);
 }
 
 /**