From 920343e57589116722bfeedee8fcc4036ee1e920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bellegarde?= Date: Tue, 28 Feb 2023 16:16:55 +0100 Subject: [PATCH] engine: Do not stop delivering messages on error - We are already showing an infobar for CONNECTION_FAILED with a 'Retry' button that will requeue all outbox messages - For UNRECOVERABLE_ERROR, just ignore them until next engine restart Fix #1258 #1482 --- src/engine/smtp/smtp-client-service.vala | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/engine/smtp/smtp-client-service.vala b/src/engine/smtp/smtp-client-service.vala index 88940db8..5faaff94 100644 --- a/src/engine/smtp/smtp-client-service.vala +++ b/src/engine/smtp/smtp-client-service.vala @@ -193,7 +193,6 @@ public class Geary.Smtp.ClientService : Geary.ClientService { err is SmtpError.NOT_SUPPORTED) { notify_unrecoverable_error(new ErrorContext(err)); } - cancellable.cancel(); } catch (GLib.IOError.CANCELLED err) { // Nothing to do here — we're already cancelled. } catch (EngineError.NOT_FOUND err) { @@ -202,12 +201,6 @@ public class Geary.Smtp.ClientService : Geary.ClientService { id.to_string(), err.message); } catch (GLib.Error err) { notify_connection_failed(new ErrorContext(err)); - cancellable.cancel(); - } - - if (!email_handled && id != null) { - // Send was bad, try sending again later - this.outbox_queue.send(id); } }