summaryrefslogtreecommitdiff
path: root/vfs-methods/fontilus
diff options
context:
space:
mode:
Diffstat (limited to 'vfs-methods/fontilus')
-rw-r--r--vfs-methods/fontilus/ChangeLog5
-rw-r--r--vfs-methods/fontilus/font-method.c2
-rw-r--r--vfs-methods/fontilus/ftstream-vfs.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/vfs-methods/fontilus/ChangeLog b/vfs-methods/fontilus/ChangeLog
index 3b79479db..f0178d51d 100644
--- a/vfs-methods/fontilus/ChangeLog
+++ b/vfs-methods/fontilus/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-25 Kjartan Maraas <kmaraas@gnome.org>
+
+ * font-method.c: (ensure_font_list): NULL vs. 0
+ * ftstream-vfs.c: (vfs_stream_close): Same.
+
2004-12-10 James Henstridge <james@jamesh.id.au>
* Makefile.am (install-desktop-database): update the desktop file
diff --git a/vfs-methods/fontilus/font-method.c b/vfs-methods/fontilus/font-method.c
index 592c2c65b..3c3f850b6 100644
--- a/vfs-methods/fontilus/font-method.c
+++ b/vfs-methods/fontilus/font-method.c
@@ -161,7 +161,7 @@ ensure_font_list(void)
pat = FcPatternCreate();
os = FcObjectSetBuild(FC_FILE, FC_FAMILY, FC_WEIGHT, FC_SLANT, 0);
- font_list = FcFontList(0, pat, os);
+ font_list = FcFontList(NULL, pat, os);
FcPatternDestroy(pat);
FcObjectSetDestroy(os);
diff --git a/vfs-methods/fontilus/ftstream-vfs.c b/vfs-methods/fontilus/ftstream-vfs.c
index 0cb17d132..5864aa828 100644
--- a/vfs-methods/fontilus/ftstream-vfs.c
+++ b/vfs-methods/fontilus/ftstream-vfs.c
@@ -55,7 +55,7 @@ vfs_stream_close(FT_Stream stream)
stream->descriptor.pointer = NULL;
stream->size = 0;
- stream->base = 0;
+ stream->base = NULL;
}
static FT_Error