1 files changed, 0 insertions, 85 deletions

diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c
index 35c561ed50..e6fd53b576 100644
--- a/capplet/settings/mail-account-view.c
+++ b/capplet/settings/mail-account-view.c
@@ -33,7 +33,6 @@
 #include "mail-view.h"
 #include "e-util/e-config.h"
 #include "mail/e-mail-backend.h"
-#include "mail-guess-servers.h"
 
 struct _MailAccountViewPrivate {
 	GtkWidget *tab_str;
@@ -970,89 +969,6 @@ mav_construct_page (MailAccountView *view,
 	return (GtkWidget *) page;
 }
 
-static ServerData *
-emae_check_servers (const gchar *email)
-{
-	ServerData *sdata = g_new0 (ServerData, 1);
-	EmailProvider *provider = g_new0 (EmailProvider, 1);
-	gchar *dupe = g_strdup (email);
-	gchar *tmp;
-
-	/* FIXME: Find a way to free the provider once given to account settings. */
-	provider->email = (gchar *) email;
-	tmp = strchr (email, '@');
-	tmp++;
-	provider->domain = tmp;
-	tmp = strchr (dupe, '@');
-	*tmp = 0;
-	provider->username = (gchar *) g_quark_to_string (g_quark_from_string (dupe));
-	g_free (dupe);
-
-	if (!mail_guess_servers (provider)) {
-		g_free (provider);
-		g_free (sdata);
-		return NULL;
-	}
-	/*printf("Recv: %s\n%s(%s), %s by %s \n Send: %s\n%s(%s), %s by %s\n via %s to %s\n",
-	  provider->recv_type, provider->recv_hostname, provider->recv_port, provider->recv_username, provider->recv_auth,
-	  provider->send_type, provider->send_hostname, provider->send_port, provider->send_username, provider->send_auth,
-	  provider->recv_socket_type, provider->send_socket_type); */
-
-	sdata->recv = provider->recv_hostname;
-	sdata->recv_port = provider->recv_port;
-	sdata->send = provider->send_hostname;
-	sdata->send_port = provider->send_port;
-	if (strcmp (provider->recv_type, "pop3") == 0)
-		sdata->proto = g_strdup ("pop");
-	else if (strcmp (provider->recv_type, "imap") == 0)
-		sdata->proto = g_strdup ("imapx");
-	else
-		sdata->proto = provider->recv_type;
-	if (provider->recv_socket_type) {
-		CamelNetworkSecurityMethod method;
-
-		if (g_ascii_strcasecmp (provider->recv_socket_type, "SSL") == 0)
-			method = CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT;
-		else if (g_ascii_strcasecmp (provider->recv_socket_type, "secure") == 0)
-			method = CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT;
-		else if (g_ascii_strcasecmp (provider->recv_socket_type, "STARTTLS") == 0)
-			method = CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT;
-		else if (g_ascii_strcasecmp (provider->recv_socket_type, "TLS") == 0)
-			method = CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT;
-		else
-			method = CAMEL_NETWORK_SECURITY_METHOD_NONE;
-
-		sdata->security_method = method;
-		sdata->recv_security_method = method;
-	}
-
-	if (provider->send_socket_type) {
-		CamelNetworkSecurityMethod method;
-
-		if (g_ascii_strcasecmp (provider->send_socket_type, "SSL") == 0)
-			method = CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT;
-		else if (g_ascii_strcasecmp (provider->send_socket_type, "secure") == 0)
-			method = CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT;
-		else if (g_ascii_strcasecmp (provider->send_socket_type, "STARTTLS") == 0)
-			method = CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT;
-		else if (g_ascii_strcasecmp (provider->send_socket_type, "TLS") == 0)
-			method = CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT;
-		else
-			method = CAMEL_NETWORK_SECURITY_METHOD_NONE;
-
-		sdata->send_security_method = method;
-	}
-
-	sdata->send_auth = provider->send_auth;
-	sdata->recv_auth = provider->recv_auth;
-	sdata->send_user = provider->send_username;
-	sdata->recv_user = provider->recv_username;
-
-	g_free (provider);
-
-	return sdata;
-}
-
 static void
 next_page (GtkWidget *entry,
            MailAccountView *mav)
@@ -1088,7 +1004,6 @@ mail_account_view_construct (MailAccountView *view,
 		view->original, EMAE_PAGES, backend,
 		"org.gnome.evolution.mail.config.accountWizard", view->wpages);
 	gtk_widget_hide (e_config_create_widget (E_CONFIG (view->edit->config)));
-	view->edit->emae_check_servers = emae_check_servers;
 	if (!view->original) {
 		e_account_set_bool (em_account_editor_get_modified_account (view->edit), E_ACCOUNT_SOURCE_SAVE_PASSWD, TRUE);
 		e_account_set_bool (em_account_editor_get_modified_account (view->edit), E_ACCOUNT_TRANSPORT_SAVE_PASSWD, TRUE);