summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2001-09-21 22:59:31 +0000
committerOwen Taylor <otaylor@src.gnome.org>2001-09-21 22:59:31 +0000
commit37bbdcf83f669e522b79ca43a8071255a8b48409 (patch)
treec3e4b06ad086f4eded80b79fef6d8f6f0156d5f5
parentb8db5b55fcfd40cf77fab8147f0067b9b045988d (diff)
downloadpango-37bbdcf83f669e522b79ca43a8071255a8b48409.tar.gz
Set PANGO_FONT_MASK_FAMILY. (#60888, reported by Mario Motta)
Fri Sep 21 18:55:18 2001 Owen Taylor <otaylor@redhat.com> * pango/fonts.c (pango_font_description_from_string): Set PANGO_FONT_MASK_FAMILY. (#60888, reported by Mario Motta)
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-05
-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/fonts.c5
8 files changed, 39 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ede223f..d24e79e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 21 18:55:18 2001 Owen Taylor <otaylor@redhat.com>
+
+ * pango/fonts.c (pango_font_description_from_string): Set
+ PANGO_FONT_MASK_FAMILY. (#60888, reported by Mario Motta)
+
2001-09-21 Matthias Clasen <matthiasc@poet.de>
* pango/fonts.c (append_field, pango_font_description_to_string):
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 3ede223f..d24e79e2 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,8 @@
+Fri Sep 21 18:55:18 2001 Owen Taylor <otaylor@redhat.com>
+
+ * pango/fonts.c (pango_font_description_from_string): Set
+ PANGO_FONT_MASK_FAMILY. (#60888, reported by Mario Motta)
+
2001-09-21 Matthias Clasen <matthiasc@poet.de>
* pango/fonts.c (append_field, pango_font_description_to_string):
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 3ede223f..d24e79e2 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+Fri Sep 21 18:55:18 2001 Owen Taylor <otaylor@redhat.com>
+
+ * pango/fonts.c (pango_font_description_from_string): Set
+ PANGO_FONT_MASK_FAMILY. (#60888, reported by Mario Motta)
+
2001-09-21 Matthias Clasen <matthiasc@poet.de>
* pango/fonts.c (append_field, pango_font_description_to_string):
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 3ede223f..d24e79e2 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,8 @@
+Fri Sep 21 18:55:18 2001 Owen Taylor <otaylor@redhat.com>
+
+ * pango/fonts.c (pango_font_description_from_string): Set
+ PANGO_FONT_MASK_FAMILY. (#60888, reported by Mario Motta)
+
2001-09-21 Matthias Clasen <matthiasc@poet.de>
* pango/fonts.c (append_field, pango_font_description_to_string):
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 3ede223f..d24e79e2 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,8 @@
+Fri Sep 21 18:55:18 2001 Owen Taylor <otaylor@redhat.com>
+
+ * pango/fonts.c (pango_font_description_from_string): Set
+ PANGO_FONT_MASK_FAMILY. (#60888, reported by Mario Motta)
+
2001-09-21 Matthias Clasen <matthiasc@poet.de>
* pango/fonts.c (append_field, pango_font_description_to_string):
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 3ede223f..d24e79e2 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+Fri Sep 21 18:55:18 2001 Owen Taylor <otaylor@redhat.com>
+
+ * pango/fonts.c (pango_font_description_from_string): Set
+ PANGO_FONT_MASK_FAMILY. (#60888, reported by Mario Motta)
+
2001-09-21 Matthias Clasen <matthiasc@poet.de>
* pango/fonts.c (append_field, pango_font_description_to_string):
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 3ede223f..d24e79e2 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+Fri Sep 21 18:55:18 2001 Owen Taylor <otaylor@redhat.com>
+
+ * pango/fonts.c (pango_font_description_from_string): Set
+ PANGO_FONT_MASK_FAMILY. (#60888, reported by Mario Motta)
+
2001-09-21 Matthias Clasen <matthiasc@poet.de>
* pango/fonts.c (append_field, pango_font_description_to_string):
diff --git a/pango/fonts.c b/pango/fonts.c
index fb9d5bd0..10cdad36 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -876,7 +876,10 @@ pango_font_description_from_string (const char *str)
str++;
if (str != last)
- desc->family_name = g_strndup (str, last - str);
+ {
+ desc->family_name = g_strndup (str, last - str);
+ desc->mask |= PANGO_FONT_MASK_FAMILY;
+ }
return desc;
}