Don't call e_setup_base_dir. It was wrong and it doesn't exist any more.

        * session.c (session_init): Don't call e_setup_base_dir. It was
        wrong and it doesn't exist any more.

        * component-factory.c (owner_set_cb): Update for changed
        prototype, and record the evolution_homedir. Move call to
        mail_config_init here from session.c so it happens after
        evolution_dir is initialized.

        * mail.h: define "extern char *evolution_dir;" (formerly in
        e-util/e-setup.h)

        * component-factory.c, mail-callbacks.c, mail-config-gui.c,
        mail-config.c, mail-display.c, mail-format.c, mail-ops.c,
        mail-tools.c, session.c: Remove "e-util/e-setup.h" include.

svn path=/trunk/; revision=4712

12 files changed, 24 insertions, 18 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index bd868a3246..23b60ea121 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,20 @@
+2000-08-10  Dan Winship  <danw@helixcode.com>
+
+	* session.c (session_init): Don't call e_setup_base_dir. It was
+	wrong and it doesn't exist any more.
+
+	* component-factory.c (owner_set_cb): Update for changed
+	prototype, and record the evolution_homedir. Move call to
+	mail_config_init here from session.c so it happens after
+	evolution_dir is initialized.
+
+	* mail.h: define "extern char *evolution_dir;" (formerly in
+	e-util/e-setup.h)
+
+	* component-factory.c, mail-callbacks.c, mail-config-gui.c,
+	mail-config.c, mail-display.c, mail-format.c, mail-ops.c,
+	mail-tools.c, session.c: Remove "e-util/e-setup.h" include.
+
 2000-08-10  Peter Williams  <peterw@helixcode.com>
 
 	* test-thread.c (queue_ops): Use mail_operations_terminate() to
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 2a96b11dfe..a88d4e6619 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -38,11 +38,11 @@
 #include "mail-tools.h"
 #include "mail-ops.h"
 #include "e-util/e-gui-utils.h"
-#include "e-util/e-setup.h"
 
 #include "component-factory.h"
 
 CamelFolder *drafts_folder = NULL;
+char *evolution_dir;
 
 static void create_vfolder_storage (EvolutionShellComponent *shell_component);
 static void create_imap_storage (EvolutionShellComponent *shell_component);
@@ -58,9 +58,6 @@ static const EvolutionShellComponentFolderType folder_types[] = {
 	{ NULL, NULL }
 };
 
-/* GROSS HACK: for passing to other parts of the program */
-/*EvolutionShellClient *global_shell_client = NULL;*/
-
 /* EvolutionShellComponent methods and signals.  */
 
 static EvolutionShellComponentResult
@@ -103,13 +100,14 @@ create_folder (EvolutionShellComponent *shell_component,
 static void
 owner_set_cb (EvolutionShellComponent *shell_component,
 	      EvolutionShellClient *shell_client,
+	      const char *evolution_homedir,
 	      gpointer user_data)
 {
 	g_print ("evolution-mail: Yeeeh! We have an owner!\n");	/* FIXME */
 	
-	/* GROSS HACK */
-	/*global_shell_client = shell_client;*/
+	evolution_dir = g_strdup (evolution_homedir);
 	
+	mail_config_init ();
 	mail_do_setup_draftbox ();
 	create_vfolder_storage (shell_component);
 	create_imap_storage (shell_component);
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index b92abacba1..7013fa7a65 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -36,7 +36,6 @@
 #include "mail-ops.h"
 #include "mail-local.h"
 #include "folder-browser.h"
-#include "e-util/e-setup.h"
 #include "filter/filter-editor.h"
 #include "filter/filter-driver.h"
 #include "widgets/e-table/e-table.h"
diff --git a/mail/mail-config-gui.c b/mail/mail-config-gui.c
index 7ebcb09c6a..d7520efb23 100644
--- a/mail/mail-config-gui.c
+++ b/mail/mail-config-gui.c
@@ -33,7 +33,6 @@
 #include <glade/glade.h>
 
 #include "e-util/e-html-utils.h"
-#include "e-util/e-setup.h"
 #include "mail.h"
 #include "mail-config.h"
 #include "mail-config-gui.h"
diff --git a/mail/mail-config.c b/mail/mail-config.c
index b3f8b6ea04..a55f43711e 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -33,7 +33,7 @@
 #include <glade/glade.h>
 
 #include "e-util/e-html-utils.h"
-#include "e-util/e-setup.h"
+#include "mail.h"
 #include "mail-config.h"
 
 static const char GCONFPATH[] = "/apps/Evolution/Mail";
diff --git a/mail/mail-display.c b/mail/mail-display.c
index f32887c3de..e22010b202 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -14,7 +14,6 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <gnome.h>
-#include "e-util/e-setup.h"
 #include "e-util/e-util.h"
 #include "e-util/e-html-utils.h"
 #include "mail-display.h"
diff --git a/mail/mail-format.c b/mail/mail-format.c
index 95d595fef9..eab8fdc018 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -27,7 +27,6 @@
 #include "mail-display.h"
 #include "mail.h"
 #include "e-util/e-html-utils.h"
-#include "e-util/e-setup.h" /*for evolution_dir*/
 #include <libgnome/libgnome.h>
 #include <libgnomevfs/gnome-vfs-mime-info.h>
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index e732f887c6..8ba2d9ee31 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -30,7 +30,6 @@
 #include "mail-threads.h"
 #include "mail-tools.h"
 #include "mail-ops.h"
-#include "e-util/e-setup.h"
 #include "composer/e-msg-composer.h"
 
 /* ** FETCH MAIL ********************************************************** */
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index e44d42a4df..de4be18a07 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -29,7 +29,6 @@
 #include <errno.h>
 #include "camel/camel.h"
 #include "camel/providers/vee/camel-vee-folder.h"
-#include "e-util/e-setup.h"
 #include "mail-vfolder.h"
 #include "filter/vfolder-rule.h"
 #include "filter/vfolder-context.h"
diff --git a/mail/mail.h b/mail/mail.h
index 2bc829dc36..9e0e19e1ce 100644
--- a/mail/mail.h
+++ b/mail/mail.h
@@ -25,8 +25,9 @@
 #include "mail-config-gui.h"
 #include "folder-browser.h"
 
-/* FIXME FIXME FIXME this sucks sucks sucks sucks */
+extern char *evolution_dir;
 
+/* FIXME FIXME FIXME this sucks sucks sucks sucks */
 /* folder-browser-factory */
 void           folder_browser_factory_init         (void);
 BonoboControl *folder_browser_factory_new_control  (const char *uri);
diff --git a/mail/main.c b/mail/main.c
index 372abf8b8a..3f59984ad7 100644
--- a/mail/main.c
+++ b/mail/main.c
@@ -54,7 +54,6 @@ main (int argc, char *argv [])
 	session_init ();
 	e_cursors_init ();
 
-	mail_config_init ();
 	component_factory_init ();
 
 	GDK_THREADS_ENTER ();
diff --git a/mail/session.c b/mail/session.c
index 3c5d52abb0..eaa5d72dfa 100644
--- a/mail/session.c
+++ b/mail/session.c
@@ -10,7 +10,6 @@
 #include <gnome.h>
 #include "mail.h"
 #include "mail-threads.h"
-#include "e-util/e-setup.h"
 
 CamelSession *session;
 GHashTable *passwords;
@@ -201,9 +200,7 @@ remove_callback (guint handle)
 void
 session_init (void)
 {
-	e_setup_base_dir ();
 	camel_init ();
-
 	session = camel_session_new (auth_callback, register_callback, 
 				     remove_callback);
 }