This commit was manufactured by cvs2svn to create tagEVOLUTION_2_0_3

'EVOLUTION_2_0_3'.

svn path=/tags/EVOLUTION_2_0_3/; revision=28076

3 files changed, 16 insertions, 93 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index 3cedcd9462..6130f811bc 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,42 +1,3 @@
-2004-11-22  Joan Sanfeliu  <joan@fibranet.com>
-
-	* main.c: Evolution product name spelled with an uppercase E
-
-	Fixes #61605
-
-2004-11-02  mengjie yu  <meng-jie.yu@sun.com>
-
-	* evolution-startup-wizard.glade:remove the hard line breaks.
-
-2004-10-25  Not Zed  <NotZed@Ximian.com>
-
-	* main.c (main): register event hook.
-
-	* e-shell.c (offline_procedure_finished_cb, e_shell_go_online):
-	emit new state changed event.
-
-	* main.c (main): register the menu hook.
-	(): only define DEVELOPMENT if not already.
-
-	* e-shell-window.c (init): setup menu manager.
-	(e_shell_window_new): activate menu manager.
-	(update_offline_toggle_status): update the menu manager when the
-	offline state changes (currently only state which requires it)
-
-	* es-menu.[ch]: Shell plugin menu manager.
-
-2004-10-07  Not Zed  <NotZed@Ximian.com>
-
-	* main.c (main): initialise plugin system.
-	(main): add --disable-eplugin and --disable-mono arguments.
-
-2004-09-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-shell-importer.c: (import_cb): use g_timeout_add().
-	* importer/intelligent.c: (select_row_cb), (unselect_row_cb),
-	(create_gui): use gtk_notebook_set_current_page() instead of
-	deprecated gtk_notebook_set_page()
-
 2004-09-24  Not Zed  <NotZed@Ximian.com>
 
 	* e-shell-window-commands.c: Added ed catmur to the credits.
@@ -53,6 +14,10 @@
 	* e-shell-window-commands.c (about_box_new): don't show
 	"translator-credits" if not translated
 
+2004-09-13  JP Rosevear  <jpr@novell.com>
+
+	* main.c: turn off development mode
+
 2004-09-07  JP Rosevear  <jpr@novell.com>
 
 	Fixes #17338
@@ -61,6 +26,14 @@
 	translator credits, update authors lists (not strictly authors,
 	but we have a lot of helpful people)
 
+2004-09-03  Not Zed  <NotZed@Ximian.com>
+
+	** See bug #61285.
+
+	* e-shell-settings-dialog.c (load_pages): use a better query to
+	get the configuration pages, the old one didn't include version
+	information properly.
+
 2004-09-13  Sivaiah Nallagatla <snallagatla@novell.com>
 
 	* e-shell.c (offline_procedure_finished_cb)
@@ -157,10 +130,6 @@
 	* e-shell-errors.xml.h: Add this back to CVS for translators
 	* .cvsignore: Don't ignore e-shell-errors.xml.h
 
-2004-09-07  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell.c (e_shell_construct): disable the startup wizard.
-
 2004-06-24  Not Zed  <NotZed@Ximian.com>
 
 	** See bug #57367.
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 5664f669c3..0e43ee3fd7 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -41,7 +41,6 @@
 #include "e-shell-startup-wizard.h"
 
 #include "e-shell-marshal.h"
-#include "es-event.h"
 
 #include "evolution-shell-component-utils.h"
 
@@ -644,12 +643,10 @@ e_shell_construct (EShell *shell,
 	
 	e_shell_attempt_upgrade(shell);
 
-#if 0
 	if (e_shell_startup_wizard_create () == FALSE) {
 		bonobo_object_unref (BONOBO_OBJECT (shell));
 		exit (0);
 	}
-#endif
 
 	priv->is_initialized = TRUE;
 
@@ -1058,7 +1055,6 @@ offline_procedure_finished_cb (EShellOfflineHandler *offline_handler,
 {
 	EShell *shell;
 	EShellPrivate *priv;
-	ESEvent *ese;
 
 	shell = E_SHELL (data);
 	priv = shell->priv;
@@ -1073,17 +1069,6 @@ offline_procedure_finished_cb (EShellOfflineHandler *offline_handler,
 	priv->offline_handler = NULL;
 
 	g_signal_emit (shell, signals[LINE_STATUS_CHANGED], 0, priv->line_status);
-
-	/** @Event: Shell online state changed
-	 * @Id: state.changed
-	 * @Target: ESMenuTargetState
-	 * 
-	 * This event is emitted whenever the shell online state changes.
-	 *
-	 * Only the online and offline states are emitted.
-	 */
-	ese = es_event_peek();
-	e_event_emit((EEvent *)ese, "state.changed", (EEventTarget *)es_event_target_new_state(ese, TRUE));
 }
 
 /**
@@ -1133,8 +1118,7 @@ e_shell_go_online (EShell *shell,
 	EShellPrivate *priv;
 	GSList *component_infos;
 	GSList *p;
-	ESEvent *ese;
-
+	
 	g_return_if_fail (shell != NULL);
 	g_return_if_fail (E_IS_SHELL (shell));
 	g_return_if_fail (action_window == NULL || E_IS_SHELL_WINDOW (action_window));
@@ -1167,9 +1151,6 @@ e_shell_go_online (EShell *shell,
 	priv->line_status = E_SHELL_LINE_STATUS_ONLINE;
 	e_passwords_set_online (TRUE);
 	g_signal_emit (shell, signals[LINE_STATUS_CHANGED], 0, priv->line_status);
-
-	ese = es_event_peek();
-	e_event_emit((EEvent *)ese, "state.changed", (EEventTarget *)es_event_target_new_state(ese, TRUE));
 }
 
 
diff --git a/shell/main.c b/shell/main.c
index 8600243a1e..e31afd75a2 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -33,7 +33,6 @@
 #include "e-shell-constants.h"
 
 #include "e-shell.h"
-#include "es-menu.h"
 
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
@@ -82,14 +81,9 @@
 
 #include <pthread.h>
 
-#include "e-util/e-plugin.h"
-#ifdef ENABLE_MONO
-#include "e-util/e-plugin-mono.h"
-#endif
 
-#ifndef DEVELOPMENT
-#define DEVELOPMENT (1)
-#endif
+/* #define DEVELOPMENT */
+
 
 static EShell *shell = NULL;
 
@@ -101,10 +95,6 @@ static gboolean killev = FALSE;
 #ifdef 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);
 
@@ -476,7 +466,7 @@ main (int argc, char **argv)
 		  N_("Start in online mode"), NULL },
 #ifdef KILL_PROCESS_CMD
 		{ "force-shutdown", '\0', POPT_ARG_NONE, &killev, 0, 
-		  N_("Forcibly shut down all Evolution components"), NULL },
+		  N_("Forcibly shut down all evolution components"), NULL },
 #endif
 #ifdef DEVELOPMENT
 		{ "force-migrate", '\0', POPT_ARG_NONE, &force_migrate, 0, 
@@ -484,12 +474,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,
 		  &setup_only, 0, NULL, NULL },
 		{ NULL, '\0', 0, NULL, 0, NULL, NULL }
@@ -587,17 +571,6 @@ 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());
-		e_plugin_load_plugins();
-	}
-
 #ifdef DEVELOPMENT
 	client = gconf_client_get_default ();
 	skip_warning_dialog = gconf_client_get_bool (client, "/apps/evolution/shell/skip_warning_dialog", NULL);