Dominique Leuenberger
6f404ed142
Copy from home:dimstar:branches:GNOME:Factory/evolution via accept of submit request 40691 revision 3. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/40691 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=82
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From 87a71a63d78207cb17b1fb0f1ac98e8e57289469 Mon Sep 17 00:00:00 2001
|
|
From: Chenthill Palanisamy <pchenthill@novell.com>
|
|
Date: Wed, 26 May 2010 10:20:09 +0000
|
|
Subject: Bug 576165 - SIGSEGV in e_plugin_mono_register_type (bnc)
|
|
|
|
---
|
|
diff --git a/modules/plugin-mono/e-plugin-mono.c b/modules/plugin-mono/e-plugin-mono.c
|
|
index f1fe76f..eb4b60c 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 v0.8.3.1
|
|
|
|
|