diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2002-02-23 06:11:47 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2002-02-23 06:11:47 +0800 |
| commit | 54c650eaea9a5a74a78e88e0e9e0b98f0719c723 (patch) | |
| tree | 1749e3135c4cb08aafe25ba4ee155419a74f4ec2 /shell/main.c | |
| parent | 51b03dbcdfdc984834867a04792781ad8f073f65 (diff) | |
| download | gsoc2013-evolution-54c650eaea9a5a74a78e88e0e9e0b98f0719c723.tar gsoc2013-evolution-54c650eaea9a5a74a78e88e0e9e0b98f0719c723.tar.gz gsoc2013-evolution-54c650eaea9a5a74a78e88e0e9e0b98f0719c723.tar.bz2 gsoc2013-evolution-54c650eaea9a5a74a78e88e0e9e0b98f0719c723.tar.lz gsoc2013-evolution-54c650eaea9a5a74a78e88e0e9e0b98f0719c723.tar.xz gsoc2013-evolution-54c650eaea9a5a74a78e88e0e9e0b98f0719c723.tar.zst gsoc2013-evolution-54c650eaea9a5a74a78e88e0e9e0b98f0719c723.zip | |
[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
Diffstat (limited to 'shell/main.c')
| -rw-r--r-- | shell/main.c | 10 |
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) { |