From 517db3b21fece8d8616620ff299689699b62b277 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 31 Oct 2000 23:44:46 +0000 Subject: Add a new argument, clean, that says whether or not to try to disconnect * camel-service.c (service_disconnect): Add a new argument, clean, that says whether or not to try to disconnect cleanly. * camel-remote-store.c (remote_send_string, remote_send_stream, remote_recv_line): disconnect uncleanly on failure to prevent infinite loops when providers would normally send commands from disconnect(). Remove some unneeded CamelException goo. * providers/smtp/camel-smtp-transport.c (smtp_disconnect): * providers/pop3/camel-pop3-store.c (pop3_disconnect): * providers/nntp/camel-nntp-store.c (nntp_store_disconnect): * providers/imap/camel-imap-store.c (imap_disconnect): Don't send QUIT/LOGOUT if !clean. svn path=/trunk/; revision=6303 --- camel/providers/nntp/camel-nntp-store.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'camel/providers/nntp') diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c index dbba4356be..41466fe06c 100644 --- a/camel/providers/nntp/camel-nntp-store.c +++ b/camel/providers/nntp/camel-nntp-store.c @@ -263,16 +263,17 @@ nntp_store_connect (CamelService *service, CamelException *ex) } static gboolean -nntp_store_disconnect (CamelService *service, CamelException *ex) +nntp_store_disconnect (CamelService *service, gboolean clean, CamelException *ex) { CamelNNTPStore *store = CAMEL_NNTP_STORE (service); - camel_nntp_command (store, ex, NULL, "QUIT"); + if (clean) + camel_nntp_command (store, ex, NULL, "QUIT"); if (store->newsrc) camel_nntp_newsrc_write (store->newsrc); - if (!service_class->disconnect (service, ex)) + if (!service_class->disconnect (service, clean, ex)) return FALSE; return TRUE; -- cgit v1.2.3