diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 6 | ||||
| -rw-r--r-- | pango/pango-context.c | 3 |
8 files changed, 44 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Wed Jan 9 18:51:02 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (pango_context_load_font): + g_return_if_fail() if the desc's family is NULL. + (#67947, report from Darin Adler.) + Wed Jan 9 11:23:31 2002 Owen Taylor <otaylor@redhat.com> * pango/Makefile.am (s-enum-types-h): Include glib-object.h, diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index cfddaa82..a54710b5 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,9 @@ +Wed Jan 9 18:51:02 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (pango_context_load_font): + g_return_if_fail() if the desc's family is NULL. + (#67947, report from Darin Adler.) + Wed Jan 9 11:23:31 2002 Owen Taylor <otaylor@redhat.com> * pango/Makefile.am (s-enum-types-h): Include glib-object.h, diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index cfddaa82..a54710b5 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Wed Jan 9 18:51:02 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (pango_context_load_font): + g_return_if_fail() if the desc's family is NULL. + (#67947, report from Darin Adler.) + Wed Jan 9 11:23:31 2002 Owen Taylor <otaylor@redhat.com> * pango/Makefile.am (s-enum-types-h): Include glib-object.h, diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index cfddaa82..a54710b5 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,9 @@ +Wed Jan 9 18:51:02 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (pango_context_load_font): + g_return_if_fail() if the desc's family is NULL. + (#67947, report from Darin Adler.) + Wed Jan 9 11:23:31 2002 Owen Taylor <otaylor@redhat.com> * pango/Makefile.am (s-enum-types-h): Include glib-object.h, diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index cfddaa82..a54710b5 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +Wed Jan 9 18:51:02 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (pango_context_load_font): + g_return_if_fail() if the desc's family is NULL. + (#67947, report from Darin Adler.) + Wed Jan 9 11:23:31 2002 Owen Taylor <otaylor@redhat.com> * pango/Makefile.am (s-enum-types-h): Include glib-object.h, diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index cfddaa82..a54710b5 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Wed Jan 9 18:51:02 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (pango_context_load_font): + g_return_if_fail() if the desc's family is NULL. + (#67947, report from Darin Adler.) + Wed Jan 9 11:23:31 2002 Owen Taylor <otaylor@redhat.com> * pango/Makefile.am (s-enum-types-h): Include glib-object.h, diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index cfddaa82..a54710b5 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Wed Jan 9 18:51:02 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (pango_context_load_font): + g_return_if_fail() if the desc's family is NULL. + (#67947, report from Darin Adler.) + Wed Jan 9 11:23:31 2002 Owen Taylor <otaylor@redhat.com> * pango/Makefile.am (s-enum-types-h): Include glib-object.h, diff --git a/pango/pango-context.c b/pango/pango-context.c index f0f3bb97..2f5d3aa5 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -214,7 +214,8 @@ pango_context_load_font (PangoContext *context, const PangoFontDescription *desc) { g_return_val_if_fail (context != NULL, NULL); - + g_return_val_if_fail (pango_font_description_get_family (desc) != NULL, NULL); + return pango_font_map_load_font (context->font_map, context, desc); } |