From f7589488e0022f45b1ed057c31e1f8216309f31d Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 5 Mar 2003 22:27:30 +0000 Subject: Fixes #31382 2003-03-05 Rodrigo Moya Fixes #31382 * gui/e-meeting-model.c (async_read): don't assume the buffer is always full, but use GNOME_VFS_ERROR_EOF instead for knowing when the read has finished. svn path=/trunk/; revision=20183 --- calendar/ChangeLog | 8 ++++++++ calendar/gui/e-meeting-model.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 4e5d7143d3..837eb08545 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2003-03-05 Rodrigo Moya + + Fixes #31382 + + * gui/e-meeting-model.c (async_read): don't assume the buffer is + always full, but use GNOME_VFS_ERROR_EOF instead for knowing when + the read has finished. + 2003-03-05 JP Rosevear * gui/apps_evolution_calendar.schemas: fix defaults and diff --git a/calendar/gui/e-meeting-model.c b/calendar/gui/e-meeting-model.c index 599762428c..d3261bd125 100644 --- a/calendar/gui/e-meeting-model.c +++ b/calendar/gui/e-meeting-model.c @@ -1334,7 +1334,7 @@ async_read (GnomeVFSAsyncHandle *handle, EMeetingModelQueueData *qdata = data; GnomeVFSFileSize buf_size = BUF_SIZE - 1; - if (result != GNOME_VFS_OK) { + if (result != GNOME_VFS_OK && result != GNOME_VFS_ERROR_EOF) { gnome_vfs_async_close (handle, async_close, qdata); return; } @@ -1342,7 +1342,7 @@ async_read (GnomeVFSAsyncHandle *handle, ((char *)buffer)[read] = '\0'; qdata->string = g_string_append (qdata->string, buffer); - if (read < requested) { + if (result == GNOME_VFS_ERROR_EOF) { gnome_vfs_async_close (handle, async_close, qdata); return; } -- cgit