pango/pango-fontmap.c (pango_font_map_load_fontset) return_val_if_fail()

Wed Dec 26 11:52:28 2001  Owen Taylor  <otaylor@redhat.com>

        * pango/pango-fontmap.c (pango_font_map_load_fontset)
        * pango/pango-context.c (pango_context_load_fontset):
        return_val_if_fail() if desc->family is not set.

9 files changed, 46 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index ca92a0da..c84576e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Dec 26 11:52:28 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-fontmap.c (pango_font_map_load_fontset) 
+	* pango/pango-context.c (pango_context_load_fontset): 
+	return_val_if_fail() if desc->family is not set.
+
 Sat Dec 22 12:14:25 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Version 0.23, require glib-1.3.12
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index ca92a0da..c84576e3 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,9 @@
+Wed Dec 26 11:52:28 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-fontmap.c (pango_font_map_load_fontset) 
+	* pango/pango-context.c (pango_context_load_fontset): 
+	return_val_if_fail() if desc->family is not set.
+
 Sat Dec 22 12:14:25 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Version 0.23, require glib-1.3.12
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index ca92a0da..c84576e3 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,9 @@
+Wed Dec 26 11:52:28 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-fontmap.c (pango_font_map_load_fontset) 
+	* pango/pango-context.c (pango_context_load_fontset): 
+	return_val_if_fail() if desc->family is not set.
+
 Sat Dec 22 12:14:25 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Version 0.23, require glib-1.3.12
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index ca92a0da..c84576e3 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,9 @@
+Wed Dec 26 11:52:28 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-fontmap.c (pango_font_map_load_fontset) 
+	* pango/pango-context.c (pango_context_load_fontset): 
+	return_val_if_fail() if desc->family is not set.
+
 Sat Dec 22 12:14:25 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Version 0.23, require glib-1.3.12
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index ca92a0da..c84576e3 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,9 @@
+Wed Dec 26 11:52:28 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-fontmap.c (pango_font_map_load_fontset) 
+	* pango/pango-context.c (pango_context_load_fontset): 
+	return_val_if_fail() if desc->family is not set.
+
 Sat Dec 22 12:14:25 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Version 0.23, require glib-1.3.12
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index ca92a0da..c84576e3 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,9 @@
+Wed Dec 26 11:52:28 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-fontmap.c (pango_font_map_load_fontset) 
+	* pango/pango-context.c (pango_context_load_fontset): 
+	return_val_if_fail() if desc->family is not set.
+
 Sat Dec 22 12:14:25 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Version 0.23, require glib-1.3.12
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index ca92a0da..c84576e3 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,9 @@
+Wed Dec 26 11:52:28 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-fontmap.c (pango_font_map_load_fontset) 
+	* pango/pango-context.c (pango_context_load_fontset): 
+	return_val_if_fail() if desc->family is not set.
+
 Sat Dec 22 12:14:25 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Version 0.23, require glib-1.3.12
diff --git a/pango/pango-context.c b/pango/pango-context.c
index 53099411..f0f3bb97 100644
--- a/pango/pango-context.c
+++ b/pango/pango-context.c
@@ -235,6 +235,7 @@ pango_context_load_fontset (PangoContext               *context,
 			     PangoLanguage             *language)
 {
   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_fontset (context->font_map, context, desc, language);
 }
diff --git a/pango/pango-fontmap.c b/pango/pango-fontmap.c
index 4cdc4ca3..c3b62694 100644
--- a/pango/pango-fontmap.c
+++ b/pango/pango-fontmap.c
@@ -122,8 +122,9 @@ pango_font_map_load_fontset (PangoFontMap                 *fontmap,
 			     const PangoFontDescription   *desc,
 			     PangoLanguage                *language)
 {
-  g_return_val_if_fail (fontmap != NULL, 0);
-
+  g_return_val_if_fail (fontmap != NULL, NULL);
+  g_return_val_if_fail (pango_font_description_get_family (desc) != NULL, NULL);
+  
   return PANGO_FONT_MAP_GET_CLASS (fontmap)->load_fontset (fontmap, context, desc, language);
 }