aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@ximian.com>2003-03-06 06:27:30 +0800
committerRodrigo Moya <rodrigo@src.gnome.org>2003-03-06 06:27:30 +0800
commitf7589488e0022f45b1ed057c31e1f8216309f31d (patch)
treed4c36ac56dff9709bcb8324fee8bcff467581719
parent53e2f660cd38ce121491fe629a12b9d06136add9 (diff)
downloadgsoc2013-evolution-f7589488e0022f45b1ed057c31e1f8216309f31d.tar.gz
gsoc2013-evolution-f7589488e0022f45b1ed057c31e1f8216309f31d.tar.zst
gsoc2013-evolution-f7589488e0022f45b1ed057c31e1f8216309f31d.zip
Fixes #31382
2003-03-05 Rodrigo Moya <rodrigo@ximian.com> 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
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/e-meeting-model.c4
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 <rodrigo@ximian.com>
+
+ 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 <jpr@ximian.com>
* 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;
}