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

1 files changed, 4 insertions, 6 deletions

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);