This is no longer necessary.

	* session.c (session_providers_init): This is no longer necessary.

	* mail-ops.c (fetch_mail): Remove kludge to load remote provider,
	as camel can do it by itself now.

svn path=/trunk/; revision=2692

3 files changed, 8 insertions, 20 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index aae11b2708..d4ebf0808d 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2000-04-30  Dan Winship  <danw@helixcode.com>
+
+	* session.c (session_providers_init): This is no longer necessary.
+
+	* mail-ops.c (fetch_mail): Remove kludge to load remote provider,
+	as camel can do it by itself now.
+
 2000-04-29  Dan Winship  <danw@helixcode.com>
 
 	* mail-display.c (on_link_clicked): Handle clicks on "cid" URLs by
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 9a7f41611d..961f82304e 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -60,7 +60,7 @@ fetch_mail (GtkWidget *button, gpointer user_data)
 	CamelFolder *folder = NULL, *outfolder = NULL;
 	int nmsgs, i;
 	CamelMimeMessage *msg = NULL;
-	char *path, *url = NULL, *provider;
+	char *path, *url = NULL;
 	gboolean get_remote;
 
 	window = GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (fb),
@@ -81,18 +81,6 @@ fetch_mail (GtkWidget *button, gpointer user_data)
 		return;
 	}
 
-	/* FIXME: this should go away when the provider situation is
-	 * improved.
-	 */
-	path = g_strdup_printf ("=%s/config=/mail/remote_provider",
-				evolution_dir);
-	provider = gnome_config_get_string_with_default (path, NULL);
-	g_free (path);
-	if (provider) {
-		camel_provider_register_as_module (provider);
-		g_free (provider);
-	}
-
 	ex = camel_exception_new ();
 
 	/* If fetching mail from an mbox store, safely copy it to a
diff --git a/mail/session.c b/mail/session.c
index 1005d9cd4e..f1d39dab46 100644
--- a/mail/session.c
+++ b/mail/session.c
@@ -53,12 +53,6 @@ evolution_auth_callback (char *prompt, gboolean secret,
 	return ans;
 }
 
-static void
-session_providers_init (void)
-{
-	camel_provider_register_as_module (CAMEL_PROVIDERDIR "/libcamelmbox.so");
-}
-
 SessionStore *
 session_store_new (const char *uri)
 {
@@ -102,7 +96,6 @@ session_init (void)
 {
 	e_setup_base_dir ();
 	camel_init ();
-	session_providers_init ();
 
 	init_default_session ();
 }