evolution r37070 - in branches/kill-bonobo: mail shell

[mbarnes svn gnome org]

Author: mbarnes
Date: Wed Jan 14 12:45:10 2009
New Revision: 37070
URL: http://svn.gnome.org/viewvc/evolution?rev=37070&view=rev

Log:
Fix online mode initialization.


Modified:
   branches/kill-bonobo/mail/mail-session.c
   branches/kill-bonobo/shell/e-shell.c

Modified: branches/kill-bonobo/mail/mail-session.c
==============================================================================
--- branches/kill-bonobo/mail/mail-session.c	(original)
+++ branches/kill-bonobo/mail/mail-session.c	Wed Jan 14 12:45:10 2009
@@ -46,6 +46,7 @@
 #include "e-util/e-error.h"
 #include "e-util/e-util-private.h"
 #include "e-account-combo-box.h"
+#include "shell/e-shell.h"
 
 #include "em-filter-context.h"
 #include "em-filter-rule.h"
@@ -694,12 +695,17 @@
 void
 mail_session_init (EShellModule *shell_module)
 {
-	const gchar *data_dir;
+	EShell *shell;
 	GConfClient *gconf;
+	gboolean online_mode;
+	const gchar *data_dir;
 
 	mail_shell_module = shell_module;
 	data_dir = e_shell_module_get_data_dir (shell_module);
 
+	shell = e_shell_module_get_shell (shell_module);
+	online_mode = e_shell_get_online_mode (shell);
+
 	if (camel_init (data_dir, TRUE) != 0)
 		exit (0);
 
@@ -719,8 +725,7 @@
 								session, NULL, NULL);
 	session->junk_plugin = NULL;
 
-	/* The shell will tell us to go online. */
-	camel_session_set_online ((CamelSession *) session, FALSE);
+	camel_session_set_online ((CamelSession *) session, online_mode);
 	mail_config_reload_junk_headers ();
 }
 

Modified: branches/kill-bonobo/shell/e-shell.c
==============================================================================
--- branches/kill-bonobo/shell/e-shell.c	(original)
+++ branches/kill-bonobo/shell/e-shell.c	Wed Jan 14 12:45:10 2009
@@ -509,7 +509,7 @@
 			"online-mode",
 			_("Online Mode"),
 			_("Whether the shell is online"),
-			TRUE,
+			FALSE,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT));