Merge revisions 37047:37074 from trunk.

svn path=/branches/kill-bonobo/; revision=37075

1 files changed, 8 insertions, 0 deletions

diff --git a/shell/main.c b/shell/main.c
index b57ef0777d..6272b6ad18 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -327,6 +327,14 @@ idle_cb (gchar **uris)
 	}
 #endif
 
+	/* This must be done after Bonobo has created all the components. For 
+	 * example the mail component makes the global variable `session` which
+	 * is being used by several EPlugins */
+
+	if (!disable_eplugin) {
+		e_plugin_load_plugins_with_missing_symbols ();
+	}
+
 	return FALSE;
 }