Defer the load / creation of configuration UI with changes to

e_preferences_window to take factory callbacks and store a reference
to the shell. - This makes start-up substantially faster, particularly
on Atom (eg.).

Remove a number of idle handlers used to create these UIs in the
first instance, cleaning the code.

1 files changed, 10 insertions, 2 deletions

diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c
index 6f3861dad0..d4bf995b90 100644
--- a/modules/addressbook/e-book-shell-backend.c
+++ b/modules/addressbook/e-book-shell-backend.c
@@ -301,9 +301,18 @@ book_shell_backend_init_preferences (EShell *shell)
 		"contacts",
 		"preferences-autocompletion",
 		_("Contacts"),
-		autocompletion_config_new (shell),
+		autocompletion_config_new,
 		200);
 
+	preferences_window = e_shell_get_preferences_window (shell);
+	e_preferences_window_add_page (
+		E_PREFERENCES_WINDOW (preferences_window),
+		"certificates",
+		"preferences-certificates",
+		_("Certificates"),
+		certificate_manager_config_new,
+		700);
+
 	return FALSE;
 }
 
@@ -460,7 +469,6 @@ book_shell_backend_constructed (GObject *object)
 	 *     things that use S/MIME.  Maybe put it in EShell? */
 #ifdef ENABLE_SMIME
 	smime_component_init ();
-	certificate_manager_config_init (shell);
 #endif
 
 	book_shell_backend_init_importers ();