summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Neumann <sven@gimp.org>2002-06-03 07:43:20 +0000
committerSven Neumann <neo@src.gnome.org>2002-06-03 07:43:20 +0000
commitfb4b4c060cb9129dd6ff007e98a3be42f15fdadb (patch)
tree6f435a1796fb14d21f6bc4f8535d70edc94a6667
parent203f81ecb7b1558d6d4e373b9c06ee02f7309602 (diff)
downloadpango-fb4b4c060cb9129dd6ff007e98a3be42f15fdadb.tar.gz
set n_families, fixes bug #83746.
2002-06-03 Sven Neumann <sven@gimp.org> * pango/pangoft2-fontmap.c (pango_ft2_font_map_list_families): set n_families, fixes bug #83746.
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-105
-rw-r--r--ChangeLog.pre-1-25
-rw-r--r--ChangeLog.pre-1-45
-rw-r--r--ChangeLog.pre-1-65
-rw-r--r--ChangeLog.pre-1-85
-rw-r--r--pango/pangoft2-fontmap.c5
7 files changed, 34 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d9bd876..18420d3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-03 Sven Neumann <sven@gimp.org>
+
+ * pango/pangoft2-fontmap.c (pango_ft2_font_map_list_families): set
+ n_families, fixes bug #83746.
+
2002-05-26 Tor Lillqvist <tml@iki.fi>
* pango-zip.sh.in: Use complete PANGO_VERSION in zip file
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 4d9bd876..18420d3f 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+2002-06-03 Sven Neumann <sven@gimp.org>
+
+ * pango/pangoft2-fontmap.c (pango_ft2_font_map_list_families): set
+ n_families, fixes bug #83746.
+
2002-05-26 Tor Lillqvist <tml@iki.fi>
* pango-zip.sh.in: Use complete PANGO_VERSION in zip file
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 4d9bd876..18420d3f 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,8 @@
+2002-06-03 Sven Neumann <sven@gimp.org>
+
+ * pango/pangoft2-fontmap.c (pango_ft2_font_map_list_families): set
+ n_families, fixes bug #83746.
+
2002-05-26 Tor Lillqvist <tml@iki.fi>
* pango-zip.sh.in: Use complete PANGO_VERSION in zip file
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 4d9bd876..18420d3f 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,8 @@
+2002-06-03 Sven Neumann <sven@gimp.org>
+
+ * pango/pangoft2-fontmap.c (pango_ft2_font_map_list_families): set
+ n_families, fixes bug #83746.
+
2002-05-26 Tor Lillqvist <tml@iki.fi>
* pango-zip.sh.in: Use complete PANGO_VERSION in zip file
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 4d9bd876..18420d3f 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+2002-06-03 Sven Neumann <sven@gimp.org>
+
+ * pango/pangoft2-fontmap.c (pango_ft2_font_map_list_families): set
+ n_families, fixes bug #83746.
+
2002-05-26 Tor Lillqvist <tml@iki.fi>
* pango-zip.sh.in: Use complete PANGO_VERSION in zip file
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 4d9bd876..18420d3f 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+2002-06-03 Sven Neumann <sven@gimp.org>
+
+ * pango/pangoft2-fontmap.c (pango_ft2_font_map_list_families): set
+ n_families, fixes bug #83746.
+
2002-05-26 Tor Lillqvist <tml@iki.fi>
* pango-zip.sh.in: Use complete PANGO_VERSION in zip file
diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c
index dc356e5f..87ddbf9e 100644
--- a/pango/pangoft2-fontmap.c
+++ b/pango/pangoft2-fontmap.c
@@ -439,13 +439,16 @@ pango_ft2_font_map_list_families (PangoFontMap *fontmap,
ft2fontmap->families[count++] = create_family (ft2fontmap, "Monospace");
MiniXftFontSetDestroy (fontset);
+
+ ft2fontmap->n_families = count;
}
if (n_families)
*n_families = ft2fontmap->n_families;
if (families)
- *families = g_memdup (ft2fontmap->families, ft2fontmap->n_families * sizeof (PangoFontFamily *));
+ *families = g_memdup (ft2fontmap->families,
+ ft2fontmap->n_families * sizeof (PangoFontFamily *));
}
static int