aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorPhilip Van hoof <philip@codeminded.be>2009-01-12 16:44:53 +0800
committerPhilip Van Hoof <pvanhoof@src.gnome.org>2009-01-12 16:44:53 +0800
commit79e0bf750c12b043aae5a99e0d95d48e28680073 (patch)
tree3ef1ed90e61110a0696c5b304a153f9243af7dd5 /shell
parent66ea0e4652494beaf42ee198943d2dfc6cab7d8a (diff)
downloadgsoc2013-evolution-79e0bf750c12b043aae5a99e0d95d48e28680073.tar
gsoc2013-evolution-79e0bf750c12b043aae5a99e0d95d48e28680073.tar.gz
gsoc2013-evolution-79e0bf750c12b043aae5a99e0d95d48e28680073.tar.bz2
gsoc2013-evolution-79e0bf750c12b043aae5a99e0d95d48e28680073.tar.lz
gsoc2013-evolution-79e0bf750c12b043aae5a99e0d95d48e28680073.tar.xz
gsoc2013-evolution-79e0bf750c12b043aae5a99e0d95d48e28680073.tar.zst
gsoc2013-evolution-79e0bf750c12b043aae5a99e0d95d48e28680073.zip
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
Diffstat (limited to 'shell')
-rw-r--r--shell/main.c10
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