diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-04-15 21:39:31 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-04-15 21:39:31 +0000 |
| commit | ff04fd9476f7abd907e094c005e76dfbb7da0348 (patch) | |
| tree | 4179eddbb076a36e07b22003e3c10205167d3c40 | |
| parent | 8c3d23f13b6405fc5ce32d30ad590266d8c46545 (diff) | |
| download | pango-ff04fd9476f7abd907e094c005e76dfbb7da0348.tar.gz | |
Switch around the code so that pango_font_description_set_family (desc,
Tue Apr 15 05:34:05 2003 Owen Taylor <otaylor@redhat.com>
* pango/fonts.c (pango_font_description_set_family):
Switch around the code so that
pango_font_description_set_family (desc,
pango_font_description_set_family (desc))
in the case where desc->static_family is TRUE.
(#106964, Morten Welinder)
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 9 | ||||
| -rw-r--r-- | pango/fonts.c | 10 |
6 files changed, 51 insertions, 4 deletions
@@ -1,3 +1,12 @@ +Tue Apr 15 05:34:05 2003 Owen Taylor <otaylor@redhat.com> + + * pango/fonts.c (pango_font_description_set_family): + Switch around the code so that + pango_font_description_set_family (desc, + pango_font_description_set_family (desc)) + in the case where desc->static_family is TRUE. + (#106964, Morten Welinder) + Tue Apr 15 05:13:56 2003 Owen Taylor <otaylor@redhat.com> * configure.in: Avoid complex quoting mess that diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 26f16747..1ee2aecf 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,12 @@ +Tue Apr 15 05:34:05 2003 Owen Taylor <otaylor@redhat.com> + + * pango/fonts.c (pango_font_description_set_family): + Switch around the code so that + pango_font_description_set_family (desc, + pango_font_description_set_family (desc)) + in the case where desc->static_family is TRUE. + (#106964, Morten Welinder) + Tue Apr 15 05:13:56 2003 Owen Taylor <otaylor@redhat.com> * configure.in: Avoid complex quoting mess that diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 26f16747..1ee2aecf 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,12 @@ +Tue Apr 15 05:34:05 2003 Owen Taylor <otaylor@redhat.com> + + * pango/fonts.c (pango_font_description_set_family): + Switch around the code so that + pango_font_description_set_family (desc, + pango_font_description_set_family (desc)) + in the case where desc->static_family is TRUE. + (#106964, Morten Welinder) + Tue Apr 15 05:13:56 2003 Owen Taylor <otaylor@redhat.com> * configure.in: Avoid complex quoting mess that diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 26f16747..1ee2aecf 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,12 @@ +Tue Apr 15 05:34:05 2003 Owen Taylor <otaylor@redhat.com> + + * pango/fonts.c (pango_font_description_set_family): + Switch around the code so that + pango_font_description_set_family (desc, + pango_font_description_set_family (desc)) + in the case where desc->static_family is TRUE. + (#106964, Morten Welinder) + Tue Apr 15 05:13:56 2003 Owen Taylor <otaylor@redhat.com> * configure.in: Avoid complex quoting mess that diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 26f16747..1ee2aecf 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,12 @@ +Tue Apr 15 05:34:05 2003 Owen Taylor <otaylor@redhat.com> + + * pango/fonts.c (pango_font_description_set_family): + Switch around the code so that + pango_font_description_set_family (desc, + pango_font_description_set_family (desc)) + in the case where desc->static_family is TRUE. + (#106964, Morten Welinder) + Tue Apr 15 05:13:56 2003 Owen Taylor <otaylor@redhat.com> * configure.in: Avoid complex quoting mess that diff --git a/pango/fonts.c b/pango/fonts.c index 18323596..dd34d2ca 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -95,13 +95,12 @@ void pango_font_description_set_family (PangoFontDescription *desc, const char *family) { + gchar *old_family = NULL; + g_return_if_fail (desc != NULL); - if (desc->family_name == family) - return; - if (desc->family_name && !desc->static_family) - g_free (desc->family_name); + old_family = desc->family_name; if (family) { @@ -114,6 +113,9 @@ pango_font_description_set_family (PangoFontDescription *desc, desc->family_name = NULL; desc->mask &= ~PANGO_FONT_MASK_FAMILY; } + + if (old_family) + g_free (desc->family_name); } /** |