diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-06-21 15:39:46 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-06-21 15:39:46 +0000 |
| commit | 80fdebadc650f01c9c536583523c6386bac4f744 (patch) | |
| tree | 20849b54f3392ea407fd4aad1fbd49b2aa0b27f1 | |
| parent | 55701c4f54b35427d203ed937e76bcb533e1cc92 (diff) | |
| download | pango-80fdebadc650f01c9c536583523c6386bac4f744.tar.gz | |
Handle setting the same object back. (#143523, Morten Welinder)
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)
| -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 1f0694c7..d5743949 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 1f0694c7..d5743949 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 1f0694c7..d5743949 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 316245dd..6178529a 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -167,12 +167,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; } |