aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2011-11-15 23:19:00 +0800
committerMilan Crha <mcrha@redhat.com>2011-11-15 23:19:00 +0800
commita252955be647fbe189d371f936cb74164e9731fc (patch)
treec0f8ce6f905fc9213ff7ff1826fbd7de6e6c5194
parent5fc51b95fe98fb7a08afe58e81837d3ec09fa763 (diff)
downloadgsoc2013-evolution-a252955be647fbe189d371f936cb74164e9731fc.tar.gz
gsoc2013-evolution-a252955be647fbe189d371f936cb74164e9731fc.tar.zst
gsoc2013-evolution-a252955be647fbe189d371f936cb74164e9731fc.zip
Bug #664001 - Account setup asks to configure SMTP when not needed
-rw-r--r--mail/em-account-editor.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 0ef2378acc..c1953b6f48 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -3586,13 +3586,10 @@ emae_send_page (EConfig *ec,
GtkWidget *w;
GtkBuilder *builder;
- provider = emae_get_transport_provider (emae);
-
- if (provider == NULL)
- return NULL;
+ provider = emae_get_store_provider (emae);
/* no transport options page at all for these types of providers */
- if (CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT (provider)) {
+ if (provider && CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT (provider)) {
memset (&priv->transport.frame, 0, ((gchar *) &priv->transport.check_dialog) - ((gchar *) &priv->transport.frame));
return NULL;
}
@@ -4760,13 +4757,18 @@ emae_check_complete (EConfig *ec,
}
if (ok && (pageid == NULL || !strcmp (pageid, "30.send"))) {
- if (emae->type != EMAE_NOTEBOOK && refresh) {
- emae_refresh_providers (emae, &emae->priv->transport);
- emae_provider_changed (emae->priv->transport.providers, &emae->priv->transport);
- }
- ok = emae_service_complete (emae, &emae->priv->transport);
- if (!ok) {
- d (printf ("send page incomplete\n"));
+ CamelProvider *provider;
+
+ provider = emae_get_store_provider (emae);
+ if (!provider || !CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT (provider)) {
+ if (emae->type != EMAE_NOTEBOOK && refresh) {
+ emae_refresh_providers (emae, &emae->priv->transport);
+ emae_provider_changed (emae->priv->transport.providers, &emae->priv->transport);
+ }
+ ok = emae_service_complete (emae, &emae->priv->transport);
+ if (!ok) {
+ d (printf ("send page incomplete\n"));
+ }
}
}