aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/component-factory.c3
-rw-r--r--mail/main.c1
-rw-r--r--mail/session.c8
4 files changed, 16 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 58c5f4226d..51f632dc78 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,13 @@
2000-09-07 Dan Winship <danw@helixcode.com>
+ * session.c (session_init): Pass a storage dir to
+ camel_session_new now.
+
+ * main.c (main): Can't call session_init here now, because it
+ requires evolution_dir to be set.
+
+ * component-factory.c (owner_set_cb): call session_init here.
+
* mail-ops.c (do_fetch_mail): Fix previous fix. (Free the uids,
just do it correctly.)
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 608328c133..c874cdeec9 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -115,7 +115,8 @@ owner_set_cb (EvolutionShellComponent *shell_component,
g_print ("evolution-mail: Yeeeh! We have an owner!\n"); /* FIXME */
evolution_dir = g_strdup (evolution_homedir);
-
+ session_init ();
+
mail_config_init ();
mail_do_setup_folder ("Drafts", &drafts_folder);
mail_do_setup_folder ("Outbox", &outbox_folder);
diff --git a/mail/main.c b/mail/main.c
index 0ab58f9a3d..cd9c6e7d6e 100644
--- a/mail/main.c
+++ b/mail/main.c
@@ -60,7 +60,6 @@ main (int argc, char *argv [])
e_unicode_init ();
- session_init ();
e_cursors_init ();
component_factory_init ();
diff --git a/mail/session.c b/mail/session.c
index 09416b0825..e3dcbd541b 100644
--- a/mail/session.c
+++ b/mail/session.c
@@ -189,9 +189,13 @@ remove_callback (guint handle)
void
session_init (void)
{
+ char *camel_dir;
+
camel_init ();
- session = camel_session_new (auth_callback, register_callback,
- remove_callback);
+ camel_dir = g_strdup_printf ("%s/mail", evolution_dir);
+ session = camel_session_new (camel_dir, auth_callback,
+ register_callback, remove_callback);
+ g_free (camel_dir);
}
static gboolean