From 6416c2f6d14803fe01c0358ffccde7751b1da57e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bellegarde?= Date: Sat, 4 Feb 2023 18:49:41 +0100 Subject: [PATCH] engine: Remove workaround for GNOME/glib#1872 --- src/engine/imap/api/imap-client-service.vala | 24 +------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/src/engine/imap/api/imap-client-service.vala b/src/engine/imap/api/imap-client-service.vala index fe534b49..c956850b 100644 --- a/src/engine/imap/api/imap-client-service.vala +++ b/src/engine/imap/api/imap-client-service.vala @@ -326,31 +326,9 @@ public class Geary.Imap.ClientService : Geary.ClientService { private async void add_pool_session() { ClientSession? new_session = null; try { - // Work around GNOME/glib#1872 by waiting a second and - // retrying when a G_IO_ERROR_FAILED is received. Pull this - // loop out when that bug is fixed. - int attempts = 3; - while (new_session == null) { - try { - new_session = yield this.create_new_authorized_session( + new_session = yield this.create_new_authorized_session( this.pool_cancellable ); - } catch (GLib.IOError.FAILED err) { - if (--attempts > 0) { - debug( - "Generic error connecting, retrying after 1s: %s", - err.message - ); - GLib.Timeout.add_seconds( - 1, this.add_pool_session.callback - ); - yield; - } else { - throw err; - } - } - } - // === 8< === End of work-around === 8< === } catch (ImapError.UNAUTHENTICATED err) { debug("Auth error adding new session to the pool: %s", err.message); notify_authentication_failed();