diff options
| -rw-r--r-- | camel/ChangeLog | 6 | ||||
| -rw-r--r-- | camel/camel-remote-store.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index fcaa28014e..9e0455b079 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2001-01-30 Not Zed <NotZed@Ximian.com> + + * camel-remote-store.c (timeout_cb): Remvoe the stream locking + here. I think this was leading to a deadlock when a keepalive is + being sent, in imap. + 2001-01-29 Not Zed <NotZed@Ximian.com> * providers/imap/camel-imap-command.c diff --git a/camel/camel-remote-store.c b/camel/camel-remote-store.c index ef6fe56df0..1c73639d58 100644 --- a/camel/camel-remote-store.c +++ b/camel/camel-remote-store.c @@ -197,12 +197,8 @@ timeout_cb (gpointer data) { CamelRemoteStore *store = CAMEL_REMOTE_STORE(data); - CAMEL_REMOTE_STORE_LOCK(store, stream_lock); - CRSC (data)->keepalive(store); - CAMEL_REMOTE_STORE_UNLOCK(store, stream_lock); - return TRUE; } |