From 6865817188d8f20ed7191697a0c62058d28466e5 Mon Sep 17 00:00:00 2001
From: Chenthill Palanisamy <pchenthill@novell.com>
Date: Wed, 26 May 2010 15:50:09 +0530
Subject: Bug 576165 - SIGSEGV in e_plugin_mono_register_type (bnc)

---
 modules/plugin-mono/e-plugin-mono.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/plugin-mono/e-plugin-mono.c b/modules/plugin-mono/e-plugin-mono.c
index f1fe76ff49..eb4b60cf97 100644
--- a/modules/plugin-mono/e-plugin-mono.c
+++ b/modules/plugin-mono/e-plugin-mono.c
@@ -121,6 +121,11 @@ plugin_mono_invoke (EPlugin *plugin,
 	plugin_mono = E_PLUGIN_MONO (plugin);
 	priv = plugin_mono->priv;
 
+	if (!domain) {
+		mono_config_parse (NULL);
+		domain = mono_jit_init (plugin_mono->location);
+	}
+	
 	/* We need to do this every time since we may
 	 * be called from any thread for some uses. */
 	mono_thread_attach (domain);
@@ -258,7 +263,4 @@ e_plugin_mono_register_type (GTypeModule *type_module)
 	plugin_mono_type = g_type_module_register_type (
 		type_module, E_TYPE_PLUGIN,
 		"EPluginMono", &type_info, 0);
-
-	domain = mono_jit_init ("Evolution");
-	mono_thread_attach (domain);
 }
-- 
cgit v1.2.3