summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ChangeLog.pre-1-04
-rw-r--r--ChangeLog.pre-1-104
-rw-r--r--ChangeLog.pre-1-24
-rw-r--r--ChangeLog.pre-1-44
-rw-r--r--ChangeLog.pre-1-64
-rw-r--r--ChangeLog.pre-1-84
-rw-r--r--pango/pangoft2.c10
8 files changed, 36 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4663fa6d..62d153f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-12 Sven Neumann <sven@gimp.org>
+
+ * pango/pangoft2.c (pango_ft2_font_describe): set the size field
+
2001-03-07 Havoc Pennington <hp@redhat.com>
* pango/pangox.c (pango_x_font_get_metrics): fix a cheesy bug in
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 4663fa6d..62d153f9 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,7 @@
+2001-03-12 Sven Neumann <sven@gimp.org>
+
+ * pango/pangoft2.c (pango_ft2_font_describe): set the size field
+
2001-03-07 Havoc Pennington <hp@redhat.com>
* pango/pangox.c (pango_x_font_get_metrics): fix a cheesy bug in
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 4663fa6d..62d153f9 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,7 @@
+2001-03-12 Sven Neumann <sven@gimp.org>
+
+ * pango/pangoft2.c (pango_ft2_font_describe): set the size field
+
2001-03-07 Havoc Pennington <hp@redhat.com>
* pango/pangox.c (pango_x_font_get_metrics): fix a cheesy bug in
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 4663fa6d..62d153f9 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,7 @@
+2001-03-12 Sven Neumann <sven@gimp.org>
+
+ * pango/pangoft2.c (pango_ft2_font_describe): set the size field
+
2001-03-07 Havoc Pennington <hp@redhat.com>
* pango/pangox.c (pango_x_font_get_metrics): fix a cheesy bug in
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 4663fa6d..62d153f9 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,7 @@
+2001-03-12 Sven Neumann <sven@gimp.org>
+
+ * pango/pangoft2.c (pango_ft2_font_describe): set the size field
+
2001-03-07 Havoc Pennington <hp@redhat.com>
* pango/pangox.c (pango_x_font_get_metrics): fix a cheesy bug in
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 4663fa6d..62d153f9 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,7 @@
+2001-03-12 Sven Neumann <sven@gimp.org>
+
+ * pango/pangoft2.c (pango_ft2_font_describe): set the size field
+
2001-03-07 Havoc Pennington <hp@redhat.com>
* pango/pangox.c (pango_x_font_get_metrics): fix a cheesy bug in
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 4663fa6d..62d153f9 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,7 @@
+2001-03-12 Sven Neumann <sven@gimp.org>
+
+ * pango/pangoft2.c (pango_ft2_font_describe): set the size field
+
2001-03-07 Havoc Pennington <hp@redhat.com>
* pango/pangox.c (pango_x_font_get_metrics): fix a cheesy bug in
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index 4268c24c..dbe66c0c 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -860,9 +860,15 @@ pango_ft2_font_finalize (GObject *object)
static PangoFontDescription *
pango_ft2_font_describe (PangoFont *font)
{
- PangoFT2Font *ft2font = PANGO_FT2_FONT (font);
+ PangoFT2Font *ft2font;
+ PangoFontDescription *desc;
- return pango_font_description_copy (&ft2font->entry->description);
+ ft2font = PANGO_FT2_FONT (font);
+
+ desc = pango_font_description_copy (&ft2font->entry->description);
+ desc->size = ft2font->size;
+
+ return desc;
}
PangoMap *