From c734db40c7bb880797eb27e0b967756b519e951e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 7 Feb 2007 21:58:31 +0000 Subject: ** Fixes bug #359979, #384183 2007-02-07 Matthew Barnes ** Fixes bug #359979, #384183 * mail/em-camel-stream.c (sync_op): * mail/em-sync-stream.c (sync_op): * mail/mail-session.c (alert_user): e_msgport_wait()'s behavior is now block-and-pop instead of block-and-peek. svn path=/trunk/; revision=33181 --- mail/em-sync-stream.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mail/em-sync-stream.c') diff --git a/mail/em-sync-stream.c b/mail/em-sync-stream.c index d6654985c0..26201ea7e9 100644 --- a/mail/em-sync-stream.c +++ b/mail/em-sync-stream.c @@ -214,6 +214,7 @@ sync_op(EMSyncStream *emss, enum _write_msg_t op, const char *data, size_t n) { struct _EMSyncStreamPrivate *p = emss->priv; struct _write_msg msg; + EMsg *reply_msg; d(printf("%p: launching sync op %d\n", emss, op)); @@ -226,9 +227,9 @@ sync_op(EMSyncStream *emss, enum _write_msg_t op, const char *data, size_t n) msg.n = n; e_msgport_put(p->data_port, &msg.msg); - e_msgport_wait(p->reply_port); + reply_msg = e_msgport_wait(p->reply_port); + g_assert(reply_msg == &msg.msg); - g_assert(e_msgport_get(msg.msg.reply_port) == &msg.msg); d(printf("%p: returned sync op %d\n", emss, op)); } -- cgit v1.2.3