From 6bb4295b9210b1d5b6c36214c06fecdb0b17a075 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 28 Feb 2013 12:35:48 -0500 Subject: e_mail_config_service_backend_get_settings: Another corner case. ESourceCollection's default backend name is "none". Unfortunately so is CamelNullStore's provider name. Make sure these two misfits don't get paired up! --- mail/e-mail-config-service-backend.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'mail') diff --git a/mail/e-mail-config-service-backend.c b/mail/e-mail-config-service-backend.c index c6c42ae7f5..8cd984d285 100644 --- a/mail/e-mail-config-service-backend.c +++ b/mail/e-mail-config-service-backend.c @@ -404,10 +404,15 @@ e_mail_config_service_backend_get_settings (EMailConfigServiceBackend *backend) backend_name = e_source_backend_get_backend_name (backend_extension); - extension_name = - e_source_camel_get_extension_name (backend_name); - camel_extension = - e_source_get_extension (source, extension_name); + /* XXX ESourceCollection's default backend name is "none". + * Unfortunately so is CamelNullStore's provider name. + * Make sure these two misfits don't get paired up! */ + if (g_strcmp0 (backend_name, "none") != 0) { + extension_name = + e_source_camel_get_extension_name (backend_name); + camel_extension = + e_source_get_extension (source, extension_name); + } } if (camel_extension == NULL) { -- cgit v1.2.3