diff options
| -rw-r--r-- | vfs-methods/fontilus/ChangeLog | 6 | ||||
| -rw-r--r-- | vfs-methods/fontilus/font-method.c | 2 | ||||
| -rw-r--r-- | vfs-methods/fontilus/font-view.c | 2 | ||||
| -rw-r--r-- | vfs-methods/fontilus/fontilus.applications | 2 | ||||
| -rw-r--r-- | vfs-methods/fontilus/fontilus.mime | 5 | ||||
| -rw-r--r-- | vfs-methods/fontilus/ftstream-vfs.c | 9 | ||||
| -rw-r--r-- | vfs-methods/fontilus/thumbnailer.c | 2 |
7 files changed, 19 insertions, 9 deletions
diff --git a/vfs-methods/fontilus/ChangeLog b/vfs-methods/fontilus/ChangeLog index a60bee3b4..4dc4a6b7d 100644 --- a/vfs-methods/fontilus/ChangeLog +++ b/vfs-methods/fontilus/ChangeLog @@ -1,5 +1,11 @@ 2003-01-09 James Henstridge <james@daa.com.au> + * NEWS: add news items. + + * src/fontilus.mime: ttc files are True Types. + + * src/*.c: update copyright messages. + * fontilus.spec.in: update to include schema and run a postinstallation script to install the schema. diff --git a/vfs-methods/fontilus/font-method.c b/vfs-methods/fontilus/font-method.c index 39a785781..b049d0464 100644 --- a/vfs-methods/fontilus/font-method.c +++ b/vfs-methods/fontilus/font-method.c @@ -1,6 +1,6 @@ /* -*- mode: C; c-basic-offset: 4 -*- * fontilus - a collection of font utilities for GNOME - * Copyright (C) 2002 James Henstridge <james@daa.com.au> + * Copyright (C) 2002-2003 James Henstridge <james@daa.com.au> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/vfs-methods/fontilus/font-view.c b/vfs-methods/fontilus/font-view.c index 7381a2ab1..0c2d7e40f 100644 --- a/vfs-methods/fontilus/font-view.c +++ b/vfs-methods/fontilus/font-view.c @@ -1,6 +1,6 @@ /* -*- mode: C; c-basic-offset: 4 -*- * fontilus - a collection of font utilities for GNOME - * Copyright (C) 2002 James Henstridge <james@daa.com.au> + * Copyright (C) 2002-2003 James Henstridge <james@daa.com.au> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/vfs-methods/fontilus/fontilus.applications b/vfs-methods/fontilus/fontilus.applications index 0c9bb25a2..ac153465b 100644 --- a/vfs-methods/fontilus/fontilus.applications +++ b/vfs-methods/fontilus/fontilus.applications @@ -5,4 +5,4 @@ gnome-font-viewer expects_uris=true requires_terminal=false supported_uri_schemes=file,fonts - mime_types=application/x-font-pcf,application/x-font-ttf,application/x-font-type1 + mime_types=application/x-font-pcf,application/x-font-ttf,application/x-font-type1,application/x-font-otf diff --git a/vfs-methods/fontilus/fontilus.mime b/vfs-methods/fontilus/fontilus.mime index 0730ef6a8..bb3570785 100644 --- a/vfs-methods/fontilus/fontilus.mime +++ b/vfs-methods/fontilus/fontilus.mime @@ -1,2 +1,5 @@ application/x-font-pcf: - regex,2: pcf\.gz$ + regex,2: pcf\.gz$ + +application/x-font-ttf: + ext: ttc TTC diff --git a/vfs-methods/fontilus/ftstream-vfs.c b/vfs-methods/fontilus/ftstream-vfs.c index aa438fa6c..0cb17d132 100644 --- a/vfs-methods/fontilus/ftstream-vfs.c +++ b/vfs-methods/fontilus/ftstream-vfs.c @@ -1,6 +1,6 @@ /* -*- mode: C; c-basic-offset: 4 -*- * fontilus - a collection of font utilities for GNOME - * Copyright (C) 2002 James Henstridge <james@daa.com.au> + * Copyright (C) 2002-2003 James Henstridge <james@daa.com.au> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -121,10 +121,11 @@ FT_New_Face_From_URI(FT_Library library, return error; } -#ifndef FT_OPEN_STREAM -# define FT_OPEN_STREAM ft_open_stream + /* freetype-2.1.3 accidentally broke compatibility. */ +#if defined(FT_OPEN_STREAM) && !defined(ft_open_stream) +# define ft_open_stream FT_OPEN_STREAM #endif - args.flags = FT_OPEN_STREAM; + args.flags = ft_open_stream; args.stream = stream; error = FT_Open_Face(library, &args, face_index, aface); diff --git a/vfs-methods/fontilus/thumbnailer.c b/vfs-methods/fontilus/thumbnailer.c index 39e0d5c04..f726ffb04 100644 --- a/vfs-methods/fontilus/thumbnailer.c +++ b/vfs-methods/fontilus/thumbnailer.c @@ -1,6 +1,6 @@ /* -*- mode: C; c-basic-offset: 4 -*- * fontilus - a collection of font utilities for GNOME - * Copyright (C) 2002 James Henstridge <james@daa.com.au> + * Copyright (C) 2002-2003 James Henstridge <james@daa.com.au> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |