From 11e1359a0158fd28fcd0752afbc37d093c0d17a2 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Thu, 1 Feb 2018 14:28:21 +0100
Subject: [PATCH] Bug 720387 - Always set error on failure of
 mail_autoconfig_initable_init()

---
 src/mail/e-mail-autoconfig.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/mail/e-mail-autoconfig.c b/src/mail/e-mail-autoconfig.c
index 33994ffec6..1b321c8283 100644
--- a/src/mail/e-mail-autoconfig.c
+++ b/src/mail/e-mail-autoconfig.c
@@ -889,7 +889,9 @@ mail_autoconfig_initable_init (GInitable *initable,
 			cp++;
 	}
 
-	if (local_error != NULL)
+	if (!success && !local_error)
+		g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Unknown error"));
+	else if (local_error)
 		g_propagate_error (error, local_error);
 
 	g_free (name_server);
-- 
2.11.4.GIT