diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-11-08 18:49:23 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-11-08 20:23:36 +0800 |
| commit | e8797d1ed9a99e13fc3f5fdaac0cfc8869d2839a (patch) | |
| tree | 542e989ba42f7c863f1496fdf6f91d40aeeafb5a /mail/e-mail-config-assistant.c | |
| parent | acd6a6aed81cdb92775ab1ceb16145cbe9f34097 (diff) | |
| download | gsoc2013-evolution-e8797d1ed9a99e13fc3f5fdaac0cfc8869d2839a.tar gsoc2013-evolution-e8797d1ed9a99e13fc3f5fdaac0cfc8869d2839a.tar.gz gsoc2013-evolution-e8797d1ed9a99e13fc3f5fdaac0cfc8869d2839a.tar.bz2 gsoc2013-evolution-e8797d1ed9a99e13fc3f5fdaac0cfc8869d2839a.tar.lz gsoc2013-evolution-e8797d1ed9a99e13fc3f5fdaac0cfc8869d2839a.tar.xz gsoc2013-evolution-e8797d1ed9a99e13fc3f5fdaac0cfc8869d2839a.tar.zst gsoc2013-evolution-e8797d1ed9a99e13fc3f5fdaac0cfc8869d2839a.zip | |
Revert "Bug #686620 - Add an option to skip New Account autodiscovery"
This reverts commit 039c29c112179ad92233f0a85b7332ad2f2dd373.
Auto-configuration should instead be cancellable from the progress page.
Diffstat (limited to 'mail/e-mail-config-assistant.c')
| -rw-r--r-- | mail/e-mail-config-assistant.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/mail/e-mail-config-assistant.c b/mail/e-mail-config-assistant.c index 515be98106..407d076f80 100644 --- a/mail/e-mail-config-assistant.c +++ b/mail/e-mail-config-assistant.c @@ -46,7 +46,6 @@ struct _EMailConfigAssistantPrivate { EMailConfigServicePage *receiving_page; EMailConfigServicePage *sending_page; EMailConfigSummaryPage *summary_page; - EMailConfigPage *identity_page; EMailConfigPage *lookup_page; GHashTable *visited_pages; gboolean auto_configure_done; @@ -452,11 +451,6 @@ mail_config_assistant_dispose (GObject *object) priv->lookup_page = NULL; } - if (priv->identity_page != NULL) { - g_object_unref (priv->identity_page); - priv->identity_page = NULL; - } - g_ptr_array_set_size (priv->account_sources, 0); g_ptr_array_set_size (priv->transport_sources, 0); @@ -494,7 +488,6 @@ mail_config_assistant_constructed (GObject *object) ESourceMailSubmission *mail_submission_extension; EMailSession *session; EMailConfigPage *page; - GtkWidget *autodiscover_check; GList *list, *link; const gchar *extension_name; const gchar *title; @@ -557,12 +550,7 @@ mail_config_assistant_constructed (GObject *object) E_MAIL_CONFIG_IDENTITY_PAGE (page), FALSE); e_mail_config_identity_page_set_show_signatures ( E_MAIL_CONFIG_IDENTITY_PAGE (page), FALSE); - e_mail_config_identity_page_set_show_autodiscover_check ( - E_MAIL_CONFIG_IDENTITY_PAGE (page), TRUE); - autodiscover_check = e_mail_config_identity_page_get_autodiscover_check ( - E_MAIL_CONFIG_IDENTITY_PAGE (page)); e_mail_config_assistant_add_page (assistant, page); - assistant->priv->identity_page = g_object_ref (page); /*** Lookup Page ***/ @@ -570,11 +558,6 @@ mail_config_assistant_constructed (GObject *object) e_mail_config_assistant_add_page (assistant, page); assistant->priv->lookup_page = g_object_ref (page); - g_object_bind_property ( - autodiscover_check, "active", - page, "visible", - G_BINDING_SYNC_CREATE); - /*** Receiving Page ***/ page = e_mail_config_receiving_page_new (registry); @@ -809,12 +792,6 @@ mail_config_assistant_prepare (GtkAssistant *assistant, email_address = e_source_mail_identity_get_address (extension); e_source_set_display_name (source, email_address); } - - if (first_visit && ( - E_IS_MAIL_CONFIG_LOOKUP_PAGE (page) || - E_IS_MAIL_CONFIG_RECEIVING_PAGE (page))) - e_mail_config_identity_page_set_show_autodiscover_check ( - E_MAIL_CONFIG_IDENTITY_PAGE (priv->identity_page), FALSE); } static void |