free the style's font_description before accessing a new one.

2002-03-25  Sven Neumann  <sven@gimp.org>

	* gtk/gtkrc.c (gtk_rc_parse_font_name): free the style's
	font_description before accessing a new one.
	(gtk_rc_parse_stock): always unref the created icon_set. #76289

ChangeLog

@@ -1,3 +1,9 @@
+2002-03-25  Sven Neumann  <sven@gimp.org>
+
+	* gtk/gtkrc.c (gtk_rc_parse_font_name): free the style's
+	font_description before accessing a new one.
+	(gtk_rc_parse_stock): always unref the created icon_set. #76289
+	
 2002-03-25  Mark McLoughlin  <mark@skynet.ie>
 
 	* gtk/gtkbindings.c: (gtk_binding_entry_add_signal),

ChangeLog.pre-2-10

@@ -1,3 +1,9 @@
+2002-03-25  Sven Neumann  <sven@gimp.org>
+
+	* gtk/gtkrc.c (gtk_rc_parse_font_name): free the style's
+	font_description before accessing a new one.
+	(gtk_rc_parse_stock): always unref the created icon_set. #76289
+	
 2002-03-25  Mark McLoughlin  <mark@skynet.ie>
 
 	* gtk/gtkbindings.c: (gtk_binding_entry_add_signal),

ChangeLog.pre-2-2

@@ -1,3 +1,9 @@
+2002-03-25  Sven Neumann  <sven@gimp.org>
+
+	* gtk/gtkrc.c (gtk_rc_parse_font_name): free the style's
+	font_description before accessing a new one.
+	(gtk_rc_parse_stock): always unref the created icon_set. #76289
+	
 2002-03-25  Mark McLoughlin  <mark@skynet.ie>
 
 	* gtk/gtkbindings.c: (gtk_binding_entry_add_signal),

ChangeLog.pre-2-4

@@ -1,3 +1,9 @@
+2002-03-25  Sven Neumann  <sven@gimp.org>
+
+	* gtk/gtkrc.c (gtk_rc_parse_font_name): free the style's
+	font_description before accessing a new one.
+	(gtk_rc_parse_stock): always unref the created icon_set. #76289
+	
 2002-03-25  Mark McLoughlin  <mark@skynet.ie>
 
 	* gtk/gtkbindings.c: (gtk_binding_entry_add_signal),

ChangeLog.pre-2-6

@@ -1,3 +1,9 @@
+2002-03-25  Sven Neumann  <sven@gimp.org>
+
+	* gtk/gtkrc.c (gtk_rc_parse_font_name): free the style's
+	font_description before accessing a new one.
+	(gtk_rc_parse_stock): always unref the created icon_set. #76289
+	
 2002-03-25  Mark McLoughlin  <mark@skynet.ie>
 
 	* gtk/gtkbindings.c: (gtk_binding_entry_add_signal),

ChangeLog.pre-2-8

@@ -1,3 +1,9 @@
+2002-03-25  Sven Neumann  <sven@gimp.org>
+
+	* gtk/gtkrc.c (gtk_rc_parse_font_name): free the style's
+	font_description before accessing a new one.
+	(gtk_rc_parse_stock): always unref the created icon_set. #76289
+	
 2002-03-25  Mark McLoughlin  <mark@skynet.ie>
 
 	* gtk/gtkbindings.c: (gtk_binding_entry_add_signal),

gtk/gtkrc.c

@@ -2998,7 +2998,11 @@ gtk_rc_parse_font_name (GScanner   *scanner,
   if (token != G_TOKEN_STRING)
     return G_TOKEN_STRING;
 
-  rc_style->font_desc = pango_font_description_from_string (scanner->value.v_string);
+  if (rc_style->font_desc)
+    pango_font_description_free (rc_style->font_desc);
+
+  rc_style->font_desc = 
+    pango_font_description_from_string (scanner->value.v_string);
   
   return G_TOKEN_NONE;
 }
@@ -3752,11 +3756,12 @@ gtk_rc_parse_stock (GtkRcContext   *context,
         }
     }
 
-  if (icon_set && icon_set_valid)
+  if (icon_set)
     {
-      gtk_icon_factory_add (factory,
+      if (icon_set_valid)
-                            stock_id,
+        gtk_icon_factory_add (factory,
-                            icon_set);
+                              stock_id,
+                              icon_set);
 
       gtk_icon_set_unref (icon_set);
     }