don't include family name if PANGO_FONT_MASK_FAMILY is not set.

2001-10-03  Sven Neumann  <sven@gimp.org>

	* pango/fonts.c (pango_font_description_to_string): don't include
	family name if PANGO_FONT_MASK_FAMILY is not set.

	* pango/pangoft2-fontmap.c: make it compile with DEBUGGING being
	defined.

9 files changed, 58 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 55a9d76b..5123fde2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-03  Sven Neumann  <sven@gimp.org>
+
+	* pango/fonts.c (pango_font_description_to_string): don't include
+	family name if PANGO_FONT_MASK_FAMILY is not set.
+
+	* pango/pangoft2-fontmap.c: make it compile with DEBUGGING being
+	defined.
+
 2001-10-03  Tor Lillqvist  <tml@iki.fi>
 
 	Add the Win32 GDI Pango backend to autoconfiguration:
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 55a9d76b..5123fde2 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,11 @@
+2001-10-03  Sven Neumann  <sven@gimp.org>
+
+	* pango/fonts.c (pango_font_description_to_string): don't include
+	family name if PANGO_FONT_MASK_FAMILY is not set.
+
+	* pango/pangoft2-fontmap.c: make it compile with DEBUGGING being
+	defined.
+
 2001-10-03  Tor Lillqvist  <tml@iki.fi>
 
 	Add the Win32 GDI Pango backend to autoconfiguration:
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 55a9d76b..5123fde2 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,11 @@
+2001-10-03  Sven Neumann  <sven@gimp.org>
+
+	* pango/fonts.c (pango_font_description_to_string): don't include
+	family name if PANGO_FONT_MASK_FAMILY is not set.
+
+	* pango/pangoft2-fontmap.c: make it compile with DEBUGGING being
+	defined.
+
 2001-10-03  Tor Lillqvist  <tml@iki.fi>
 
 	Add the Win32 GDI Pango backend to autoconfiguration:
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 55a9d76b..5123fde2 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,11 @@
+2001-10-03  Sven Neumann  <sven@gimp.org>
+
+	* pango/fonts.c (pango_font_description_to_string): don't include
+	family name if PANGO_FONT_MASK_FAMILY is not set.
+
+	* pango/pangoft2-fontmap.c: make it compile with DEBUGGING being
+	defined.
+
 2001-10-03  Tor Lillqvist  <tml@iki.fi>
 
 	Add the Win32 GDI Pango backend to autoconfiguration:
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 55a9d76b..5123fde2 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,11 @@
+2001-10-03  Sven Neumann  <sven@gimp.org>
+
+	* pango/fonts.c (pango_font_description_to_string): don't include
+	family name if PANGO_FONT_MASK_FAMILY is not set.
+
+	* pango/pangoft2-fontmap.c: make it compile with DEBUGGING being
+	defined.
+
 2001-10-03  Tor Lillqvist  <tml@iki.fi>
 
 	Add the Win32 GDI Pango backend to autoconfiguration:
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 55a9d76b..5123fde2 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,11 @@
+2001-10-03  Sven Neumann  <sven@gimp.org>
+
+	* pango/fonts.c (pango_font_description_to_string): don't include
+	family name if PANGO_FONT_MASK_FAMILY is not set.
+
+	* pango/pangoft2-fontmap.c: make it compile with DEBUGGING being
+	defined.
+
 2001-10-03  Tor Lillqvist  <tml@iki.fi>
 
 	Add the Win32 GDI Pango backend to autoconfiguration:
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 55a9d76b..5123fde2 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,11 @@
+2001-10-03  Sven Neumann  <sven@gimp.org>
+
+	* pango/fonts.c (pango_font_description_to_string): don't include
+	family name if PANGO_FONT_MASK_FAMILY is not set.
+
+	* pango/pangoft2-fontmap.c: make it compile with DEBUGGING being
+	defined.
+
 2001-10-03  Tor Lillqvist  <tml@iki.fi>
 
 	Add the Win32 GDI Pango backend to autoconfiguration:
diff --git a/pango/fonts.c b/pango/fonts.c
index 1586b4c4..4ace0a19 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -910,7 +910,7 @@ pango_font_description_to_string (const PangoFontDescription  *desc)
   GString *result = g_string_new (NULL);
   char *str;
 
-  if (desc->family_name)
+  if (desc->family_name && desc->mask & PANGO_FONT_MASK_FAMILY)
     {
       const char *p;
       size_t wordlen;
diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c
index 13df4248..8492524f 100644
--- a/pango/pangoft2-fontmap.c
+++ b/pango/pangoft2-fontmap.c
@@ -700,7 +700,7 @@ pango_print_desc (PangoFontDescription *desc)
   PangoStretch stretch = pango_font_description_get_stretch (desc);
   
   g_print ("%s%s%s%s%s",
-	   pango_font_get_family (desc),
+	   pango_font_description_get_family (desc),
 	   (style == PANGO_STYLE_NORMAL ? "" :
 	    (style == PANGO_STYLE_OBLIQUE ? " OBLIQUE" :
 	     (style == PANGO_STYLE_ITALIC ? " ITALIC" : " ???"))),