e-util/e-plugin.c e-util/e-plugin.h EPlugins must be loaded after Bonobo

2009-01-12  Philip Van hoof  <philip@codeminded.be>

	* e-util/e-plugin.c
	* e-util/e-plugin.h
	* shell/main.c: EPlugins must be loaded after Bonobo init, else variables
	like `session` are not available for plugin's initialization functions.
	(Fixes Bug #565681)


svn path=/trunk/; revision=37052

1 files changed, 9 insertions, 1 deletions

diff --git a/shell/main.c b/shell/main.c
index 3590c315c4..2abd30eec1 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -396,6 +396,14 @@ idle_cb (gchar **uris)
 		bonobo_main_quit ();
 	}
 
+	/* 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;
 }
 
@@ -674,7 +682,7 @@ main (int argc, char **argv)
 		e_plugin_hook_register_type(e_plugin_type_hook_get_type());
 		e_plugin_hook_register_type(e_import_hook_get_type());
 		e_plugin_hook_register_type(E_TYPE_PLUGIN_UI_HOOK);
-		e_plugin_load_plugins();
+		e_plugin_load_plugins ();
 	}
 
 #ifdef DEVELOPMENT