Version 0.18PANGO_0_18

Mon Sep  3 19:37:02 2001  Owen Taylor  <otaylor@redhat.com>

        * configure.in: Version 0.18

        * NEWS: Updated.

        * pango/pangoxft-font.c (pango_xft_font_finalize): Actually
        free the XftFont (and description). Lack of such pointed out
        by David Turner.

10 files changed, 93 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 5994163e..d326ceb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Sep  3 19:37:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Version 0.18
+
+	* NEWS: Updated.
+
+	* pango/pangoxft-font.c (pango_xft_font_finalize): Actually
+	free the XftFont (and description). Lack of such pointed out
+	by David Turner.
+
 Sun Sep  2 12:08:15 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c pango/pango-utils.c: Make 
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 5994163e..d326ceb2 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,13 @@
+Mon Sep  3 19:37:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Version 0.18
+
+	* NEWS: Updated.
+
+	* pango/pangoxft-font.c (pango_xft_font_finalize): Actually
+	free the XftFont (and description). Lack of such pointed out
+	by David Turner.
+
 Sun Sep  2 12:08:15 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c pango/pango-utils.c: Make 
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 5994163e..d326ceb2 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,13 @@
+Mon Sep  3 19:37:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Version 0.18
+
+	* NEWS: Updated.
+
+	* pango/pangoxft-font.c (pango_xft_font_finalize): Actually
+	free the XftFont (and description). Lack of such pointed out
+	by David Turner.
+
 Sun Sep  2 12:08:15 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c pango/pango-utils.c: Make 
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 5994163e..d326ceb2 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,13 @@
+Mon Sep  3 19:37:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Version 0.18
+
+	* NEWS: Updated.
+
+	* pango/pangoxft-font.c (pango_xft_font_finalize): Actually
+	free the XftFont (and description). Lack of such pointed out
+	by David Turner.
+
 Sun Sep  2 12:08:15 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c pango/pango-utils.c: Make 
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 5994163e..d326ceb2 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,13 @@
+Mon Sep  3 19:37:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Version 0.18
+
+	* NEWS: Updated.
+
+	* pango/pangoxft-font.c (pango_xft_font_finalize): Actually
+	free the XftFont (and description). Lack of such pointed out
+	by David Turner.
+
 Sun Sep  2 12:08:15 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c pango/pango-utils.c: Make 
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 5994163e..d326ceb2 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,13 @@
+Mon Sep  3 19:37:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Version 0.18
+
+	* NEWS: Updated.
+
+	* pango/pangoxft-font.c (pango_xft_font_finalize): Actually
+	free the XftFont (and description). Lack of such pointed out
+	by David Turner.
+
 Sun Sep  2 12:08:15 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c pango/pango-utils.c: Make 
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 5994163e..d326ceb2 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,13 @@
+Mon Sep  3 19:37:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Version 0.18
+
+	* NEWS: Updated.
+
+	* pango/pangoxft-font.c (pango_xft_font_finalize): Actually
+	free the XftFont (and description). Lack of such pointed out
+	by David Turner.
+
 Sun Sep  2 12:08:15 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c pango/pango-utils.c: Make 
diff --git a/NEWS b/NEWS
index c36328d3..69215f9a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+Changes between 0.17 and 0.18
+
+* Add PangoLanguage type for language tags, use consistently.
+* Add support for different font orderings for different lanuages to
+  basic shaper.
+* Win32 fixes [Alex,Hans]
+* Add pango_context_get_metrics() to get metrics for a font description
+* Add GTypes for various types [James]
+* Lots of warning fixes [Darin]
+* Fix to PangoLayout for lines with only tabs on them [Matthias]
+* Improve compositing of glyphs for pangoft2 backend [Sven]
+* Export pango_color_parse().
+* Adapt to changes in GLib.
+* Build and bug fixes.
+
 Changes between 0.16 and 0.17
 
 * Build/bug fixes
diff --git a/configure.in b/configure.in
index 45bd60e5..ee451240 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to create configure.
 AC_INIT(ChangeLog)
 
 PANGO_MAJOR_VERSION=0
-PANGO_MINOR_VERSION=17
+PANGO_MINOR_VERSION=18
 
 AC_SUBST(PANGO_MAJOR_VERSION)
 AC_SUBST(PANGO_MINOR_VERSION)
diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c
index 96edd72c..5c7a656e 100644
--- a/pango/pangoxft-font.c
+++ b/pango/pangoxft-font.c
@@ -312,6 +312,9 @@ static void
 pango_xft_font_finalize (GObject *object)
 {
   PangoXftFont *xfont = (PangoXftFont *)object;
+  Display *display;
+  
+  _pango_xft_font_map_get_info (xfont->fontmap, &display, NULL);
 
   _pango_xft_font_map_remove (xfont->fontmap, xfont);
 
@@ -321,6 +324,10 @@ pango_xft_font_finalize (GObject *object)
   if (xfont->ot_info)
     g_object_unref (xfont->ot_info);
 
+  pango_font_description_free (xfont->description);
+  
+  XftFontClose (display, xfont->xft_font);
+
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }