summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2001-01-29 23:59:12 +0000
committerMichael Zucci <zucchi@src.gnome.org>2001-01-29 23:59:12 +0000
commit9021814933d1fb2ccf1291b53355967b8969aa91 (patch)
tree7358f964092452fbf7e3ac3260e76fb328d209c7
parent0eb3633d247998075771794baf844fb775359969 (diff)
downloadevolution-data-server-9021814933d1fb2ccf1291b53355967b8969aa91.tar.gz
Remvoe the stream locking here. I think this was leading to a deadlockLWE_2001_01
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.
-rw-r--r--camel/ChangeLog6
-rw-r--r--camel/camel-remote-store.c4
2 files changed, 6 insertions, 4 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index fcaa28014..9e0455b07 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 ef6fe56df..1c73639d5 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;
}