[evolution-data-server] GOA: Handle IMAP/SMTP settings before handling OAuth settings.

[Matthew Barnes <mbarnes src gnome org>]

commit f3575e7988789520924ea11eeb6dd8bf84c842f9
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Aug 15 09:11:58 2013 -0400

    GOA: Handle IMAP/SMTP settings before handling OAuth settings.
    
    To make sure IMAP/SMTP settings don't override OAuth settings.

 .../module-gnome-online-accounts.c                 |   28 +++-----------------
 1 files changed, 4 insertions(+), 24 deletions(-)
---
diff --git a/modules/gnome-online-accounts/module-gnome-online-accounts.c 
b/modules/gnome-online-accounts/module-gnome-online-accounts.c
index 66001ac..2b1f87f 100644
--- a/modules/gnome-online-accounts/module-gnome-online-accounts.c
+++ b/modules/gnome-online-accounts/module-gnome-online-accounts.c
@@ -649,22 +649,12 @@ gnome_online_accounts_config_mail_account (EGnomeOnlineAccounts *extension,
 {
        EServerSideSource *server_side_source;
 
+       gnome_online_accounts_config_imap (extension, source, goa_object);
+
        /* Only one or the other should be present, not both. */
        gnome_online_accounts_config_oauth (extension, source, goa_object);
        gnome_online_accounts_config_oauth2 (extension, source, goa_object);
 
-       /* XXX Need to defer the network security settings to the
-        *     provider-specific module since "imap-use-tls" tells
-        *     us neither the port number, nor whether to use IMAP
-        *     over SSL versus STARTTLS.  The module will know.
-        *
-        *     Addendum: This got fixed in GOA 3.8.  There's now both
-        *               "imap-use-tls" and "imap-use-ssl" properties.
-        *               Go ahead and set up IMAP details here if we
-        *               have GOA 3.8, otherwise continue deferring
-        *               to provider-specific modules. */
-       gnome_online_accounts_config_imap (extension, source, goa_object);
-
        /* Clients may change the source by may not remove it. */
        server_side_source = E_SERVER_SIDE_SOURCE (source);
        e_server_side_source_set_writable (server_side_source, TRUE);
@@ -707,22 +697,12 @@ gnome_online_accounts_config_mail_transport (EGnomeOnlineAccounts *extension,
 {
        EServerSideSource *server_side_source;
 
+       gnome_online_accounts_config_smtp (extension, source, goa_object);
+
        /* Only one or the other should be present, not both. */
        gnome_online_accounts_config_oauth (extension, source, goa_object);
        gnome_online_accounts_config_oauth2 (extension, source, goa_object);
 
-       /* XXX Need to defer the network security settings to the
-        *     provider-specific module since "smtp-use-tls" tells
-        *     us neither the port number, nor whether to use SMTP
-        *     over SSL versus STARTTLS.  The module will know.
-        *
-        *     Addendum: This got fixed in GOA 3.8.  There's now both
-        *               "smtp-use-tls" and "smtp-use-ssl" properties.
-        *               Go ahead and set up SMTP details here if we
-        *               have GOA 3.8, otherwise continue deferring
-        *               to provider-specific modules. */
-       gnome_online_accounts_config_smtp (extension, source, goa_object);
-
        /* Clients may change the source by may not remove it. */
        server_side_source = E_SERVER_SIDE_SOURCE (source);
        e_server_side_source_set_writable (server_side_source, TRUE);