aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-06-22 21:33:18 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-06-22 22:39:34 +0800
commit9f9b8c590221d33530e23c33002058d5f30451bb (patch)
treeb5b5170267e411eb1d31d2ed77dab9985ad989f9
parent80a8ee67dfbaad8877d3a3b45678198307b27c65 (diff)
downloadgsoc2013-evolution-9f9b8c590221d33530e23c33002058d5f30451bb.tar.gz
gsoc2013-evolution-9f9b8c590221d33530e23c33002058d5f30451bb.tar.zst
gsoc2013-evolution-9f9b8c590221d33530e23c33002058d5f30451bb.zip
EMailConfigNotebook: Minor code cleanup.
-rw-r--r--mail/e-mail-config-notebook.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/mail/e-mail-config-notebook.c b/mail/e-mail-config-notebook.c
index 5d04c47e01..4a9b62c426 100644
--- a/mail/e-mail-config-notebook.c
+++ b/mail/e-mail-config-notebook.c
@@ -299,12 +299,13 @@ mail_config_notebook_constructed (GObject *object)
ESourceExtension *extension;
ESourceMailIdentity *mail_identity_extension;
EMailConfigServiceBackend *backend;
- CamelProvider *provider;
+ CamelProvider *provider = NULL;
EMailSession *session;
EMailConfigPage *page;
const gchar *extension_name;
gboolean add_receiving_page = TRUE;
gboolean add_sending_page = TRUE;
+ gboolean add_transport_source;
notebook = E_MAIL_CONFIG_NOTEBOOK (object);
@@ -356,7 +357,8 @@ mail_config_notebook_constructed (GObject *object)
G_BINDING_SYNC_CREATE);
}
- provider = backend ? e_mail_config_service_backend_get_provider (backend) : NULL;
+ if (backend != NULL)
+ provider = e_mail_config_service_backend_get_provider (backend);
/*** Receiving Options (conditional) ***/
@@ -372,7 +374,11 @@ mail_config_notebook_constructed (GObject *object)
/*** Sending Page (conditional) ***/
- if (provider && !CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT (provider)) {
+ add_transport_source =
+ (provider != NULL) &&
+ (!CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT (provider));
+
+ if (add_transport_source) {
page = e_mail_config_sending_page_new (registry);
e_mail_config_service_page_add_scratch_source (
E_MAIL_CONFIG_SERVICE_PAGE (page),