diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-02-01 05:14:49 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-02-01 06:39:05 +0800 |
| commit | fd43cd692ad12e7f9c70386c1b0867b16f9ec15d (patch) | |
| tree | 7de35780745b82c9655e0bbc87945f36368c4643 /mail/e-mail-config-notebook.c | |
| parent | fc3bf6f39e7215df6325515afff3217aedb2cc10 (diff) | |
| download | gsoc2013-evolution-fd43cd692ad12e7f9c70386c1b0867b16f9ec15d.tar gsoc2013-evolution-fd43cd692ad12e7f9c70386c1b0867b16f9ec15d.tar.gz gsoc2013-evolution-fd43cd692ad12e7f9c70386c1b0867b16f9ec15d.tar.bz2 gsoc2013-evolution-fd43cd692ad12e7f9c70386c1b0867b16f9ec15d.tar.lz gsoc2013-evolution-fd43cd692ad12e7f9c70386c1b0867b16f9ec15d.tar.xz gsoc2013-evolution-fd43cd692ad12e7f9c70386c1b0867b16f9ec15d.tar.zst gsoc2013-evolution-fd43cd692ad12e7f9c70386c1b0867b16f9ec15d.zip | |
Incorporate ESourceUOA.
Where we make exceptions for GNOME Online Accounts, so too shall we for
Ubuntu Online Accounts.
Diffstat (limited to 'mail/e-mail-config-notebook.c')
| -rw-r--r-- | mail/e-mail-config-notebook.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/mail/e-mail-config-notebook.c b/mail/e-mail-config-notebook.c index 0aff802df5..fd43b20c7e 100644 --- a/mail/e-mail-config-notebook.c +++ b/mail/e-mail-config-notebook.c @@ -311,7 +311,7 @@ mail_config_notebook_constructed (GObject *object) gboolean add_receiving_page = TRUE; gboolean add_sending_page = TRUE; gboolean add_transport_source; - gboolean gnome_online_account = FALSE; + gboolean online_account = FALSE; notebook = E_MAIL_CONFIG_NOTEBOOK (object); @@ -328,13 +328,21 @@ mail_config_notebook_constructed (GObject *object) mail_identity_extension = E_SOURCE_MAIL_IDENTITY (extension); /* If we have a collection source and the collection source - * has a [GNOME Online Accounts] extension, skip the Receiving - * and Sending pages since GOA dictates those settings. */ + * has a [GNOME Online Accounts] or [Ubuntu Online Accounts] + * extension, skip the Receiving and Sending pages since GOA + * and UOA dictates those settings. */ source = notebook->priv->collection_source; if (source != NULL) { extension_name = E_SOURCE_EXTENSION_GOA; if (e_source_has_extension (source, extension_name)) { - gnome_online_account = TRUE; + online_account = TRUE; + add_receiving_page = FALSE; + add_sending_page = FALSE; + } + + extension_name = E_SOURCE_EXTENSION_UOA; + if (e_source_has_extension (source, extension_name)) { + online_account = TRUE; add_receiving_page = FALSE; add_sending_page = FALSE; } @@ -367,7 +375,7 @@ mail_config_notebook_constructed (GObject *object) registry, notebook->priv->identity_source); e_mail_config_identity_page_set_show_instructions ( E_MAIL_CONFIG_IDENTITY_PAGE (page), FALSE); - if (gnome_online_account) { + if (online_account) { e_mail_config_identity_page_set_show_account_info ( E_MAIL_CONFIG_IDENTITY_PAGE (page), FALSE); e_mail_config_identity_page_set_show_email_address ( |