diff options
| author | Ramiro Estrugo <ramiro@eazel.com> | 2001-03-08 22:07:51 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2001-03-08 22:07:51 +0000 |
| commit | 746c1203da65be1c216fa94ef04f60caac69cd9f (patch) | |
| tree | 353be1bd5a33b181d47fef928b96fb6bd85cec7e | |
| parent | 15e32d209f2e6f23a7f70221bcf141c297ed1721 (diff) | |
| download | nautilus-746c1203da65be1c216fa94ef04f60caac69cd9f.tar.gz | |
Merge from HEAD:
2001-03-08 Ramiro Estrugo <ramiro@eazel.com>
reviewed and checked in by: Darin Adler <darin@eazel.com>
Fix bug 7549 - Should block bookman and symbols fonts in older
RedHat systems
* libnautilus-extensions/nautilus-font-picker.c:
Add 2 more fonts to the black list. There were already in the
list, but older RedHat systems name these fonts differently.
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-font-picker.c | 2 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-font-picker.c | 2 |
3 files changed, 19 insertions, 0 deletions
@@ -1,3 +1,18 @@ +2001-03-08 Darin Adler <darin@eazel.com> + + Merge from HEAD: + + 2001-03-08 Ramiro Estrugo <ramiro@eazel.com> + + reviewed and checked in by: Darin Adler <darin@eazel.com> + + Fix bug 7549 - Should block bookman and symbols fonts in older + RedHat systems + + * libnautilus-extensions/nautilus-font-picker.c: + Add 2 more fonts to the black list. There were already in the + list, but older RedHat systems name these fonts differently. + 2001-03-08 Pavel Cisler <pavel@eazel.com> Merge from HEAD: diff --git a/libnautilus-extensions/nautilus-font-picker.c b/libnautilus-extensions/nautilus-font-picker.c index 4b9ea0b50..49ed536be 100644 --- a/libnautilus-extensions/nautilus-font-picker.c +++ b/libnautilus-extensions/nautilus-font-picker.c @@ -60,12 +60,14 @@ typedef struct { */ static const char *black_listed_font_families[] = { "Bookman", + "Bookman L", "Webdings", "Wingdings", "OCR", "Zapf Dingbats", "Dingbats", "Symbol", + "Standard Symbols L" "cursor", "mincho", "gothic", diff --git a/libnautilus-private/nautilus-font-picker.c b/libnautilus-private/nautilus-font-picker.c index 4b9ea0b50..49ed536be 100644 --- a/libnautilus-private/nautilus-font-picker.c +++ b/libnautilus-private/nautilus-font-picker.c @@ -60,12 +60,14 @@ typedef struct { */ static const char *black_listed_font_families[] = { "Bookman", + "Bookman L", "Webdings", "Wingdings", "OCR", "Zapf Dingbats", "Dingbats", "Symbol", + "Standard Symbols L" "cursor", "mincho", "gothic", |