diff options
| author | Ramiro Estrugo <ramiro@src.gnome.org> | 2001-03-05 23:42:01 +0000 |
|---|---|---|
| committer | Ramiro Estrugo <ramiro@src.gnome.org> | 2001-03-05 23:42:01 +0000 |
| commit | 7799503cc6910be19c14f1d7d9d0d3fb0094735f (patch) | |
| tree | 2287e2d79f561bdf8c3074af327a59a2cde238fc | |
| parent | b93ae934992d31094c69cdf0a5df8dc2565c0531 (diff) | |
| download | nautilus-7799503cc6910be19c14f1d7d9d0d3fb0094735f.tar.gz | |
reviewed by: Darin Adler <darin@eazel.com>
Fix for bugs 7375 and 7370.
* libnautilus-extensions/nautilus-font-manager.c:
(font_ignore_directory): Black list the ISO8859-2 and ISO8859-7
encoded fonts which it turns out are missing all kinds of glyphs.
Also add another instance of the same Abisource fonts, but from an
older package that had a slightly different name.
* libnautilus-extensions/nautilus-font-picker.c:
Black list the Bookmark URW font which causes crashes on old
version of the urw package.
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-font-manager.c | 5 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-font-picker.c | 2 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-font-manager.c | 5 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-font-picker.c | 2 |
5 files changed, 26 insertions, 4 deletions
@@ -1,3 +1,19 @@ +2001-03-05 Ramiro Estrugo <ramiro@eazel.com> + + reviewed by: Darin Adler <darin@eazel.com> + + Fix for bugs 7375 and 7370. + + * libnautilus-extensions/nautilus-font-manager.c: + (font_ignore_directory): Black list the ISO8859-2 and ISO8859-7 + encoded fonts which it turns out are missing all kinds of glyphs. + Also add another instance of the same Abisource fonts, but from an + older package that had a slightly different name. + + * libnautilus-extensions/nautilus-font-picker.c: + Black list the Bookmark URW font which causes crashes on old + version of the urw package. + 2001-03-05 John Harper <jsh@eazel.com> reviewed & checked in by: Darin Adler <darin@eazel.com> diff --git a/libnautilus-extensions/nautilus-font-manager.c b/libnautilus-extensions/nautilus-font-manager.c index 4eda0ab7e..b00464fe6 100644 --- a/libnautilus-extensions/nautilus-font-manager.c +++ b/libnautilus-extensions/nautilus-font-manager.c @@ -876,8 +876,11 @@ font_ignore_directory (const char *font_directory) "75dpi", "misc", "abisource/fonts", + "AbiSuite/fonts", "fonts/Speedo", - "fonts/cyrillic" + "fonts/cyrillic", + "ISO8859-2/Type1", + "ISO8859-7/Type1" }; g_return_val_if_fail (string_is_valid (font_directory), TRUE); diff --git a/libnautilus-extensions/nautilus-font-picker.c b/libnautilus-extensions/nautilus-font-picker.c index bf520ea4a..35fbcad8a 100644 --- a/libnautilus-extensions/nautilus-font-picker.c +++ b/libnautilus-extensions/nautilus-font-picker.c @@ -59,13 +59,13 @@ typedef struct { * least in the context of Nautilus. */ static const char *black_listed_font_families[] = { + "Bookman", "Webdings", "Wingdings", "OCR", "Zapf Dingbats", "Symbol", "cursor", - "mincho", "gothic" }; diff --git a/libnautilus-private/nautilus-font-manager.c b/libnautilus-private/nautilus-font-manager.c index 4eda0ab7e..b00464fe6 100644 --- a/libnautilus-private/nautilus-font-manager.c +++ b/libnautilus-private/nautilus-font-manager.c @@ -876,8 +876,11 @@ font_ignore_directory (const char *font_directory) "75dpi", "misc", "abisource/fonts", + "AbiSuite/fonts", "fonts/Speedo", - "fonts/cyrillic" + "fonts/cyrillic", + "ISO8859-2/Type1", + "ISO8859-7/Type1" }; g_return_val_if_fail (string_is_valid (font_directory), TRUE); diff --git a/libnautilus-private/nautilus-font-picker.c b/libnautilus-private/nautilus-font-picker.c index bf520ea4a..35fbcad8a 100644 --- a/libnautilus-private/nautilus-font-picker.c +++ b/libnautilus-private/nautilus-font-picker.c @@ -59,13 +59,13 @@ typedef struct { * least in the context of Nautilus. */ static const char *black_listed_font_families[] = { + "Bookman", "Webdings", "Wingdings", "OCR", "Zapf Dingbats", "Symbol", "cursor", - "mincho", "gothic" }; |