diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-1-6 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-1-8 | 6 | ||||
-rw-r--r-- | pango/pango-context.c | 6 |
5 files changed, 27 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Mon Jun 21 11:38:22 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (pango_context_set_font_map): + Handle setting the same object back. (#143523, + Morten Welinder) + Mon Jun 21 11:35:29 2004 Owen Taylor <otaylor@redhat.com> * pango/pangoft2-fontmap.c (pango_ft2_font_map_new): diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index d676df71..4f911dcb 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Mon Jun 21 11:38:22 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (pango_context_set_font_map): + Handle setting the same object back. (#143523, + Morten Welinder) + Mon Jun 21 11:35:29 2004 Owen Taylor <otaylor@redhat.com> * pango/pangoft2-fontmap.c (pango_ft2_font_map_new): diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index d676df71..4f911dcb 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Mon Jun 21 11:38:22 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (pango_context_set_font_map): + Handle setting the same object back. (#143523, + Morten Welinder) + Mon Jun 21 11:35:29 2004 Owen Taylor <otaylor@redhat.com> * pango/pangoft2-fontmap.c (pango_ft2_font_map_new): diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index d676df71..4f911dcb 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Mon Jun 21 11:38:22 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (pango_context_set_font_map): + Handle setting the same object back. (#143523, + Morten Welinder) + Mon Jun 21 11:35:29 2004 Owen Taylor <otaylor@redhat.com> * pango/pangoft2-fontmap.c (pango_ft2_font_map_new): diff --git a/pango/pango-context.c b/pango/pango-context.c index 9ebde1e1..ea5dd83e 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -216,12 +216,12 @@ pango_context_set_font_map (PangoContext *context, g_return_if_fail (PANGO_IS_CONTEXT (context)); g_return_if_fail (!font_map || PANGO_IS_FONT_MAP (font_map)); - if (context->font_map) - g_object_unref (context->font_map); - if (font_map) g_object_ref (font_map); + if (context->font_map) + g_object_unref (context->font_map); + context->font_map = font_map; } |