diff options
| -rw-r--r-- | mail/ChangeLog | 19 | ||||
| -rw-r--r-- | mail/main.c | 8 | ||||
| -rw-r--r-- | mail/session.c | 7 |
3 files changed, 24 insertions, 10 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 3ccc35fc5e..79ab88f32d 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2001-03-13 Jeffrey Stedfast <fejj@ximian.com> + + * session.c (mail_session_init): Call camel_init with the + evolution directory passed in. Also, abort if camel cannot be + initialized. + + * main.c (main): Shutdown camel. + 2001-03-04 Michael Meeks <michael@ximian.com> * folder-browser-factory.c (free_pixmaps): impl. @@ -5,17 +13,18 @@ 2001-03-13 Iain Holmes <iain@ximian.com> - * Makefile.am: Removed the importers and created a subdirectory for them to - live happily as plugins. + * Makefile.am: Removed the importers and created a subdirectory + for them to live happily as plugins. - * mail-importer.c (mail_importer_create_folder): Modified the function to take - a BonoboListener for the callback. + * mail-importer.c (mail_importer_create_folder): Modified the + function to take a BonoboListener for the callback. (get_importer_list): Get a list of importer plugins. (free_importer_list): Free the list of plugins. (mail_importer_init): Initalise the list of plugins. (main_importer_uninit): Unload the modules. - * GNOME_Evolution_Mail.oaf.in: Remove the oaf_server entries for the importers. + * GNOME_Evolution_Mail.oaf.in: Remove the oaf_server entries for + the importers. * importers/*: Copy the importers in here. diff --git a/mail/main.c b/mail/main.c index 2551815213..fdc718c200 100644 --- a/mail/main.c +++ b/mail/main.c @@ -86,7 +86,7 @@ main (int argc, char *argv []) bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR); textdomain (PACKAGE); - g_thread_init( NULL ); + g_thread_init (NULL); gnome_init_with_popt_table ("evolution-mail-component", VERSION, argc, argv, oaf_popt_options, 0, NULL); @@ -116,10 +116,10 @@ main (int argc, char *argv []) glade_gnome_init (); gnome_vfs_init (); - + e_cursors_init (); - mail_msg_init(); + mail_msg_init (); component_factory_init (); evolution_composer_factory_init (composer_send_cb, @@ -134,6 +134,8 @@ main (int argc, char *argv []) bonobo_main (); GDK_THREADS_LEAVE (); + camel_shutdown (); + mail_config_write_on_exit (); return 0; diff --git a/mail/session.c b/mail/session.c index 7cf7801cab..b38e235885 100644 --- a/mail/session.c +++ b/mail/session.c @@ -23,6 +23,7 @@ #include <config.h> #include <gnome.h> +#include <stdlib.h> #include "mail.h" #include "mail-session.h" #include "mail-mt.h" @@ -303,8 +304,10 @@ mail_session_init (void) { char *camel_dir, *key, *value; void *iter; - - camel_init (); + + if (camel_init (evolution_dir) != 0) + exit (0); + camel_dir = g_strdup_printf ("%s/mail", evolution_dir); session = camel_session_new (camel_dir, auth_callback, register_callback, remove_callback); |