aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Williams <peterw@src.gnome.org>2000-08-24 03:10:40 +0800
committerPeter Williams <peterw@src.gnome.org>2000-08-24 03:10:40 +0800
commit7f51944599e2a69a92bb2eed477e46e853851ada (patch)
tree26da2b0d3464cade49a1f7b81b11cc4a752eb267
parentfd1851ec7a26dcce5d909eefde060bee7c643925 (diff)
downloadgsoc2013-evolution-7f51944599e2a69a92bb2eed477e46e853851ada.tar
gsoc2013-evolution-7f51944599e2a69a92bb2eed477e46e853851ada.tar.gz
gsoc2013-evolution-7f51944599e2a69a92bb2eed477e46e853851ada.tar.bz2
gsoc2013-evolution-7f51944599e2a69a92bb2eed477e46e853851ada.tar.lz
gsoc2013-evolution-7f51944599e2a69a92bb2eed477e46e853851ada.tar.xz
gsoc2013-evolution-7f51944599e2a69a92bb2eed477e46e853851ada.tar.zst
gsoc2013-evolution-7f51944599e2a69a92bb2eed477e46e853851ada.zip
Fix a deadlock upon checking mail due to new camel_service semantics.
svn path=/trunk/; revision=4984
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-ops.c11
2 files changed, 11 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index e82d95c7ee..0a701a7061 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-23 Peter Williams <peterw@helixcode.com>
+
+ * mail-ops.c (describe_fetch_mail): Don't use the camel calls
+ to describe the operation.
+
2000-08-22 Peter Williams <peterw@helixcode.com>
* mail-tools.c (mail_tool_get_folder_from_urlname): Don't connect
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index f90d492dd8..0047b5966b 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -63,11 +63,12 @@ describe_fetch_mail (gpointer in_data, gboolean gerund)
CamelStore *source;
char *name;
- source = camel_session_get_store (session, input->source_url, NULL);
- if (source) {
- name = camel_service_get_name (CAMEL_SERVICE (source), FALSE);
- camel_object_unref (CAMEL_OBJECT (source));
- } else
+ /*source = camel_session_get_store (session, input->source_url, NULL);
+ *if (source) {
+ * name = camel_service_get_name (CAMEL_SERVICE (source), FALSE);
+ * camel_object_unref (CAMEL_OBJECT (source));
+ *} else
+ */
name = input->source_url;
if (gerund)