diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2007-02-08 05:58:31 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-02-08 05:58:31 +0800 |
| commit | c734db40c7bb880797eb27e0b967756b519e951e (patch) | |
| tree | c553d1b98d20e1cc210c37a53b1f00a2765e476b /mail/em-sync-stream.c | |
| parent | fcd71ac61c71c2768d85cab4a26261d89452b0db (diff) | |
| download | gsoc2013-evolution-c734db40c7bb880797eb27e0b967756b519e951e.tar.gz gsoc2013-evolution-c734db40c7bb880797eb27e0b967756b519e951e.tar.zst gsoc2013-evolution-c734db40c7bb880797eb27e0b967756b519e951e.zip | |
** Fixes bug #359979, #384183
2007-02-07 Matthew Barnes <mbarnes@redhat.com>
** 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
Diffstat (limited to 'mail/em-sync-stream.c')
| -rw-r--r-- | mail/em-sync-stream.c | 5 |
1 files changed, 3 insertions, 2 deletions
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)); } |