[evolution] Start migration -after- loading all modules and plugins.

[Matthew Barnes <mbarnes src gnome org>]

commit 8f0093b0d8c8b45390353243515b7dfb8eeabf93
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Sep 1 16:52:04 2009 -0400

    Start migration -after- loading all modules and plugins.

 shell/e-shell.c |    3 ---
 shell/main.c    |    5 +++++
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 75b6655..d2a8267 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -30,7 +30,6 @@
 #include "widgets/misc/e-preferences-window.h"
 
 #include "e-shell-backend.h"
-#include "e-shell-migrate.h"
 #include "e-shell-window.h"
 
 #define E_SHELL_GET_PRIVATE(obj) \
@@ -598,8 +597,6 @@ shell_constructed (GObject *object)
 
 	shell_load_modules (E_SHELL (object));
 	shell_create_backends (E_SHELL (object));
-
-	e_shell_migrate_attempt (E_SHELL (object));
 }
 
 static gboolean
diff --git a/shell/main.c b/shell/main.c
index 72333c1..eadb348 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -45,6 +45,7 @@
 #include "e-util/e-util.h"
 
 #include "e-shell.h"
+#include "e-shell-migrate.h"
 #include "es-event.h"
 
 #include "e-util/e-util-private.h"
@@ -590,6 +591,10 @@ main (gint argc, gchar **argv)
 		e_plugin_load_plugins ();
 	}
 
+	/* Attempt migration -after- loading all modules and plugins,
+	 * as both shell backends and certain plugins hook into this. */
+	e_shell_migrate_attempt (default_shell);
+
 	gtk_main ();
 
 	/* Drop what should be the last reference to the shell.