From 6e1a9c1903b5ae66cd267e675e6f50034e12ba85 Mon Sep 17 00:00:00 2001 From: 0 Date: Wed, 10 Oct 2001 19:48:27 +0000 Subject: oops, we want get_unread_message_count, not get_message_count! 2001-10-10 * providers/local/camel-maildir-store.c (scan_dir): oops, we want get_unread_message_count, not get_message_count! 2001-10-09 * camel-service.c (camel_service_disconnect): Duplicate connect code that unregisters a cancel op if we created one. svn path=/trunk/; revision=13561 --- camel/camel-service.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'camel/camel-service.c') diff --git a/camel/camel-service.c b/camel/camel-service.c index 4df8154d98..35ba782dfb 100644 --- a/camel/camel-service.c +++ b/camel/camel-service.c @@ -301,7 +301,8 @@ camel_service_disconnect (CamelService *service, gboolean clean, CamelException *ex) { gboolean res = TRUE; - + int unreg = FALSE; + CAMEL_SERVICE_LOCK (service, connect_lock); if (service->status == CAMEL_SERVICE_CONNECTED) { @@ -310,6 +311,7 @@ camel_service_disconnect (CamelService *service, gboolean clean, if (!service->connect_op) { service->connect_op = camel_operation_new (NULL, NULL); camel_operation_register (service->connect_op); + unreg = TRUE; } CAMEL_SERVICE_UNLOCK (service, connect_op_lock); @@ -318,6 +320,9 @@ camel_service_disconnect (CamelService *service, gboolean clean, service->status = CAMEL_SERVICE_DISCONNECTED; CAMEL_SERVICE_LOCK (service, connect_op_lock); + if (unreg) + camel_operation_unregister (service->connect_op); + camel_operation_unref (service->connect_op); service->connect_op = NULL; CAMEL_SERVICE_UNLOCK (service, connect_op_lock); -- cgit v1.2.3