[Fix #3029, Offline mode should be preserved across sessions.]

* main.c (idle_cb): Use the e_shell_new() API below so that we use
the saved offline settings at the next start-up if neither
--offline nor --online has been specified.

* e-shell.c (save_misc_settings): New function.  For now, just
save `/Shell/StartOffline' indicating whether the shell should
start in offline mode or not.
(e_shell_construct): Replace @start_online with
@startup_line_mode.
(e_shell_new): Likewise.

* e-shell.h: New enum EShellStartupLineMode.

svn path=/trunk/; revision=15804

1 files changed, 9 insertions, 1 deletions

diff --git a/shell/main.c b/shell/main.c
index db335603e8..0775904fbf 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -187,6 +187,7 @@ idle_cb (void *data)
 	GNOME_Evolution_Shell corba_shell;
 	CORBA_Environment ev;
 	EShellConstructResult result;
+	EShellStartupLineMode startup_line_mode;
 	GSList *p;
 	gboolean have_evolution_uri;
 	gboolean display_default;
@@ -195,7 +196,14 @@ idle_cb (void *data)
 
 	uri_list = (GSList *) data;
 
-	shell = e_shell_new (evolution_directory, ! no_splash, ! start_offline, &result);
+	if (! start_online && ! start_offline)
+		startup_line_mode = E_SHELL_STARTUP_LINE_MODE_CONFIG;
+	else if (start_online)
+		startup_line_mode = E_SHELL_STARTUP_LINE_MODE_ONLINE;
+	else
+		startup_line_mode = E_SHELL_STARTUP_LINE_MODE_OFFLINE;
+
+	shell = e_shell_new (evolution_directory, ! no_splash, startup_line_mode, &result);
 	g_free (evolution_directory);
 
 	switch (result) {