From f657c69d7b4375a9a4fd202890b17a1e7e280d89 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 25 May 2005 10:52:30 +0000 Subject: remove mono registrtion, this is implemented using a plugin now. register 2005-05-25 Not Zed * main.c (main): remove mono registrtion, this is implemented using a plugin now. register the plugin type loader hook. svn path=/trunk/; revision=29413 --- shell/ChangeLog | 5 +++++ shell/main.c | 15 +-------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/shell/ChangeLog b/shell/ChangeLog index 6c9fd3977d..a067505e32 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2005-05-25 Not Zed + + * main.c (main): remove mono registrtion, this is implemented + using a plugin now. register the plugin type loader hook. + 2005-05-16 Not Zed * Makefile.am: fix error file build/path changes diff --git a/shell/main.c b/shell/main.c index dc3910cd33..60ba5d1054 100644 --- a/shell/main.c +++ b/shell/main.c @@ -86,9 +86,6 @@ #include #include "e-util/e-plugin.h" -#ifdef ENABLE_MONO -#include "e-util/e-plugin-mono.h" -#endif static EShell *shell = NULL; @@ -100,9 +97,6 @@ static gboolean killev = FALSE; #if DEVELOPMENT static gboolean force_migrate = FALSE; #endif -#ifdef ENABLE_MONO -static gboolean disable_mono = FALSE; -#endif static gboolean disable_eplugin = FALSE; static gint idle_cb (void *data); @@ -484,10 +478,6 @@ main (int argc, char **argv) #endif { "debug", '\0', POPT_ARG_STRING, &evolution_debug_log, 0, N_("Send the debugging output of all components to a file."), NULL }, -#ifdef ENABLE_MONO - { "disable-mono", '\0', POPT_ARG_NONE, &disable_mono, 0, - N_("Disable the mono plugin environment."), NULL }, -#endif { "disable-eplugin", '\0', POPT_ARG_NONE, &disable_eplugin, 0, N_("Disable loading of any plugins."), NULL }, { "setup-only", '\0', POPT_ARG_NONE | POPT_ARGFLAG_DOC_HIDDEN, @@ -588,16 +578,13 @@ main (int argc, char **argv) gnome_sound_init ("localhost"); if (!disable_eplugin) { -#ifdef ENABLE_MONO - if (!disable_mono && getenv("EVOLUTION_DISABLE_MONO") == NULL) - e_plugin_register_type(e_plugin_mono_get_type()); -#endif e_plugin_register_type(e_plugin_lib_get_type()); e_plugin_hook_register_type(es_menu_hook_get_type()); e_plugin_hook_register_type(es_event_hook_get_type()); #ifdef ENABLE_PROFILING e_plugin_hook_register_type(e_profile_event_hook_get_type()); #endif + e_plugin_hook_register_type(e_plugin_type_hook_get_type()); e_plugin_load_plugins(); } -- cgit v1.2.3