Don't leak the font description. (#132168)

Fri Jan 23 23:46:12 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkfontbutton.c (gtk_font_button_label_use_font): Don't leak the
	font description.  (#132168)

diff --git a/ChangeLog b/ChangeLog
index 891132d9176c8b942aaaf1933b28f17a0fe78ed7..1d867858a4d15ec5a7dbaa05195ffaffcd2e8bc4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 23 23:46:12 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkfontbutton.c (gtk_font_button_label_use_font): Don't leak the 
+       font description.  (#132168)
+
 2004-01-23  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #132247.
@@ -45,6 +50,7 @@ Thu Jan 22 18:45:26 2004  Owen Taylor  <otaylor@redhat.com>
 
        * NEWS: Organized, added some names.
 
+>>>>>>> 1.4833
 Thu Jan 22 16:59:36 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkliststore.c (gtk_list_store_reorder): Doc fix.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 891132d9176c8b942aaaf1933b28f17a0fe78ed7..1d867858a4d15ec5a7dbaa05195ffaffcd2e8bc4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Jan 23 23:46:12 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkfontbutton.c (gtk_font_button_label_use_font): Don't leak the 
+       font description.  (#132168)
+
 2004-01-23  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #132247.
@@ -45,6 +50,7 @@ Thu Jan 22 18:45:26 2004  Owen Taylor  <otaylor@redhat.com>
 
        * NEWS: Organized, added some names.
 
+>>>>>>> 1.4833
 Thu Jan 22 16:59:36 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkliststore.c (gtk_list_store_reorder): Doc fix.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 891132d9176c8b942aaaf1933b28f17a0fe78ed7..1d867858a4d15ec5a7dbaa05195ffaffcd2e8bc4 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Jan 23 23:46:12 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkfontbutton.c (gtk_font_button_label_use_font): Don't leak the 
+       font description.  (#132168)
+
 2004-01-23  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #132247.
@@ -45,6 +50,7 @@ Thu Jan 22 18:45:26 2004  Owen Taylor  <otaylor@redhat.com>
 
        * NEWS: Organized, added some names.
 
+>>>>>>> 1.4833
 Thu Jan 22 16:59:36 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkliststore.c (gtk_list_store_reorder): Doc fix.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 891132d9176c8b942aaaf1933b28f17a0fe78ed7..1d867858a4d15ec5a7dbaa05195ffaffcd2e8bc4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Jan 23 23:46:12 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkfontbutton.c (gtk_font_button_label_use_font): Don't leak the 
+       font description.  (#132168)
+
 2004-01-23  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #132247.
@@ -45,6 +50,7 @@ Thu Jan 22 18:45:26 2004  Owen Taylor  <otaylor@redhat.com>
 
        * NEWS: Organized, added some names.
 
+>>>>>>> 1.4833
 Thu Jan 22 16:59:36 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkliststore.c (gtk_list_store_reorder): Doc fix.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 891132d9176c8b942aaaf1933b28f17a0fe78ed7..1d867858a4d15ec5a7dbaa05195ffaffcd2e8bc4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Jan 23 23:46:12 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkfontbutton.c (gtk_font_button_label_use_font): Don't leak the 
+       font description.  (#132168)
+
 2004-01-23  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #132247.
@@ -45,6 +50,7 @@ Thu Jan 22 18:45:26 2004  Owen Taylor  <otaylor@redhat.com>
 
        * NEWS: Organized, added some names.
 
+>>>>>>> 1.4833
 Thu Jan 22 16:59:36 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkliststore.c (gtk_list_store_reorder): Doc fix.

diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 9a872a423167520d8b6cc49d3e3bf639f87a93bd..53eb5cf5a915abc8890adf99270b2328dab6bd98 100644 (file)
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -836,6 +836,8 @@ gtk_font_button_label_use_font (GtkFontButton *font_button)
     pango_font_description_unset_fields (desc, PANGO_FONT_MASK_SIZE);
 
   gtk_widget_modify_font (font_button->priv->font_label, desc);
+
+  pango_font_description_free (desc);
 }
 
 static gboolean