From 3d2ba1dd99788c556c9d24ca0a310dd896266e01 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 21 Jun 2004 15:39:39 +0000 Subject: Handle setting the same object back. (#143523, Morten Welinder) Mon Jun 21 11:38:22 2004 Owen Taylor * pango/pango-context.c (pango_context_set_font_map): Handle setting the same object back. (#143523, Morten Welinder) --- ChangeLog | 6 ++++++ ChangeLog.pre-1-10 | 6 ++++++ ChangeLog.pre-1-6 | 6 ++++++ ChangeLog.pre-1-8 | 6 ++++++ pango/pango-context.c | 6 +++--- 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d676df71..4f911dcb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jun 21 11:38:22 2004 Owen Taylor + + * 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 * 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 + + * 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 * 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 + + * 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 * 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 + + * 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 * 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; } -- cgit v1.2.1