aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2001-02-16 12:26:05 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2001-02-16 12:26:05 +0800
commitd9985a41bb77a929ff8628c0859f927169d297a3 (patch)
tree578738b36b7bfeb5064326da73ff1b4dded73c25
parentb8abfcbc33cc06382bb73d79a1309d559966627d (diff)
downloadgsoc2013-evolution-d9985a41bb77a929ff8628c0859f927169d297a3.tar.gz
gsoc2013-evolution-d9985a41bb77a929ff8628c0859f927169d297a3.tar.zst
gsoc2013-evolution-d9985a41bb77a929ff8628c0859f927169d297a3.zip
Have the mail-config and openpgp initialize here instead.
2001-02-15 Jeffrey Stedfast <fejj@ximian.com> * main.c (main): Have the mail-config and openpgp initialize here instead. * component-factory.c (owner_set_cb): No need to have mail-config and openpgp init here. svn path=/trunk/; revision=8250
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/component-factory.c3
-rw-r--r--mail/main.c6
3 files changed, 13 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index df213da3d6..1f4dd24e13 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,13 @@
2001-02-15 Jeffrey Stedfast <fejj@ximian.com>
+ * main.c (main): Have the mail-config and openpgp initialize here
+ instead.
+
+ * component-factory.c (owner_set_cb): No need to have mail-config
+ and openpgp init here.
+
+2001-02-15 Jeffrey Stedfast <fejj@ximian.com>
+
* mail-ops.c (do_scan_subfolders): Use mail_storage_create_folder
* mail-callbacks.c (mail_storage_create_folder): Convenience
diff --git a/mail/component-factory.c b/mail/component-factory.c
index fef109679f..4215f78c66 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -188,9 +188,6 @@ 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);
diff --git a/mail/main.c b/mail/main.c
index c8644103b4..ad209f6004 100644
--- a/mail/main.c
+++ b/mail/main.c
@@ -108,7 +108,11 @@ main (int argc, char *argv [])
e_cursors_init ();
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);