aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2001-02-17 05:47:02 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2001-02-17 05:47:02 +0800
commit655140b4626c3d8faa2282600429660aa609fa8d (patch)
tree9627cabe75b7d3a0b1d7279373b11ff4f5ff0395 /mail
parentba86035ebe5219bbce901c8f37ea41635b9439bb (diff)
downloadgsoc2013-evolution-655140b4626c3d8faa2282600429660aa609fa8d.tar.gz
gsoc2013-evolution-655140b4626c3d8faa2282600429660aa609fa8d.tar.zst
gsoc2013-evolution-655140b4626c3d8faa2282600429660aa609fa8d.zip
Reverse the changes I made yesterday.
2001-02-16 Jeffrey Stedfast <fejj@ximian.com> * main.c: * component-factory.c: Reverse the changes I made yesterday. svn path=/trunk/; revision=8256
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/component-factory.c6
-rw-r--r--mail/main.c4
3 files changed, 10 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 1f4dd24e13..d968cc2fa5 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-16 Jeffrey Stedfast <fejj@ximian.com>
+
+ * main.c:
+ * component-factory.c: Reverse the changes I made yesterday.
+
2001-02-15 Jeffrey Stedfast <fejj@ximian.com>
* main.c (main): Have the mail-config and openpgp initialize here
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 4215f78c66..f2c977ab34 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -189,8 +189,12 @@ owner_set_cb (EvolutionShellComponent *shell_component,
evolution_dir = g_strdup (evolution_homedir);
mail_session_init ();
+ mail_config_init ();
+
+ openpgp_init (mail_config_get_pgp_path (), mail_config_get_pgp_type ());
+
storages_hash = g_hash_table_new (NULL, NULL);
-
+
vfolder_create_storage (shell_component);
corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
diff --git a/mail/main.c b/mail/main.c
index ad209f6004..6637ec5000 100644
--- a/mail/main.c
+++ b/mail/main.c
@@ -109,10 +109,6 @@ main (int argc, char *argv [])
mail_msg_init();
- mail_config_init ();
-
- openpgp_init (mail_config_get_pgp_path (), mail_config_get_pgp_type ());
-
component_factory_init ();
evolution_composer_factory_init (composer_send_cb,
composer_postpone_cb);