Fix problem where we unref'ed before we ref'ed resulting in entries in the

Sun Feb 24 12:12:09 2002  Owen Taylor  <otaylor@redhat.com>

        * pango/pangoxft-fontmap.c (pango_xft_font_map_new_font):
        Fix problem where we unref'ed before we ref'ed resulting
        in entries in the cache that shouldn't have been there.

        * pango/pangoft2-fontmap.c (pango_ft2_font_map_new_font):
        Same.

9 files changed, 73 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index cd7b10f2..8c8a9d5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sun Feb 24 12:12:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangoxft-fontmap.c (pango_xft_font_map_new_font): 
+	Fix problem where we unref'ed before we ref'ed resulting
+	in entries in the cache that shouldn't have been there.
+
+	* pango/pangoft2-fontmap.c (pango_ft2_font_map_new_font): 
+	Same.
+
 Sat Feb 23 21:40:27 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Version 0.26
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index cd7b10f2..8c8a9d5b 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,12 @@
+Sun Feb 24 12:12:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangoxft-fontmap.c (pango_xft_font_map_new_font): 
+	Fix problem where we unref'ed before we ref'ed resulting
+	in entries in the cache that shouldn't have been there.
+
+	* pango/pangoft2-fontmap.c (pango_ft2_font_map_new_font): 
+	Same.
+
 Sat Feb 23 21:40:27 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Version 0.26
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index cd7b10f2..8c8a9d5b 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,12 @@
+Sun Feb 24 12:12:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangoxft-fontmap.c (pango_xft_font_map_new_font): 
+	Fix problem where we unref'ed before we ref'ed resulting
+	in entries in the cache that shouldn't have been there.
+
+	* pango/pangoft2-fontmap.c (pango_ft2_font_map_new_font): 
+	Same.
+
 Sat Feb 23 21:40:27 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Version 0.26
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index cd7b10f2..8c8a9d5b 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,12 @@
+Sun Feb 24 12:12:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangoxft-fontmap.c (pango_xft_font_map_new_font): 
+	Fix problem where we unref'ed before we ref'ed resulting
+	in entries in the cache that shouldn't have been there.
+
+	* pango/pangoft2-fontmap.c (pango_ft2_font_map_new_font): 
+	Same.
+
 Sat Feb 23 21:40:27 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Version 0.26
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index cd7b10f2..8c8a9d5b 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,12 @@
+Sun Feb 24 12:12:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangoxft-fontmap.c (pango_xft_font_map_new_font): 
+	Fix problem where we unref'ed before we ref'ed resulting
+	in entries in the cache that shouldn't have been there.
+
+	* pango/pangoft2-fontmap.c (pango_ft2_font_map_new_font): 
+	Same.
+
 Sat Feb 23 21:40:27 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Version 0.26
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index cd7b10f2..8c8a9d5b 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,12 @@
+Sun Feb 24 12:12:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangoxft-fontmap.c (pango_xft_font_map_new_font): 
+	Fix problem where we unref'ed before we ref'ed resulting
+	in entries in the cache that shouldn't have been there.
+
+	* pango/pangoft2-fontmap.c (pango_ft2_font_map_new_font): 
+	Same.
+
 Sat Feb 23 21:40:27 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Version 0.26
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index cd7b10f2..8c8a9d5b 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,12 @@
+Sun Feb 24 12:12:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangoxft-fontmap.c (pango_xft_font_map_new_font): 
+	Fix problem where we unref'ed before we ref'ed resulting
+	in entries in the cache that shouldn't have been there.
+
+	* pango/pangoft2-fontmap.c (pango_ft2_font_map_new_font): 
+	Same.
+
 Sat Feb 23 21:40:27 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Version 0.26
diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c
index de47afcb..c0077f1e 100644
--- a/pango/pangoft2-fontmap.c
+++ b/pango/pangoft2-fontmap.c
@@ -499,11 +499,13 @@ pango_ft2_font_map_new_font (PangoFontMap    *fontmap,
   
   if (font)
     {
-      /* Revive fonts from cache */
+      g_object_ref (font);
+      
+      /* Revive font from cache */
       if (font->in_cache)
 	pango_ft2_font_map_cache_remove (fontmap, font);
-      
-      return (PangoFont *)g_object_ref (G_OBJECT(font));
+	  
+      return (PangoFont *)font;
     }
   
   return  (PangoFont *)_pango_ft2_font_new (fontmap, MiniXftPatternDuplicate (match));
diff --git a/pango/pangoxft-fontmap.c b/pango/pangoxft-fontmap.c
index 45a5fbf1..62be892e 100644
--- a/pango/pangoxft-fontmap.c
+++ b/pango/pangoxft-fontmap.c
@@ -508,11 +508,13 @@ pango_xft_font_map_new_font (PangoFontMap  *fontmap,
   
   if (font)
     {
-      /* Revive fonts from cache */
+      g_object_ref (font);
+
+      /* Revive font from cache */
       if (font->in_cache)
 	pango_xft_font_map_cache_remove (fontmap, font);
-      
-      return (PangoFont *)g_object_ref (G_OBJECT(font));
+
+      return (PangoFont *)font;
     }
   
   return  (PangoFont *)_pango_xft_font_new (fontmap, XftPatternDuplicate (match));